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

Omaha #3255 attempt to fix build

Browse source 
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25

Former-commit-id: 4e8c5f881272ed8d7aea30cd8316ebcbdd2443c3
This commit is contained in:
Nate Jensen 2014-06-17 08:42:29 -05:00
parent c65c392d63
commit 3c57231c82
11 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
View file

@ -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,

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
View file

@ -9,7 +9,7 @@
<property name="securityConfig" ref="securityConfiguration" />
</bean>
<bean id="registryWebServiceClient"
class="com.raytheon.uf.common.registry.services.RegistrySOAPServices">
class="com.raytheon.uf.edex.registry.ebxml.services.soap.RegistrySOAPServices">
<property name="securityInterceptor" ref="securityOutInterceptor" />
<property name="serviceConfig" ref="RegistryServiceConfig" />
<property name="securityConfig" ref="securityConfiguration" />

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/AuditableEventTypeDao.java
View file

@ -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;
/**

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

@ -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.

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

@ -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;

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

@ -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;
/**

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/QueryManagerImpl.java
View file

@ -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;

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/GetReferencedObject.java
View file

@ -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;
/**

4
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java → edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RegistrySOAPServices.java
View file

@ -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;

21
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryHandler.java → edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryHandler.java
View file

@ -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();
}

24
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RemoteSOAPRegistryManager.java → edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/soap/RemoteSOAPRegistryManager.java
View file

@ -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) {