xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2191 Fixing Registry Federation" into development

Browse source 
Former-commit-id: eefbfee6fc [formerly 97ab04bce3db7f2f2e19d310da5b696e2a860d55]
Former-commit-id: 50ce059677
This commit is contained in:
Richard Peter 2013-10-01 13:07:47 -05:00 • committed by Gerrit Code Review
commit f1dbe103ee
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/NotificationType.java
View file

@ -36,6 +36,7 @@ import javax.xml.bind.annotation.XmlType;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.Cascade;
import com.raytheon.uf.common.registry.schemas.ebxml.util.annotations.RegistryObjectReference;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@ -77,7 +78,8 @@ public class NotificationType extends RegistryObjectType {
@XmlElement(name = "Event", required = true)
@DynamicSerializeElement
@ManyToMany(cascade = {})
@ManyToMany
@Cascade({})
@JoinTable(schema = "ebxml")
protected List<AuditableEventType> event;

6
edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ObjectRefListType.java
View file

@ -23,7 +23,6 @@ package oasis.names.tc.ebxml.regrep.xsd.rim.v4;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -40,6 +39,8 @@ import javax.xml.bind.annotation.XmlType;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.CascadeType;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -87,7 +88,8 @@ public class ObjectRefListType {
@XmlElement(name = "ObjectRef")
@DynamicSerializeElement
@ManyToMany(cascade = CascadeType.ALL)
@ManyToMany
@Cascade({ CascadeType.SAVE_UPDATE })
@JoinTable(schema = "ebxml")
protected List<ObjectRefType> objectRef;

7
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/RegistryNotificationManager.java
View file

@ -67,6 +67,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil;
* Apr 17, 2013 1672 djohnson No longer cares about notification protocol.
* 5/21/2013 2022 bphillip Cleaned up unused method parameters and batching of notifications
* 9/11/2013 2354 bphillip Added logic to ensure delete events get included in notifications
* 9/30/2013 2191 bphillip Fixing federated replication
* </pre>
*
* @author bphillip
@ -120,10 +121,6 @@ public class RegistryNotificationManager {
return notification;
}
protected void saveNotification(NotificationType notification) {
notificationDao.createOrUpdate(notification);
}
protected void sendNotification(NotificationListenerWrapper listener,
NotificationType notification, String address) {
@ -137,8 +134,6 @@ public class RegistryNotificationManager {
// the target
auditableEventDao.persistSendDate(notification.getEvent(),
notification.getSubscription(), address);
// Persist the notification
notificationDao.createOrUpdate(notification);
}
/**

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/RegistrySubscriptionManager.java
View file

@ -92,6 +92,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil;
* 6/4/2013 2022 bphillip Changed slot type of subscription last run time. Longs were being truncated when casting to ints
* 9/5/2013 1538 bphillip Changed processing of each subscription to be in their own transaction. Subscriptions are now loaded on startup
* 9/11/2013 2354 bphillip Added handling of deleted objects
* 9/30/2013 2191 bphillip Fixing federated replication
* </pre>
*
* @author bphillip
@ -482,7 +483,6 @@ public class RegistrySubscriptionManager implements
.getEventsOfInterest(startTime, null, objectsOfInterest);
NotificationType notification = notificationManager.getNotification(
subscription, address, objectsOfInterest, eventsOfInterest);
notificationManager.saveNotification(notification);
return notification;
}