Author: kstam
Date: Tue Jan 24 14:35:44 2012
New Revision: 1235267
URL: http://svn.apache.org/viewvc?rev=1235267&view=rev
Log:
SCOUT-123 falling back on older API
Modified:
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
juddi/scout/trunk/src/test/resources/META-INF/jaxr-uddi.xml
juddi/scout/trunk/src/test/resources/scoutv3.properties
Modified:
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java?rev=1235267&r1=1235266&r2=1235267&view=diff
==============================================================================
---
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
(original)
+++
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
Tue Jan 24 14:35:44 2012
@@ -142,7 +142,7 @@ public class ConnectionFactoryImpl exten
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);
Modified:
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java?rev=1235267&r1=1235266&r2=1235267&view=diff
==============================================================================
---
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
(original)
+++
juddi/scout/trunk/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
Tue Jan 24 14:35:44 2012
@@ -86,7 +86,7 @@ public class ConnectionImpl implements C
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 @@ public class ConnectionImpl implements C
log.error(e.getMessage(),e);
}
}
- try {
- 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);
+ if (manager !=null) {
+ try {
+ managerName = manager.getName();
+ nodeName =
manager.getClientConfig().getHomeNode().getName();
+ } catch (ConfigurationException e) {
+ log.error(e.getMessage(),e);
+ }
}
+ registry = new RegistryV3Impl(properties, nodeName, managerName);
} else {
registry = new RegistryImpl(properties);
}
Modified: juddi/scout/trunk/src/test/resources/META-INF/jaxr-uddi.xml
URL:
http://svn.apache.org/viewvc/juddi/scout/trunk/src/test/resources/META-INF/jaxr-uddi.xml?rev=1235267&r1=1235266&r2=1235267&view=diff
==============================================================================
--- juddi/scout/trunk/src/test/resources/META-INF/jaxr-uddi.xml (original)
+++ juddi/scout/trunk/src/test/resources/META-INF/jaxr-uddi.xml Tue Jan 24
14:35:44 2012
@@ -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>
Modified: juddi/scout/trunk/src/test/resources/scoutv3.properties
URL:
http://svn.apache.org/viewvc/juddi/scout/trunk/src/test/resources/scoutv3.properties?rev=1235267&r1=1235266&r2=1235267&view=diff
==============================================================================
--- juddi/scout/trunk/src/test/resources/scoutv3.properties (original)
+++ juddi/scout/trunk/src/test/resources/scoutv3.properties Tue Jan 24 14:35:44
2012
@@ -6,8 +6,9 @@ javax.xml.registry.queryManagerURL =
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
