juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r823291 - in /webservices/juddi/trunk/uddi-client/src: main/java/org/apache/juddi/v3/client/config/ main/java/org/apache/juddi/v3/client/transport/ test/java/org/apache/juddi/v3/client/ test/resources/META-INF/
Date Thu, 08 Oct 2009 19:45:31 GMT
Author: kstam
Date: Thu Oct  8 19:45:29 2009
New Revision: 823291

URL: http://svn.apache.org/viewvc?rev=823291&view=rev
Log:
JUDDI-287 removing the managerName from the transport. Not needed after all.

Modified:
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
    webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java
    webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Thu Oct  8 19:45:29 2009
@@ -44,6 +44,7 @@
 	private Map<String,UDDINode> nodes = null;
 	private Map<String,UDDIClerk> clerks = null;
 	private Set<XRegistration> xRegistrations = null;
+	private String managerName = null;
 	
 	/**
 	 * Constructor (note Singleton pattern).
@@ -53,9 +54,14 @@
 	{
 		loadConfiguration();
 	}
+	protected void loadManager() throws ConfigurationException {
+		nodes = readNodeConfig(config);
+		clerks = readClerkConfig(config, nodes);
+		xRegistrations = readXRegConfig(config,clerks);
+	}
 	/**
 	 * Does the actual work of reading the configuration from System
-	 * Properties and/or juddiv3.properties file. When the juddiv3.properties
+	 * Properties and/or uddi.xml file. When the uddi.xml
 	 * file is updated the file will be reloaded. By default the reloadDelay is
 	 * set to 1 second to prevent excessive date stamp checking.
 	 */
@@ -73,14 +79,12 @@
 		compositeConfig.addConfiguration(xmlConfig);
 		//Making the new configuration globally accessible.
 		config = compositeConfig;
-		nodes = readNodeConfig(config);
-		clerks = readClerkConfig(config, nodes);
-		xRegistrations = readXRegConfig(config,clerks);
+		loadManager();
 	}
 
 	private Map<String,UDDIClerk> readClerkConfig(Configuration config, Map<String,UDDINode> nodes) 
 	throws ConfigurationException {
-		String managerName = config.getString("manager[@name]");
+		managerName = config.getString("manager[@name]");
 		String[] names = config.getStringArray("manager.clerks.clerk[@name]");
 		Map<String,UDDIClerk> clerks = new HashMap<String,UDDIClerk>();
 		log.debug("clerk names=" + names);
@@ -100,6 +104,11 @@
 		}
 		return clerks;
 	}
+	
+	public boolean isRegisterOnStartup() {
+		boolean isRegisterOnStartup = config.getBoolean("manager.clerks[@registerOnStartup]");
+		return isRegisterOnStartup;
+	}
 
 	private Map<String,UDDINode> readNodeConfig(Configuration config) 
 	throws ConfigurationException {
@@ -179,10 +188,12 @@
 	public Set<XRegistration> getXRegistrations() {
 		return xRegistrations;
 	}
-	
-    
     
     public Configuration getConfiguration() {
     	return config;
     }
+    
+    public String getManagerName() {
+		return managerName;
+	}
 }

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Thu Oct  8 19:45:29 2009
@@ -49,7 +49,7 @@
 			SaveService saveService = new SaveService();
 			saveService.setAuthInfo(authToken);
 			saveService.getBusinessService().add(service);
