From 3c57231c82901f7104f53f420baa42ea3d4564fd Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 17 Jun 2014 08:42:29 -0500 Subject: [PATCH] Omaha #3255 attempt to fix build Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25 Former-commit-id: 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3 --- .../META-INF/MANIFEST.MF | 3 ++- .../res/spring/ebxml-webservices.xml | 2 +- .../ebxml/dao/AuditableEventTypeDao.java | 2 +- .../NotificationListenerFactory.java | 2 +- .../NotificationListenerImpl.java | 2 +- .../WebServiceNotificationListener.java | 2 +- .../services/query/QueryManagerImpl.java | 2 +- .../query/plugins/GetReferencedObject.java | 2 +- .../services/soap}/RegistrySOAPServices.java | 4 +++- .../soap}/RemoteSOAPRegistryHandler.java | 21 ++++++++-------- .../soap}/RemoteSOAPRegistryManager.java | 24 ++++++++++++------- 11 files changed, 37 insertions(+), 29 deletions(-) rename edexOsgi/{com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services => com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap}/RegistrySOAPServices.java (98%) rename edexOsgi/{com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml => com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap}/RemoteSOAPRegistryHandler.java (90%) rename edexOsgi/{com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml => com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap}/RemoteSOAPRegistryManager.java (81%) diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF index bdc2612d43..a3e4cf94e2 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Registry Bundle-SymbolicName: com.raytheon.uf.edex.registry.ebxml -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.0.0", @@ -46,6 +46,7 @@ Export-Package: com.raytheon.uf.edex.registry.ebxml.acp, com.raytheon.uf.edex.registry.ebxml.services.notification, com.raytheon.uf.edex.registry.ebxml.services.query, com.raytheon.uf.edex.registry.ebxml.services.query.plugins, + com.raytheon.uf.edex.registry.ebxml.services.soap, com.raytheon.uf.edex.registry.ebxml.services.validator, com.raytheon.uf.edex.registry.ebxml.services.validator.types, com.raytheon.uf.edex.registry.ebxml.util, diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml index 954db66e28..2ad0611da8 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml @@ -9,7 +9,7 @@ + class="com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices"> diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/AuditableEventTypeDao.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/AuditableEventTypeDao.java index a84d01348d..421dbec41f 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/AuditableEventTypeDao.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/AuditableEventTypeDao.java @@ -45,10 +45,10 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import com.raytheon.uf.common.registry.constants.QueryReturnTypes; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.util.CollectionUtil; import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException; +import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil; /** diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerFactory.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerFactory.java index a6bfad0cc8..e1a2d53585 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerFactory.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerFactory.java @@ -31,12 +31,12 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseType; import com.google.common.annotations.VisibleForTesting; import com.raytheon.uf.common.registry.EbxmlNamespaces; import com.raytheon.uf.common.registry.constants.DeliveryMethodTypes; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.edex.registry.ebxml.services.notification.listeners.EmailNotificationListener; import com.raytheon.uf.edex.registry.ebxml.services.notification.listeners.SpringBeanNotificationListener; import com.raytheon.uf.edex.registry.ebxml.services.notification.listeners.WebServiceNotificationListener; +import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices; /** * The default notification listener factory. diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerImpl.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerImpl.java index 6edfa477e9..148a1f928e 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerImpl.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/NotificationListenerImpl.java @@ -62,7 +62,6 @@ import com.raytheon.uf.common.registry.constants.DeletionScope; import com.raytheon.uf.common.registry.constants.QueryLanguages; import com.raytheon.uf.common.registry.constants.QueryReturnTypes; import com.raytheon.uf.common.registry.ebxml.RegistryUtil; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.time.util.TimeUtil; @@ -72,6 +71,7 @@ import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao; import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException; import com.raytheon.uf.edex.registry.ebxml.services.lifecycle.LifecycleManagerImpl; import com.raytheon.uf.edex.registry.ebxml.services.query.QueryConstants; +import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil; diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/listeners/WebServiceNotificationListener.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/listeners/WebServiceNotificationListener.java index f97e9e3d00..727e2e5c9c 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/listeners/WebServiceNotificationListener.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/notification/listeners/WebServiceNotificationListener.java @@ -30,12 +30,12 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseStatus; import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryResponseType; import com.raytheon.uf.common.registry.EbxmlNamespaces; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; import com.raytheon.uf.common.registry.services.RegistryServiceException; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException; import com.raytheon.uf.edex.registry.ebxml.services.notification.NotificationDestination; +import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil; /** diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/QueryManagerImpl.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/QueryManagerImpl.java index 9ad36ab434..262cada276 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/QueryManagerImpl.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/QueryManagerImpl.java @@ -72,7 +72,6 @@ import org.springframework.transaction.annotation.Transactional; import com.raytheon.uf.common.registry.constants.CanonicalQueryTypes; import com.raytheon.uf.common.registry.constants.QueryReturnTypes; import com.raytheon.uf.common.registry.constants.RegistryObjectTypes; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.time.util.ITimer; @@ -85,6 +84,7 @@ import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao; import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException; import com.raytheon.uf.edex.registry.ebxml.services.lifecycle.ObjectReferenceResolver; import com.raytheon.uf.edex.registry.ebxml.services.query.plugins.RegistryQueryPlugin; +import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil; diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/GetReferencedObject.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/GetReferencedObject.java index 55169d35c4..727fda3f48 100644 --- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/GetReferencedObject.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/GetReferencedObject.java @@ -42,10 +42,10 @@ import org.springframework.transaction.annotation.Transactional; import com.raytheon.uf.common.registry.EbxmlNamespaces; import com.raytheon.uf.common.registry.constants.CanonicalQueryTypes; import com.raytheon.uf.common.registry.constants.QueryReturnTypes; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException; import com.raytheon.uf.edex.registry.ebxml.services.lifecycle.ObjectReferenceResolver; import com.raytheon.uf.edex.registry.ebxml.services.query.QueryConstants; +import com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices; import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil; /** diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RegistrySOAPServices.java similarity index 98% rename from edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java rename to edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RegistrySOAPServices.java index 4f0cc71be8..8f57f9595f 100644 --- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RegistrySOAPServices.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.registry.services; +package com.raytheon.uf.edex.registry.ebxml.services.soap; import java.net.MalformedURLException; import java.net.URL; @@ -46,6 +46,8 @@ import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; import com.raytheon.uf.common.registry.ebxml.RegistryUtil; +import com.raytheon.uf.common.registry.services.RegistryServiceConfiguration; +import com.raytheon.uf.common.registry.services.RegistryServiceException; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.edex.security.SecurityConfiguration; diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryHandler.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryHandler.java similarity index 90% rename from edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryHandler.java rename to edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryHandler.java index 203ad9c8f0..4af02a7557 100644 --- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryHandler.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryHandler.java @@ -1,5 +1,5 @@ /** -* This software was developed and / or modified by Raytheon Company, + * This software was developed and / or modified by Raytheon Company, * pursuant to Contract DG133W-05-CQ-1067 with the US Government. * * U.S. EXPORT CONTROLLED TECHNICAL DATA @@ -17,10 +17,9 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.common.registry.ebxml; - -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; +package com.raytheon.uf.edex.registry.ebxml.services.soap; +import com.raytheon.uf.common.registry.ebxml.SOAPRegistryManager; /** * Remote version of the {@link SOAPRegistryManager}. @@ -44,18 +43,18 @@ public class RemoteSOAPRegistryHandler extends RemoteSOAPRegistryManager { /** remote registry port **/ private String port; - + /** remote registry protocol **/ private String protocol; - + /** remote host complete precursor URL */ public String remoteHostUrl = null; - + /** default constructor **/ public RemoteSOAPRegistryHandler() { - + } - + /** Bean constructor **/ public RemoteSOAPRegistryHandler(RegistrySOAPServices rss) { super(rss); @@ -63,7 +62,7 @@ public class RemoteSOAPRegistryHandler extends RemoteSOAPRegistryManager { @Override protected String getRemoteHost() { - + if (remoteHostUrl == null) { StringBuffer buf = new StringBuffer(); buf.append(protocol); @@ -71,7 +70,7 @@ public class RemoteSOAPRegistryHandler extends RemoteSOAPRegistryManager { buf.append(host); buf.append(":"); buf.append(port); - + remoteHostUrl = buf.toString(); } diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryManager.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryManager.java similarity index 81% rename from edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryManager.java rename to edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryManager.java index ee513f91a4..a3ab486b95 100644 --- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryManager.java +++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryManager.java @@ -1,9 +1,10 @@ -package com.raytheon.uf.common.registry.ebxml; +package com.raytheon.uf.edex.registry.ebxml.services.soap; import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.LifecycleManager; import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.QueryManager; -import com.raytheon.uf.common.registry.services.RegistrySOAPServices; +import com.raytheon.uf.common.registry.ebxml.LifecycleManagerFactory; +import com.raytheon.uf.common.registry.ebxml.QueryManagerFactory; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; @@ -24,12 +25,12 @@ import com.raytheon.uf.common.status.UFStatus; * @author dhladky * @version 1.0 */ -public abstract class RemoteSOAPRegistryManager implements LifecycleManagerFactory, - QueryManagerFactory { +public abstract class RemoteSOAPRegistryManager implements + LifecycleManagerFactory, QueryManagerFactory { protected static final IUFStatusHandler statusHandler = UFStatus .getHandler(RemoteSOAPRegistryManager.class); - + /** SOAP service provider **/ protected RegistrySOAPServices rss; @@ -39,7 +40,7 @@ public abstract class RemoteSOAPRegistryManager implements LifecycleManagerFacto public RemoteSOAPRegistryManager() { } - + /** * Constructor to conform to bean pattern. */ @@ -62,7 +63,8 @@ public abstract class RemoteSOAPRegistryManager implements LifecycleManagerFacto try { a = getRss().getLifecycleManagerServiceForHost(getRemoteHost()); } catch (Exception e) { - statusHandler.error("Can't find the Remote LifeCycleManager SOAP service!", e); + statusHandler.error( + "Can't find the Remote LifeCycleManager SOAP service!", e); } return a; @@ -78,12 +80,13 @@ public abstract class RemoteSOAPRegistryManager implements LifecycleManagerFacto */ @Override public QueryManager getQueryManager() { - + QueryManager qm = null; try { qm = getRss().getQueryServiceForHost(getRemoteHost()); } catch (Exception e) { - statusHandler.error("Can't find the Remote QueryManager SOAP service!", e); + statusHandler.error( + "Can't find the Remote QueryManager SOAP service!", e); } return qm; @@ -91,12 +94,14 @@ public abstract class RemoteSOAPRegistryManager implements LifecycleManagerFacto /** * Get the name of the remote host + * * @return */ protected abstract String getRemoteHost(); /** * get the registry SOAP service helper setup + * * @return */ public RegistrySOAPServices getRss() { @@ -105,6 +110,7 @@ public abstract class RemoteSOAPRegistryManager implements LifecycleManagerFacto /** * Sets the registry SOAP service helper + * * @param rss */ public void setRss(RegistrySOAPServices rss) {