You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2014/01/04 18:52:39 UTC

svn commit: r1555397 - in /juddi/trunk: juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client/src/test/java/org/apache/juddi/v3/client/ juddi-client/src/test/java/org/apache/juddi/v3/client/config/ juddi-examples/hello-world/src/ma...

Author: kstam
Date: Sat Jan  4 17:52:38 2014
New Revision: 1555397

URL: http://svn.apache.org/r1555397
Log:
JUDDI-670 Cleaning up UDDIClientContainer

Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/config/CryptoConfigTest.java
    juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SubscriptionCallbackExample.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
    juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
    juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java
    juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
    juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java
    juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/BackGroundRegistration.java Sat Jan  4 17:52:38 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.juddi.v3.client.config;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -25,25 +24,17 @@ public class BackGroundRegistration impl
 	private UDDIClient uddiClient = null;
 	private static Log log = LogFactory.getLog(BackGroundRegistration.class);
 	
-	public BackGroundRegistration(UDDIClient manager) {
+	public BackGroundRegistration(UDDIClient uddiClient) {
 		super();
-		this.uddiClient = manager;
+		this.uddiClient = uddiClient;
 	}
 
 	public void run() {
-		try {
-			if (UDDIClientContainer.getUDDIClient(uddiClient.getName())!=null && uddiClient.getClientConfig().isRegisterOnStartup()) {
-				log.debug("Starting UDDI Clerks for uddiClient " + uddiClient.getClientConfig().getClientName() + "...");
-				uddiClient.saveClerkAndNodeInfo();
-				uddiClient.registerAnnotatedServices();
-				uddiClient.registerWSDLs();
-				uddiClient.xRegister();
-				log.debug("Clerks started succesfully for uddiClient " + uddiClient.getClientConfig().getClientName());
-			} else {
-				log.debug(uddiClient.getName() + " already registered to the UDDIClientContainer.");
-			}
-		} catch (ConfigurationException e) {
-			log.error(e.getMessage(),e);
-		}
+			log.debug("Starting UDDI Clerks for uddiClient " + uddiClient.getClientConfig().getClientName() + "...");
+			uddiClient.saveClerkAndNodeInfo();
+			uddiClient.registerAnnotatedServices();
+			uddiClient.registerWSDLs();
+			uddiClient.xRegister();
+			log.debug("Clerks started succesfully for uddiClient " + uddiClient.getClientConfig().getClientName());	
 	}
 }

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java Sat Jan  4 17:52:38 2014
@@ -37,16 +37,7 @@ public class UDDIClientContainer {
 				throw new ConfigurationException("No client by name " + clientName + " was found. " +
 						" Please check your client uddi.xml files, and make sure this client was started");
 			}