-			ServiceDetail serviceDetail = node.getTransport(managerName).getUDDIPublishService().saveService(saveService);
+			ServiceDetail serviceDetail = node.getTransport().getUDDIPublishService().saveService(saveService);
 			businessService = serviceDetail.getBusinessService().get(0);
 		} catch (Exception e) {
 			log.error("Unable to register service " + service.getName().get(0).getValue()
@@ -73,7 +73,7 @@
 			for (BindingTemplate binding : service.getBindingTemplates().getBindingTemplate()) {
 				deleteBinding.getBindingKey().add(binding.getBindingKey());
 			}
-			node.getTransport(managerName).getUDDIPublishService().deleteBinding(deleteBinding);
+			node.getTransport().getUDDIPublishService().deleteBinding(deleteBinding);
 		} catch (Exception e) {
 			log.error("Unable to register service " + service.getName().get(0).getValue()
 					+ " ." + e.getMessage(),e);
@@ -85,7 +85,7 @@
 		GetServiceDetail getServiceDetail = new GetServiceDetail();
 		getServiceDetail.getServiceKey().add(serviceKey);
 		getServiceDetail.setAuthInfo(getAuthToken());
-		ServiceDetail sd = node.getTransport(managerName).getUDDIInquiryService().getServiceDetail(getServiceDetail);
+		ServiceDetail sd = node.getTransport().getUDDIInquiryService().getServiceDetail(getServiceDetail);
 		List<BusinessService> businessServiceList = sd.getBusinessService();
 		if (businessServiceList.size() == 0) throw new NotFoundException("Could not find Service with key=" + serviceKey);
 		return businessServiceList.get(0);
@@ -96,7 +96,7 @@
 		GetBindingDetail getBindingDetail = new GetBindingDetail();
 		getBindingDetail.getBindingKey().add(bindingKey);
 		getBindingDetail.setAuthInfo(getAuthToken());
-		BindingDetail bd = node.getTransport(managerName).getUDDIInquiryService().getBindingDetail(getBindingDetail);
+		BindingDetail bd = node.getTransport().getUDDIInquiryService().getBindingDetail(getBindingDetail);
 		List<BindingTemplate> bindingTemplateList = bd.getBindingTemplate();
 		if (bindingTemplateList.size() == 0) throw new NotFoundException("Could not find ServiceBbinding with key=" + bindingKey);
 		return bindingTemplateList.get(0);
@@ -107,7 +107,7 @@
 			GetAuthToken getAuthToken = new GetAuthToken();
 			getAuthToken.setUserID(getPublisher());
 			getAuthToken.setCred(getPassword());
-			authToken = node.getTransport(managerName).getUDDISecurityService().getAuthToken(getAuthToken).getAuthInfo();
+			authToken = node.getTransport().getUDDISecurityService().getAuthToken(getAuthToken).getAuthInfo();
 		}
 		return authToken;
 	}

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java Thu Oct  8 19:45:29 2009
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.juddi.v3.annotations.AnnotationProcessor;
@@ -12,7 +11,7 @@
 
 public class UDDIClerkManager {
 	
-	private static Map<String,UDDIClerkManager> managers = new ConcurrentHashMap<String,UDDIClerkManager>();
+	private static UDDIClerkManager manager = null;
 	private static Logger log = Logger.getLogger(UDDIClerkManager.class);
     private ClientConfig clientConfig = null;
 	
@@ -28,40 +27,57 @@
 	 * Stops the clerks.
 	 * @throws ConfigurationException 
 	 */
-	public void stop(String managerName) throws ConfigurationException {
-		log.info("Stopping UDDI Clerks...");
-		if (managers.containsKey(managerName)) {
-			UDDIClerkManager manager = managers.get(managerName);
+	public synchronized static void stop() throws ConfigurationException {
+		
+		if (manager!=null) {
+			log.info("Stopping UDDI Clerks for manager " + manager.clientConfig.getManagerName());
 			manager.releaseResources();
 			manager=null;
-			managers.remove(managerName);
-			log.info("UDDI Clerks shutdown completed.");
+			log.info("UDDI Clerks shutdown completed for manager " + manager.clientConfig.getManagerName());
 		} else {
-			log.warn("UDDI Clerks for Manager" + managerName+ " where not running.");
+			log.warn("UDDI Clerks where not running for manager " + manager.clientConfig.getManagerName());
 		}
 	}
 	
 	private void releaseResources() {
-		//TODO unregister bindings from the annotation
+		unRegisterAnnotatedServices();
 	}
  	/**
 	 * Initializes the UDDI Clerk.
-	 * @return
-	 * @throws ConfigurationException
-	 * @throws  
-	 */
-	public void start(String managerName) throws ConfigurationException {
-		log.info("Starting UDDI Clerks...");
-		if (!managers.containsKey(managerName)) {
-			UDDIClerkManager manager = new UDDIClerkManager();
-			managers.put(managerName, manager);
-		} else {
-			log.warn("ClerkManager was already started. Going to restart..");
-			UDDIClerkManager manager = managers.get(managerName);
+	 * @throws ConfigurationException  
+	 */
+	public synchronized static void start() throws ConfigurationException {
+		if (manager!=null) {
+			log.warn("ClerkManager was already started. Going to reload..");
 			manager.releaseResources();
+			manager.clientConfig.loadManager();
+		} else {
+			log.info("Starting UDDI Clerks...");
 			manager = new UDDIClerkManager();
 		}
-		log.info("Initializing clerks...");
+		if (manager.clientConfig.isRegisterOnStartup()) {
+			manager.registerAnnotatedServices();
+			manager.xRegister();
+		}
+		log.info("Clerks started succesfully for manager " + manager.clientConfig.getManagerName());
+ 	}
+	/**
+	 * X-Register services listed in the uddi.xml
+	 */
+	public void xRegister() {
+		//XRegistration of listed services
+		Set<XRegistration> xRegistrations = clientConfig.getXRegistrations();
+		log.info("Starting cross registration...");
+		for (XRegistration xRegistration : xRegistrations) {
+			xRegistration.xRegister();
+		}
+		log.info("Cross registration completed");
+	}
+	/**
+	 * Registers services to UDDI using a clerk, and the uddi.xml
+	 * configuration.
+	 */
+	public void registerAnnotatedServices() {
 		Map<String,UDDIClerk> clerks = clientConfig.getClerks();
 		if (clerks.size() > 0) {
 			AnnotationProcessor ap = new AnnotationProcessor();
@@ -73,32 +89,38 @@
 				}
 			}
 		}
-		//XRegistration of listed services
-		Set<XRegistration> xRegistrations = clientConfig.getXRegistrations();
-		log.info("Starting cross registration...");
-		for (XRegistration xRegistration : xRegistrations) {
-			xRegistration.xRegister();
+	}
+	/**
+	 * Removes the bindings of the services of the annotated classes.
+	 */
+	public void unRegisterAnnotatedServices() {
+		Map<String,UDDIClerk> clerks = clientConfig.getClerks();
+		if (clerks.size() > 0) {
+			AnnotationProcessor ap = new AnnotationProcessor();
+			for (UDDIClerk clerk : clerks.values()) {
+				Collection<BusinessService> services = ap.readServiceAnnotations(
+						clerk.getClassWithAnnotations(),clerk.getNode().getProperties());
+				for (BusinessService businessService : services) {
+					clerk.unRegister(businessService);
+				}
+			}
 		}
-		log.info("Cross registration completed");
-		log.info("Clerks started succesfully.");
- 	}
+	}
 	
-	public static ClientConfig getClientConfig(String managerName) throws ConfigurationException {
-		UDDIClerkManager manager = getManager(managerName);
-		return manager.clientConfig;
+	public static ClientConfig getClientConfig() throws ConfigurationException {
+		return getManager().clientConfig;
 	}
 	
-	public static UDDIClerkManager getManager(String managerName) throws ConfigurationException {
-		if (managers.size()==0) new UDDIClerkManager().start(managerName);
-		if (managers.containsKey(managerName)) {
-			return managers.get(managerName);
-		} else {
-			//creating a new manager, making sure the name matches.
-			throw new ConfigurationException("No UDDI ClerkManager by that name.");
+	public static UDDIClerkManager getManager() throws ConfigurationException {
+		
+		if (manager==null) {
+			UDDIClerkManager.start();
 		}
+		return manager;
 	}
 	
 	
 	
+	
 }
 

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java Thu Oct  8 19:45:29 2009
@@ -31,20 +31,16 @@
 	
 	private static final long serialVersionUID = -91998529871296125L;
 	private Logger logger = Logger.getLogger(UDDIClerkServlet.class);
-    private UDDIClerkManager clerkManager= null;
-    private String managerName = null;
 	/**
-	 * Create the shared instance of jUDDI's Registry class and call it's
-	 * "init()" method to initialize all core components.
+	 * Starting the UDDIClerkManager
 	 */
 	@Override
 	public void init(ServletConfig config) throws ServletException {
 		super.init(config);
 		try {
-			clerkManager = new UDDIClerkManager();
-			managerName = config.getInitParameter("managerName");
-			logger.info("Starting Clerk Manager with Name: " + managerName);
-			clerkManager.start(managerName);
+			
+			logger.info("Starting Clerk Manager");
+			UDDIClerkManager.start();
 		} catch (Exception e) {
 			logger.error("UDDI-client could not be started."
 					+ e.getMessage(), e);
@@ -57,9 +53,7 @@
 	@Override
 	public void destroy() {
 		try {
-			if (clerkManager!=null) {
-				clerkManager.stop(managerName);
-			}
+			UDDIClerkManager.stop();
 		} catch (Exception e) {
 			logger.error("UDDI-client could not be stopped."
 					+ e.getMessage(), e);

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java Thu Oct  8 19:45:29 2009
@@ -27,12 +27,12 @@
 	
 	private Transport transport;
 	
-	public Transport getTransport(String managerName) throws TransportException {
+	public Transport getTransport() throws TransportException {
 		if (transport==null) {
 			try {
-				String clazz = UDDIClerkManager.getClientConfig(managerName).getNodes().get(name).getProxyTransport();
+				String clazz = UDDIClerkManager.getClientConfig().getNodes().get(name).getProxyTransport();
 				Class<?> transportClass = Loader.loadClass(clazz);
-				transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(managerName,name);
+				transport = (Transport) transportClass.getConstructor(String.class).newInstance(name);
 			} catch (Exception e) {
 				throw new TransportException(e.getMessage(),e);
 			}

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/config/XRegistration.java Thu Oct  8 19:45:29 2009
@@ -33,14 +33,18 @@
 	}
 	
 	public void xRegister() {
+		BusinessService businessService;
 		try {
 			BindingTemplate bindingTemplate = fromClerk.findServiceBinding(bindingKey);
-			BusinessService businessService = fromClerk.findService(bindingTemplate.getServiceKey());
+			businessService = fromClerk.findService(bindingTemplate.getServiceKey());
 			businessService.getBindingTemplates().getBindingTemplate().clear();
 			businessService.getBindingTemplates().getBindingTemplate().add(bindingTemplate);
+			log.info("xregister service " + businessService.getName().get(0).getValue() + " + from "
+					+ fromClerk.getName() + " to " + toClerk.getName());
 			toClerk.register(businessService);
 		} catch (Exception e) {
-			log.error("Could not cross-register. " + e.getMessage() + " " + e.getCause(),e);
+			log.error("Could not xregister binding " + bindingKey + " + from "
+					+ fromClerk.getName() + " to " + toClerk.getName() + ". " + e.getMessage() + " " + e.getCause(),e);
 		}
 	}
 	

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java Thu Oct  8 19:45:29 2009
@@ -29,7 +29,6 @@
 public class InVMTransport implements Transport {
 
 	private String nodeName = null;
-	private String managerName = null;
 	UDDIInquiryPortType inquiryService = null;
 	UDDISecurityPortType securityService = null;
 	UDDIPublicationPortType publishService = null;
@@ -41,19 +40,17 @@
 	public InVMTransport() {
 		super();
 		this.nodeName = Transport.DEFAULT_NODE_NAME;
-		this.nodeName = Transport.DEFAULT_MANAGER_NAME;
 	}
 	
-	public InVMTransport(String managerName, String nodeName) {
+	public InVMTransport(String nodeName) {
 		super();
-		this.managerName = managerName;
 		this.nodeName = nodeName;
 	}
 	
 	public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
 		if (inquiryService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getInquiryUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getInquiryUrl();
 				Class<?> c = Class.forName(endpointURL);
 				inquiryService = (UDDIInquiryPortType) c.newInstance();
 			} catch (Exception e) {
@@ -66,7 +63,7 @@
 	public UDDISecurityPortType getUDDISecurityService() throws TransportException {
 		if (securityService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSecurityUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSecurityUrl();
 				Class<?> c = Class.forName(endpointURL);
 				securityService = (UDDISecurityPortType) c.newInstance();
 			} catch (Exception e) {
@@ -79,7 +76,7 @@
 	public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
 		if (publishService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getPublishUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getPublishUrl();
 				Class<?> c = Class.forName(endpointURL);
 				publishService = (UDDIPublicationPortType) c.newInstance();
 			} catch (Exception e) {
@@ -92,7 +89,7 @@
 	public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
 		if (subscriptionService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSubscriptionUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSubscriptionUrl();
 				Class<?> c = Class.forName(endpointURL);
 				subscriptionService = (UDDISubscriptionPortType) c.newInstance();
 			} catch (Exception e) {
@@ -105,7 +102,7 @@
 	public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
 		if (subscriptionListenerService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSubscriptionListenerUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSubscriptionListenerUrl();
 				Class<?> c = Class.forName(endpointURL);
 				subscriptionListenerService = (UDDISubscriptionListenerPortType) c.newInstance();
 			} catch (Exception e) {
@@ -118,7 +115,7 @@
 	public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
 		if (custodyTransferService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getCustodyTransferUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getCustodyTransferUrl();
 				Class<?> c = Class.forName(endpointURL);
 				custodyTransferService = (UDDICustodyTransferPortType) c.newInstance();
 			} catch (Exception e) {
@@ -131,7 +128,7 @@
 	public JUDDIApiPortType getJUDDIApiService() throws TransportException {
 		if (publisherService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getJuddiApiUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getJuddiApiUrl();
 				Class<?> c = Class.forName(endpointURL);
 				publisherService = (JUDDIApiPortType) c.newInstance();
 			} catch (Exception e) {

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java Thu Oct  8 19:45:29 2009
@@ -34,7 +34,6 @@
 public class JAXWSTransport implements Transport {
 
 	String nodeName = null;
-	String managerName = null;
 	UDDIInquiryPortType inquiryService = null;
 	UDDISecurityPortType securityService = null;
 	UDDIPublicationPortType publishService = null;
@@ -46,12 +45,10 @@
 	public JAXWSTransport() {
 		super();
 		this.nodeName = Transport.DEFAULT_NODE_NAME;
-		this.nodeName = Transport.DEFAULT_MANAGER_NAME;
 	}
 	
-	public JAXWSTransport(String managerName, String nodeName) {
+	public JAXWSTransport(String nodeName) {
 		super();
-		this.managerName = managerName;
 		this.nodeName = nodeName;
 	}
 
@@ -59,7 +56,7 @@
 
 		if (inquiryService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getInquiryUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getInquiryUrl();
 				QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.INQUIRY_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				inquiryService = (UDDIInquiryPortType) service.getPort(UDDIInquiryPortType.class);
@@ -74,7 +71,7 @@
 
 		if (securityService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSecurityUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSecurityUrl();
 				QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.SECURITY_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				securityService = (UDDISecurityPortType) service.getPort(UDDISecurityPortType.class);
@@ -89,7 +86,7 @@
 
 		if (publishService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getPublishUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getPublishUrl();
 				QName qName = new QName(Transport.API_V3_NAMESPACE, Transport.PUBLISH_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				publishService = (UDDIPublicationPortType) service.getPort(UDDIPublicationPortType.class);
@@ -104,7 +101,7 @@
 
 		if (subscriptionService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSubscriptionUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSubscriptionUrl();
 				QName qName = new QName(Transport.SUB_V3_NAMESPACE, Transport.SUBSCRIPTION_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				subscriptionService = (UDDISubscriptionPortType) service.getPort(UDDISubscriptionPortType.class);
@@ -118,7 +115,7 @@
 	public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
 		if (subscriptionListenerService == null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSubscriptionListenerUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSubscriptionListenerUrl();
 				QName qName = new QName(Transport.SUBR_V3_NAMESPACE, Transport.SUBSCRIPTION_LISTENER_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				subscriptionListenerService = (UDDISubscriptionListenerPortType) service.getPort(UDDISubscriptionListenerPortType.class);
@@ -132,7 +129,7 @@
 	public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
 		if (custodyTransferService == null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getCustodyTransferUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getCustodyTransferUrl();
 				QName qName = new QName(Transport.CUSTODY_V3_NAMESPACE, Transport.CUSTODY_TRANSFER_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				custodyTransferService = (UDDICustodyTransferPortType) service.getPort(UDDICustodyTransferPortType.class);
@@ -146,7 +143,7 @@
 	public JUDDIApiPortType getJUDDIApiService() throws TransportException {
 		if (publisherService == null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getJuddiApiUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getJuddiApiUrl();
 				QName qName = new QName(Transport.JUDDI_API_V3_NAMESPACE, Transport.PUBLISHER_SERVICE);
 				Service service = Service.create(new URL(endpointURL), qName);
 				publisherService = (JUDDIApiPortType) service.getPort(JUDDIApiPortType.class);

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java Thu Oct  8 19:45:29 2009
@@ -41,26 +41,23 @@
 	InitialContext context = null;
 	private Logger logger = Logger.getLogger(this.getClass());
 	private String nodeName = null;
-	private String managerName = null;
 	
 	public RMITransport() {
 		super();
 		this.nodeName = Transport.DEFAULT_NODE_NAME;
-		this.nodeName = Transport.DEFAULT_MANAGER_NAME;
 	}
 	
-	public RMITransport(String managerName, String nodeName) throws NamingException, ConfigurationException, NotFoundException {
+	public RMITransport(String nodeName) throws NamingException, ConfigurationException, NotFoundException {
 		super();
-		this.managerName = managerName;
 		this.nodeName = nodeName;
 		initContext();
 	}
 	
 	private void initContext() throws NamingException, ConfigurationException, NotFoundException {
 		Properties env = new Properties();
-		String factoryInitial = UDDIClerkManager.getClientConfig(managerName).getConfiguration().getString(Property.UDDI_PROXY_FACTORY_INITIAL);
-		String factoryURLPkgs = UDDIClerkManager.getClientConfig(managerName).getConfiguration().getString(Property.UDDI_PROXY_FACTORY_URL_PKS);
-		String factoryNamingProvider = UDDIClerkManager.getClientConfig(managerName).getConfiguration().getString(Property.UDDI_PROXY_PROVIDER_URL);
+		String factoryInitial = UDDIClerkManager.getClientConfig().getConfiguration().getString(Property.UDDI_PROXY_FACTORY_INITIAL);
+		String factoryURLPkgs = UDDIClerkManager.getClientConfig().getConfiguration().getString(Property.UDDI_PROXY_FACTORY_URL_PKS);
+		String factoryNamingProvider = UDDIClerkManager.getClientConfig().getConfiguration().getString(Property.UDDI_PROXY_PROVIDER_URL);
         if (factoryInitial!=null && factoryInitial!="") env.setProperty(Property.UDDI_PROXY_FACTORY_INITIAL, factoryInitial);
         if (factoryURLPkgs!=null && factoryURLPkgs!="") env.setProperty(Property.UDDI_PROXY_FACTORY_URL_PKS, factoryURLPkgs);
         if (factoryNamingProvider!=null && factoryNamingProvider!="") env.setProperty(Property.UDDI_PROXY_PROVIDER_URL, factoryNamingProvider);
@@ -80,7 +77,7 @@
 	public UDDIInquiryPortType getUDDIInquiryService() throws TransportException {
 		if (inquiryService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getInquiryUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getInquiryUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);
@@ -96,7 +93,7 @@
 	public UDDISecurityPortType getUDDISecurityService() throws TransportException {
 		if (securityService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSecurityUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSecurityUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);
@@ -112,7 +109,7 @@
 	public UDDIPublicationPortType getUDDIPublishService() throws TransportException {
 		if (publishService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getPublishUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getPublishUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);
@@ -128,7 +125,7 @@
 	public UDDISubscriptionPortType getUDDISubscriptionService() throws TransportException {
 		if (subscriptionService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSubscriptionUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSubscriptionUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);
@@ -144,7 +141,7 @@
 	public UDDISubscriptionListenerPortType getUDDISubscriptionListenerService() throws TransportException {
 		if (subscriptionListenerService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getSubscriptionListenerUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getSubscriptionListenerUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);
@@ -160,7 +157,7 @@
 	public UDDICustodyTransferPortType getUDDICustodyTransferService() throws TransportException {
 		if (custodyTransferService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getCustodyTransferUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getCustodyTransferUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);
@@ -176,7 +173,7 @@
 	public JUDDIApiPortType getJUDDIApiService() throws TransportException {
 		if (publisherService==null) {
 			try {
-				String endpointURL = UDDIClerkManager.getClientConfig(managerName).getNodes().get(nodeName).getJuddiApiUrl();
+				String endpointURL = UDDIClerkManager.getClientConfig().getNodes().get(nodeName).getJuddiApiUrl();
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
 		    	logger.debug("Looking up service=" + service);

Modified: webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java (original)
+++ webservices/juddi/trunk/uddi-client/src/main/java/org/apache/juddi/v3/client/transport/Transport.java Thu Oct  8 19:45:29 2009
@@ -32,7 +32,6 @@
 	public final static String CUSTODY_V3_NAMESPACE          = "urn:uddi-org:custody_v3_portType";
 	public final static String JUDDI_API_V3_NAMESPACE        = "urn:juddi-apache-org:api_v3_portType";
 	public final static String DEFAULT_NODE_NAME             = "default";
-	public final static String DEFAULT_MANAGER_NAME          = "default-manager";
 	
 	public final static String INQUIRY_SERVICE               = "UDDIInquiryService";
 	public final static String SECURITY_SERVICE              = "UDDISecurityService";

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/JUDDI_010_PublisherIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -63,7 +63,7 @@
 	
 	@BeforeClass
 	public static void startRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -71,7 +71,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 security = transport.getUDDISecurityService();
 	        	 GetAuthToken getAuthToken = new GetAuthToken();
 	        	 getAuthToken.setUserID("root");
@@ -89,7 +89,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}
@@ -98,10 +98,10 @@
      @Test
      public void testAuthToken() {
 	     try {
-	    	 String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+	    	 String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType securityService = transport.getUDDISecurityService();
 	        	 GetAuthToken getAuthToken = new GetAuthToken();

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java Thu Oct  8 19:45:29 2009
@@ -33,9 +33,7 @@
      @Test
      public void testReadingTheConfig() {
 	     try {
-	    	 UDDIClerkManager clerkManager = new UDDIClerkManager();
-	    	 clerkManager.start("test-manager");
-	    	
+	    	 UDDIClerkManager.start();
 	     } catch (Exception e) {
 	    	 //we should not have any issues reading the config
 	         e.printStackTrace();
@@ -46,7 +44,7 @@
      @Test
      public void testAnnotation() {
     	 try {
-	    	 Map<String,UDDIClerk> clerks = UDDIClerkManager.getClientConfig("test-manager").getClerks();
+	    	 Map<String,UDDIClerk> clerks = UDDIClerkManager.getClientConfig().getClerks();
 	 		 AnnotationProcessor ap = new AnnotationProcessor();
 	 		 UDDIClerk clerk = clerks.get("default");
 	 		 BusinessService service = ap.readServiceAnnotations(

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_010_PublisherIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -35,7 +35,7 @@
 	
 	@BeforeClass
 	public static void startRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -43,7 +43,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}
@@ -52,10 +52,10 @@
      @Test
      public void testAuthToken() {
 	     try {
-	    	 String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+	    	 String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType securityService = transport.getUDDISecurityService();
 	        	 GetAuthToken getAuthToken = new GetAuthToken();

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_020_TmodelIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -46,7 +46,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -54,7 +54,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
@@ -76,7 +76,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_030_BusinessEntityIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -48,7 +48,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -56,7 +56,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
@@ -79,7 +79,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_040_BusinessServiceIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -52,7 +52,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -60,7 +60,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
@@ -85,7 +85,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_050_BindingTemplateIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -54,7 +54,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -62,7 +62,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
@@ -86,7 +86,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_060_PublisherAssertionIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -50,7 +50,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -58,7 +58,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
@@ -83,7 +83,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_070_FindEntityIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -55,7 +55,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -63,7 +63,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID,  TckPublisher.JOE_PUBLISHER_CRED);
@@ -88,7 +88,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_080_SubscriptionIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -56,7 +56,7 @@
 
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -64,7 +64,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
@@ -93,7 +93,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-client/src/test/java/org/apache/juddi/v3/client/UDDI_090_SubscriptionListenerIntegrationTest.java Thu Oct  8 19:45:29 2009
@@ -60,7 +60,7 @@
 
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -68,7 +68,7 @@
 		try {
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
-	        	 Transport transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance("test-manager", "default");
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
 	        	 
 	        	 UDDISecurityPortType security = transport.getUDDISecurityService();
 	        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
@@ -95,7 +95,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig("test-manager").getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml?rev=823291&r1=823290&r2=823291&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/uddi-client/src/test/resources/META-INF/uddi.xml Thu Oct  8 19:45:29 2009
@@ -58,12 +58,12 @@
 				<juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
 			</node>
 		</nodes>
-		<clerks>
+		<clerks registerOnStartup="false">
 		   <clerk name="default" node="default" publisher="root" password="root"/>
-	       <clerk name="medroot" node="med" publisher="root" password="root"/>
-	        <xregister>
+	       <clerk name="medroot" node="med"     publisher="root" password="root"/>
+	       <xregister>
 		       <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
-		    </xregister>
+		   </xregister>
 	   </clerks>
 	</manager>
 </uddi>
\ No newline at end of file



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


Mime
View raw message