SCOUT-123 falling back on older API
git-svn-id: https://svn.apache.org/repos/asf/juddi/scout/trunk@1235267 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java b/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
index 3404ef4..95b7826 100644
--- a/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
@@ -142,7 +142,7 @@
queryManagerURL = "org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire";
lifeCycleManagerURL = "org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish";
securityManagerURL = "org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure";
- uddiConfigFile = properties.getProperty(JUDDI_CLIENT_CONFIG_FILE, DEFAULT_JUDDI_CLIENT_CONFIG_FILE);
+ uddiConfigFile = properties.getProperty(JUDDI_CLIENT_CONFIG_FILE);// DEFAULT_JUDDI_CLIENT_CONFIG_FILE);
} else {
queryManagerURL = properties.getProperty(QUERYMANAGER_PROPERTY);
lifeCycleManagerURL = properties.getProperty(LIFECYCLEMANAGER_PROPERTY);
diff --git a/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java b/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
index f96650d..4b771b3 100644
--- a/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
+++ b/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
@@ -86,7 +86,7 @@
if ("3.0".equals(uddiVersion)) {
String nodeName = null;
String managerName = null;
- if (manager==null) {
+ if (manager==null && uddiConfig!=null) {
try {
manager = new UDDIClerkManager(uddiConfig, properties);
manager.start();
@@ -94,17 +94,15 @@
log.error(e.getMessage(),e);
}
}
- try {
- nodeName = manager.getClientConfig().getHomeNode().getName();
- } catch (ConfigurationException e) {
- log.error(e.getMessage(),e);
+ if (manager !=null) {
+ try {
+ managerName = manager.getName();
+ nodeName = manager.getClientConfig().getHomeNode().getName();
+ } catch (ConfigurationException e) {
+ log.error(e.getMessage(),e);
+ }
}
- managerName = manager.getName();
- if (managerName != null) {
- registry = new RegistryV3Impl(properties, nodeName, managerName);
- } else {
- registry = new RegistryImpl(properties);
- }
+ registry = new RegistryV3Impl(properties, nodeName, managerName);
} else {
registry = new RegistryImpl(properties);
}
diff --git a/src/test/resources/META-INF/jaxr-uddi.xml b/src/test/resources/META-INF/jaxr-uddi.xml
index 68ff957..79c4201 100644
--- a/src/test/resources/META-INF/jaxr-uddi.xml
+++ b/src/test/resources/META-INF/jaxr-uddi.xml
@@ -3,7 +3,7 @@
<reloadDelay>5000</reloadDelay>
<manager name="jaxr">
<nodes>
- <node isHomeJUDDI="false">
+ <node isHomeJUDDI="true">
<name>jaxr-client</name>
<description>JUDDI Client configuration using by JAXR for UDDI v3 UDDI-Servers</description>
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
diff --git a/src/test/resources/scoutv3.properties b/src/test/resources/scoutv3.properties
index 8acce35..85eeb60 100644
--- a/src/test/resources/scoutv3.properties
+++ b/src/test/resources/scoutv3.properties
@@ -6,8 +6,9 @@
javax.xml.registry.lifeCycleManagerURL =http://localhost:8880/juddiv3/services/publish
javax.xml.registry.securityManagerURL =http://localhost:8880/juddiv3/services/security
scout.proxy.transportClass =org.apache.ws.scout.transport.LocalTransport
-scout.proxy.uddiVersion=3.0
-scout.proxy.uddiNamespace=urn:uddi-org:api_v3
+scout.proxy.uddiVersion =3.0
+scout.proxy.uddiNamespace =urn:uddi-org:api_v3
+scout.juddi.client.config.file =META-INF/jaxr-uddi.xml
#
########################################################################################################
# SECURITY