-		} else if (clients.size()==1 && clientName==null) {
-			log.warn("Deprecated, please specify a client name");
-			return clients.values().iterator().next();
-		} else {
-			log.warn("Deprecated, please specify a client name");
-			UDDIClient client = new UDDIClient(null);
-			addClient(client);
-			client.start();
-			return client;
-		}
+		} else throw new IllegalArgumentException("clientName is a required argument");
 	}
 	
 	public static boolean addClient(UDDIClient manager) {

Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java Sat Jan  4 17:52:38 2014
@@ -21,7 +21,6 @@ import java.util.Map;
 import org.apache.juddi.v3.annotations.AnnotationProcessor;
 import org.apache.juddi.v3.client.config.UDDIClerk;
 import org.apache.juddi.v3.client.config.UDDIClient;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.junit.Assert;
 import org.junit.Test;
 import org.uddi.api_v3.BusinessService;
@@ -34,7 +33,7 @@ public class UDDIClientTest {
      @Test
      public void testReadingTheConfig() {
 	     try {
-	    	 UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+	    	 UDDIClient client = new UDDIClient();
 	    	 client.start();
 	    	 client.getClientConfig().getUDDINode("default");
 	    	 assertEquals(2,client.getClientConfig().getUDDIClerks().size());
@@ -93,7 +92,7 @@ public class UDDIClientTest {
     		 //This is a special case where the client in the META-INF/uddi.xml file is 
     		 //instantiated and started simply by getting it.
     		 //This functionality was add for backwards compatibility. 
-    		 UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+    		 UDDIClient client = new UDDIClient();
     		 client.start();
 			 assertEquals("test-client", client.getName());
 			 assertEquals("default", client.getClientConfig().getHomeNode().getName());
@@ -111,7 +110,7 @@ public class UDDIClientTest {
      @Test
      public void testReadingAnnotations() {
     	 try {
-    		 UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+    		 UDDIClient client = new UDDIClient();
 	    	 Map<String,UDDIClerk> clerks = client.getClientConfig().getUDDIClerks();
 	 		 AnnotationProcessor ap = new AnnotationProcessor();
 	 		 if (clerks.containsKey("default")) {

Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/config/CryptoConfigTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/config/CryptoConfigTest.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/config/CryptoConfigTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/config/CryptoConfigTest.java Sat Jan  4 17:52:38 2014
@@ -16,7 +16,6 @@
 package org.apache.juddi.v3.client.config;
 
 import org.apache.juddi.v3.client.cryptor.CryptorFactory;
-import org.apache.juddi.v3.client.transport.Transport;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -29,12 +28,6 @@ public class CryptoConfigTest {
     @Test()
     public void EncryptedCredentialsAES128Test() throws Exception {
         UDDIClient clerkManager = new UDDIClient("META-INF/uddi3-enc-aes128.xml");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);
-        // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // supply the nodeName (defined in your uddi.xml.
-        // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        Transport transport = clerkManager.getTransport("default");
         // Now you create a reference to the UDDI API
         UDDIClerk c = clerkManager.getClerk("default");
         UDDIClerk c2 = clerkManager.getClerk("medroot");

Modified: juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java (original)
+++ juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java Sat Jan  4 17:52:38 2014
@@ -32,7 +32,7 @@ public class HelloWorld {
         	// a UddiClient can be a client to multiple UDDI nodes, so 
         	// supply the nodeName (defined in your uddi.xml.
         	// The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        	Transport transport = uddiClient.getTransport("default");
+        	Transport transport = uddiClient.getTransport();
         	// Now you create a reference to the UDDI API
 			security = transport.getUDDISecurityService();
 		} catch (Exception e) {

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/BusinessServiceKeymismatch.java Sat Jan  4 17:52:38 2014
@@ -53,10 +53,6 @@ public class BusinessServiceKeymismatch 
         // create a manager and read the config in the archive; 
         // you can use your config file name
         UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // supply the nodeName (defined in your uddi.xml.
         // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
         Transport transport = clerkManager.getTransport("default");
         // Now you create a reference to the UDDI API

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/FindBusinessBugHunt.java Sat Jan  4 17:52:38 2014
@@ -70,12 +70,10 @@ public class FindBusinessBugHunt {
         // you can use your config file name
         UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
         UDDIClerk clerk = clerkManager.getClerk("default");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
         // a ClerkManager can be a client to multiple UDDI nodes, so 
         // supply the nodeName (defined in your uddi.xml.
         // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        Transport transport = clerkManager.getTransport("default");
+        Transport transport = clerkManager.getTransport();
         // Now you create a reference to the UDDI API
         security = transport.getUDDISecurityService();
         publish = transport.getUDDIPublishService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java Sat Jan  4 17:52:38 2014
@@ -44,12 +44,9 @@ public class JuddiAdminService {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
             clerk = clerkManager.getClerk("default");
             // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             publish = transport.getUDDIPublishService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SearchByQos.java Sat Jan  4 17:52:38 2014
@@ -82,13 +82,7 @@ public class SearchByQos {
                 // create a manager and read the config in the archive; 
         // you can use your config file name
         UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-        UDDIClerk clerk = clerkManager.getClerk("default");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // supply the nodeName (defined in your uddi.xml.
-        // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        Transport transport = clerkManager.getTransport("default");
+        Transport transport = clerkManager.getTransport();
         // Now you create a reference to the UDDI API
         security = transport.getUDDISecurityService();
         publish = transport.getUDDIPublishService();
@@ -155,13 +149,7 @@ public class SearchByQos {
         // create a manager and read the config in the archive; 
         // you can use your config file name
         UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-        UDDIClerk clerk = clerkManager.getClerk("default");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // supply the nodeName (defined in your uddi.xml.
-        // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        Transport transport = clerkManager.getTransport("default");
+        Transport transport = clerkManager.getTransport();
         // Now you create a reference to the UDDI API
         security = transport.getUDDISecurityService();
         publish = transport.getUDDIPublishService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SubscriptionCallbackExample.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SubscriptionCallbackExample.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SubscriptionCallbackExample.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/SubscriptionCallbackExample.java Sat Jan  4 17:52:38 2014
@@ -61,19 +61,7 @@ public class SubscriptionCallbackExample
             clerk = c.getClerk("default");
             TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi:org.apache.juddi:test:keygenerator", "Test domain", "en");
             clerk.register(createKeyGenator);
-
-
-
-
-
-            // create a manager and read the config in the archive; 
-            // you can use your config file name
-
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(c);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = c.getTransport("default");
+            Transport transport = c.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java Sat Jan  4 17:52:38 2014
@@ -46,11 +46,7 @@ public class UddiCreatebulk {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             publish = transport.getUDDIPublishService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java Sat Jan  4 17:52:38 2014
@@ -53,11 +53,7 @@ public class UddiCustodyTransfer {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
 

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java Sat Jan  4 17:52:38 2014
@@ -47,11 +47,7 @@ public class UddiDigitalSignatureBusines
             // create a manager and read the config in the archive; 
             // you can use your config file name
             clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             inquiry = transport.getUDDIInquiryService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java Sat Jan  4 17:52:38 2014
@@ -45,11 +45,7 @@ public class UddiDigitalSignatureSearch 
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             inquiry = transport.getUDDIInquiryService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java Sat Jan  4 17:52:38 2014
@@ -46,11 +46,7 @@ public class UddiDigitalSignatureService
             // create a manager and read the config in the archive; 
             // you can use your config file name
             clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             inquiry = transport.getUDDIInquiryService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java Sat Jan  4 17:52:38 2014
@@ -46,11 +46,7 @@ public class UddiDigitalSignatureTmodel 
             // create a manager and read the config in the archive; 
             // you can use your config file name
             clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             inquiry = transport.getUDDIInquiryService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java Sat Jan  4 17:52:38 2014
@@ -44,11 +44,7 @@ public class UddiFindBinding {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java Sat Jan  4 17:52:38 2014
@@ -53,13 +53,11 @@ public class UddiFindEndpoints {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);
             clerk = clerkManager.getClerk("default");
             // a ClerkManager can be a client to multiple UDDI nodes, so 
             // supply the nodeName (defined in your uddi.xml.
             // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             inquiry = transport.getUDDIInquiryService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java Sat Jan  4 17:52:38 2014
@@ -44,12 +44,7 @@ public class UddiGetServiceDetails {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);
-            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiKeyGenerator.java Sat Jan  4 17:52:38 2014
@@ -44,12 +44,7 @@ public class UddiKeyGenerator {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);
-            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java Sat Jan  4 17:52:38 2014
@@ -47,11 +47,7 @@ public class UddiRelatedBusinesses {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java Sat Jan  4 17:52:38 2014
@@ -56,11 +56,7 @@ public class UddiSubscribe {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java Sat Jan  4 17:52:38 2014
@@ -49,11 +49,7 @@ public class UddiSubscribeGet {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java Sat Jan  4 17:52:38 2014
@@ -54,11 +54,7 @@ public class UddiSubscribeValidate {
             // create a manager and read the config in the archive; 
             // you can use your config file name
             UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
+            Transport transport = clerkManager.getTransport();
             // Now you create a reference to the UDDI API
             security = transport.getUDDISecurityService();
             juddiApi = transport.getJUDDIApiService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WadlImport.java Sat Jan  4 17:52:38 2014
@@ -63,12 +63,7 @@ public class WadlImport {
         // create a manager and read the config in the archive; 
         // you can use your config file name
         UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // supply the nodeName (defined in your uddi.xml.
-        // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        Transport transport = clerkManager.getTransport("default");
+        Transport transport = clerkManager.getTransport();
         // Now you create a reference to the UDDI API
         security = transport.getUDDISecurityService();
         publish = transport.getUDDIPublishService();

Modified: juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java (original)
+++ juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/WsdlImport.java Sat Jan  4 17:52:38 2014
@@ -65,12 +65,7 @@ public class WsdlImport {
         // create a manager and read the config in the archive; 
         // you can use your config file name
         UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-        // register the clerkManager with the client side container
-        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // a ClerkManager can be a client to multiple UDDI nodes, so 
-        // supply the nodeName (defined in your uddi.xml.
-        // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-        Transport transport = clerkManager.getTransport("default");
+        Transport transport = clerkManager.getTransport();
         // Now you create a reference to the UDDI API
         security = transport.getUDDISecurityService();
         publish = transport.getUDDIPublishService();

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Sat Jan  4 17:52:38 2014
@@ -207,7 +207,7 @@ public class UddiHub implements Serializ
     private void EnsureConfig() {
         if (clientConfig == null) {
             try {
-                UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+                UDDIClient client = new UDDIClient();
                 clientConfig = client.getClientConfig();
                 try {
                     style = AuthStyle.valueOf(clientConfig.getConfiguration().getString(PROP_AUTH_TYPE));
@@ -305,7 +305,7 @@ public class UddiHub implements Serializ
      */
     public Properties GetDigitalSignatureConfig() {
         try {
-            return UDDIClientContainer.getUDDIClient(null).getClientConfig().getDigitalSignatureConfiguration();
+            return GetJuddiClientConfig().getDigitalSignatureConfiguration();
         } catch (Exception ex) {
             log.error("error fetching uddi.xml", ex);
         }

Modified: juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java (original)
+++ juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Export.java Sat Jan  4 17:52:38 2014
@@ -97,9 +97,6 @@ public class Export {
                 UDDIClient clerkManager = new UDDIClient(config);
                 clerkManager.start();
                 UDDIClerk clerk = clerkManager.getClerk(name);
-
-                // register the clerkManager with the client side container
-                UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
                 // a ClerkManager can be a client to multiple UDDI nodes, so 
                 // supply the nodeName (defined in your uddi.xml.
                 // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml

Modified: juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java (original)
+++ juddi/trunk/juddi-migration-tool/src/main/java/org/apache/juddi/v3/migration/tool/Import.java Sat Jan  4 17:52:38 2014
@@ -93,8 +93,6 @@ public class Import {
                 UDDIClient clerkManager = new UDDIClient(config);
                 clerkManager.start();
                 UDDIClerk clerk = clerkManager.getClerk(name);
-                // register the clerkManager with the client side container
-                UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
                 // a ClerkManager can be a client to multiple UDDI nodes, so 
                 // supply the nodeName (defined in your uddi.xml.
                 // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml

Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java Sat Jan  4 17:52:38 2014
@@ -198,7 +198,7 @@ public class UddiAdminHub {
     private void EnsureConfig() {
         if (clientConfig == null) {
             try {
-                UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+                UDDIClient client = new UDDIClient();
                 clientConfig = client.getClientConfig();
                 try {
                     style = AuthStyle.valueOf(clientConfig.getConfiguration().getString(PROP_AUTH_TYPE));

Modified: juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml?rev=1555397&r1=1555396&r2=1555397&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/resources/META-INF/uddi.xml Sat Jan  4 17:52:38 2014
@@ -21,7 +21,7 @@
             <node>
                 <name>default</name> 
                 <description>This server</description>
-                <!-- JAX-WS Transport -->
+                <!-- InVM Transport -->
                <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
                <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
                <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org