juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ks...@apache.org
Subject svn commit: r1481563 [1/3] - in /juddi/trunk: juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client/src/main/java/org/apache/juddi/v3/client/transport/ juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/ juddi-...
Date Sun, 12 May 2013 14:11:32 GMT
Author: kstam
Date: Sun May 12 14:11:29 2013
New Revision: 1481563

URL: http://svn.apache.org/r1481563
Log:
JUDDI-611 UDDIClerkManager -> UDDIClient + adding a uddi-client.xsd

Added:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
      - copied, changed from r1480519, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
    juddi/trunk/juddi-client/src/main/resources/xsd/
    juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
      - copied, changed from r1480518, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java
Removed:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java
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/ClientConfig.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/service/JUDDIApiService.java
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/JUDDIApiServiceImpl.java
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SecurityServiceImpl.java
    juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/server/service/SubscriptionServiceImpl.java
    juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
    juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.marketing
    juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml.sales
    juddi/trunk/juddi-core-openjpa/src/test/resources/META-INF/uddi.xml
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/Node.java
    juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_051_BindingTemplateWSDLTest.java
    juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
    juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
    juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_141_JIRATest.java
    juddi/trunk/juddi-core/src/test/resources/META-INF/uddi.xml
    juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
    juddi/trunk/juddi-examples/create-partition/src/main/resources/META-INF/partition-uddi.xml
    juddi/trunk/juddi-examples/hello-world/src/main/java/org/apache/juddi/example/helloworld/HelloWorld.java
    juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml
    juddi/trunk/juddi-examples/simple-browse/src/main/java/org/apache/juddi/example/browse/SimpleBrowse.java
    juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml
    juddi/trunk/juddi-examples/simple-publish/src/main/java/org/apache/juddi/example/publish/SimplePublish.java
    juddi/trunk/juddi-examples/simple-publish/src/main/resources/META-INF/simple-publish-uddi.xml
    juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
    juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
    juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java
    juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/java/org/apache/juddi/example/wsdl2uddi/Setup.java
    juddi/trunk/juddi-examples/wsdl2uddi-lifecyle/src/main/resources/META-INF/wsdl2uddi-uddi.xml
    juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Delete.java
    juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Find.java
    juddi/trunk/juddi-examples/wsdl2uddi/src/main/java/org/apache/juddi/example/wsdl2uddi/Publish.java
    juddi/trunk/juddi-examples/wsdl2uddi/src/main/resources/META-INF/wsdl2uddi-uddi.xml
    juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
    juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java

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=1481563&r1=1481562&r2=1481563&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 Sun May 12 14:11:29 2013
@@ -22,25 +22,25 @@ import org.apache.commons.logging.LogFac
 
 public class BackGroundRegistration implements Runnable {
 
-	private UDDIClerkManager manager = null;
+	private UDDIClient uddiClient = null;
 	private static Log log = LogFactory.getLog(BackGroundRegistration.class);
 	
-	public BackGroundRegistration(UDDIClerkManager manager) {
+	public BackGroundRegistration(UDDIClient manager) {
 		super();
-		this.manager = manager;
+		this.uddiClient = manager;
 	}
 
 	public void run() {
 		try {
-			if (UDDIClientContainer.getUDDIClerkManager(manager.getName())!=null && manager.getClientConfig().isRegisterOnStartup()) {
-				log.debug("Starting UDDI Clerks for manager " + manager.getClientConfig().getManagerName() + "...");
-				manager.saveClerkAndNodeInfo();
-				manager.registerAnnotatedServices();
-				manager.registerWSDLs();
-				manager.xRegister();
-				log.debug("Clerks started succesfully for manager " + manager.getClientConfig().getManagerName());
+			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(manager.getName() + " already registered to the UDDIClientContainer.");
+				log.debug(uddiClient.getName() + " already registered to the UDDIClientContainer.");
 			}
 		} catch (ConfigurationException e) {
 			log.error(e.getMessage(),e);

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Sun May 12 14:11:29 2013
@@ -47,7 +47,7 @@ public class ClientConfig 
 	private Map<String,UDDIClerk> uddiClerks = null;
 	private Set<XRegistration> xBusinessRegistrations = null;
 	private Set<XRegistration> xServiceBindingRegistrations = null;
-	private String managerName = null;
+	private String clientName = null;
 	private String configurationFile=null;
 	
 	/**
@@ -66,7 +66,7 @@ public class ClientConfig 
 	{
 		loadConfiguration(configurationFile, properties);
 	}
-	protected void loadManager(Properties properties) throws ConfigurationException {
+	protected void readConfig(Properties properties) throws ConfigurationException {
 		uddiNodes = readNodeConfig(config, properties);
 		uddiClerks = readClerkConfig(config, uddiNodes);
 		xServiceBindingRegistrations = readXServiceBindingRegConfig(config,uddiClerks);
@@ -104,45 +104,45 @@ public class ClientConfig 
 		compositeConfig.addConfiguration(xmlConfig);
 		//Making the new configuration globally accessible.
 		config = compositeConfig;
-		loadManager(properties);
+		readConfig(properties);
 	}
 
 	private Map<String,UDDIClerk> readClerkConfig(Configuration config, Map<String,UDDINode> uddiNodes) 
 	throws ConfigurationException {
-		managerName = config.getString("manager[@name]");
+		clientName = config.getString("client[@name]");
 		Map<String,UDDIClerk> clerks = new HashMap<String,UDDIClerk>();
-		if (config.containsKey("manager.clerks.clerk[@name]")) {
-			String[] names = config.getStringArray("manager.clerks.clerk[@name]");
+		if (config.containsKey("client.clerks.clerk[@name]")) {
+			String[] names = config.getStringArray("client.clerks.clerk[@name]");
 			
 			log.debug("clerk names=" + names);
 			for (int i=0; i<names.length; i++) {
 				UDDIClerk uddiClerk = new UDDIClerk();
-				uddiClerk.setManagerName(managerName);
-				uddiClerk.setName(     config.getString("manager.clerks.clerk(" + i + ")[@name]"));
-				String nodeRef = config.getString("manager.clerks.clerk(" + i + ")[@node]");
+				uddiClerk.setManagerName(clientName);
+				uddiClerk.setName(     config.getString("client.clerks.clerk(" + i + ")[@name]"));
+				String nodeRef = config.getString("client.clerks.clerk(" + i + ")[@node]");
 				if (!uddiNodes.containsKey(nodeRef)) throw new ConfigurationException("Could not find Node with name=" + nodeRef);
 				UDDINode uddiNode = uddiNodes.get(nodeRef);
 				uddiClerk.setUDDINode(uddiNode);
-				uddiClerk.setPublisher(config.getString("manager.clerks.clerk(" + i + ")[@publisher]"));
-				uddiClerk.setPassword( config.getString("manager.clerks.clerk(" + i + ")[@password]"));
+				uddiClerk.setPublisher(config.getString("client.clerks.clerk(" + i + ")[@publisher]"));
+				uddiClerk.setPassword( config.getString("client.clerks.clerk(" + i + ")[@password]"));
 				
-				String clerkBusinessKey = config.getString("manager.clerks.clerk(" + i + ")[@businessKey]");
-				String clerkBusinessName = config.getString("manager.clerks.clerk(" + i + ")[@businessName]");
-				String clerkKeyDomain = config.getString("manager.clerks.clerk(" + i + ")[@keyDomain]");
+				String clerkBusinessKey = config.getString("client.clerks.clerk(" + i + ")[@businessKey]");
+				String clerkBusinessName = config.getString("client.clerks.clerk(" + i + ")[@businessName]");
+				String clerkKeyDomain = config.getString("client.clerks.clerk(" + i + ")[@keyDomain]");
 				
-				String[] classes = config.getStringArray("manager.clerks.clerk(" + i + ").class");
+				String[] classes = config.getStringArray("client.clerks.clerk(" + i + ").class");
 				uddiClerk.setClassWithAnnotations(classes);
 				
-				int numberOfWslds = config.getStringArray("manager.clerks.clerk(" + i + ").wsdl").length;
+				int numberOfWslds = config.getStringArray("client.clerks.clerk(" + i + ").wsdl").length;
 				if (numberOfWslds > 0) {
 					UDDIClerk.WSDL[] wsdls = new UDDIClerk.WSDL[numberOfWslds];
 					for (int w=0; w<wsdls.length; w++) {
 						UDDIClerk.WSDL wsdl = uddiClerk.new WSDL();
-						String fileName = config.getString("manager.clerks.clerk(" + i + ").wsdl(" + w + ")");
+						String fileName = config.getString("client.clerks.clerk(" + i + ").wsdl(" + w + ")");
 						wsdl.setFileName(fileName);
-						String businessKey = config.getString("manager.clerks.clerk(" + i + ").wsdl(" + w + ")[@businessKey]");
-						String businessName = config.getString("manager.clerks.clerk(" + i + ").wsdl(" + w + ")[@businessName]");
-						String keyDomain = config.getString("manager.clerks.clerk(" + i + ").wsdl(" + w + ")[@keyDomain]");
+						String businessKey = config.getString("client.clerks.clerk(" + i + ").wsdl(" + w + ")[@businessKey]");
+						String businessName = config.getString("client.clerks.clerk(" + i + ").wsdl(" + w + ")[@businessName]");
+						String keyDomain = config.getString("client.clerks.clerk(" + i + ").wsdl(" + w + ")[@keyDomain]");
 						if (businessKey==null) businessKey = clerkBusinessKey;
 						if (businessKey==null) businessKey = uddiClerk.getUDDINode().getProperties().getProperty("businessKey");
 						if (businessKey==null) {
@@ -181,47 +181,47 @@ public class ClientConfig 
 	
 	public boolean isRegisterOnStartup() {
 		boolean isRegisterOnStartup = false;
-		if (config.containsKey("manager.clerks[@registerOnStartup]")) {
-			isRegisterOnStartup = config.getBoolean("manager.clerks[@registerOnStartup]");
+		if (config.containsKey("client.clerks[@registerOnStartup]")) {
+			isRegisterOnStartup = config.getBoolean("client.clerks[@registerOnStartup]");
 		}
 		return isRegisterOnStartup;
 	}
 
 	private Map<String,UDDINode> readNodeConfig(Configuration config, Properties properties) 
 	throws ConfigurationException {
-		String[] names = config.getStringArray("manager.nodes.node.name");
+		String[] names = config.getStringArray("client.nodes.node.name");
 		Map<String,UDDINode> nodes = new HashMap<String,UDDINode>();
 		log.debug("node names=" + names);
 		for (int i=0; i<names.length; i++) {
 			UDDINode uddiNode = new UDDINode();
-			String nodeName = config.getString("manager.nodes.node(" + i +").name");
-			String[] propertyKeys = config.getStringArray("manager.nodes.node(" + i +").properties.property[@name]");
+			String nodeName = config.getString("client.nodes.node(" + i +").name");
+			String[] propertyKeys = config.getStringArray("client.nodes.node(" + i +").properties.property[@name]");
 			
 			if (propertyKeys!=null && propertyKeys.length>0) {
 				if (properties==null) properties = new Properties();
 				for (int p=0; p<propertyKeys.length; p++) {
-					String name=config.getString("manager.nodes.node(" + i +").properties.property(" + p + ")[@name]");
-					String value=config.getString("manager.nodes.node(" + i +").properties.property(" + p + ")[@value]");
+					String name=config.getString("client.nodes.node(" + i +").properties.property(" + p + ")[@name]");
+					String value=config.getString("client.nodes.node(" + i +").properties.property(" + p + ")[@value]");
 					log.debug("Property: name=" + name + " value=" + value);
 					properties.put(name, value);
 				}
 				uddiNode.setProperties(properties);
 			}
-			uddiNode.setHomeJUDDI(              config.getBoolean("manager.nodes.node(" + i +")[@isHomeJUDDI]",false));
-			uddiNode.setName(                   TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").name"),properties));
-			uddiNode.setManagerName(            TokenResolver.replaceTokens(config.getString("manager[@name]"),properties));
-			uddiNode.setDescription(            TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").description"),properties));
-			uddiNode.setProxyTransport(         TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").proxyTransport"),properties));
-			uddiNode.setInquiryUrl(             TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").inquiryUrl"),properties));
-			uddiNode.setPublishUrl(             TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").publishUrl"),properties));
-			uddiNode.setCustodyTransferUrl(     TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").custodyTransferUrl"),properties));
-			uddiNode.setSecurityUrl(            TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").securityUrl"),properties));
-			uddiNode.setSubscriptionUrl(        TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").subscriptionUrl"),properties));
-			uddiNode.setSubscriptionListenerUrl(TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").subscriptionListenerUrl"),properties));
-			uddiNode.setJuddiApiUrl(            TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").juddiApiUrl"),properties));
-			uddiNode.setFactoryInitial(         TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").javaNamingFactoryInitial"),properties));
-			uddiNode.setFactoryURLPkgs(         TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").javaNamingFactoryUrlPkgs"),properties));
-			uddiNode.setFactoryNamingProvider(  TokenResolver.replaceTokens(config.getString("manager.nodes.node(" + i +").javaNamingProviderUrl"),properties));
+			uddiNode.setHomeJUDDI(              config.getBoolean("client.nodes.node(" + i +")[@isHomeJUDDI]",false));
+			uddiNode.setName(                   TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").name"),properties));
+			uddiNode.setClientName(             TokenResolver.replaceTokens(config.getString("client[@name]"),properties));
+			uddiNode.setDescription(            TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").description"),properties));
+			uddiNode.setProxyTransport(         TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").proxyTransport"),properties));
+			uddiNode.setInquiryUrl(             TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").inquiryUrl"),properties));
+			uddiNode.setPublishUrl(             TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").publishUrl"),properties));
+			uddiNode.setCustodyTransferUrl(     TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").custodyTransferUrl"),properties));
+			uddiNode.setSecurityUrl(            TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").securityUrl"),properties));
+			uddiNode.setSubscriptionUrl(        TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").subscriptionUrl"),properties));
+			uddiNode.setSubscriptionListenerUrl(TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").subscriptionListenerUrl"),properties));
+			uddiNode.setJuddiApiUrl(            TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").juddiApiUrl"),properties));
+			uddiNode.setFactoryInitial(         TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").javaNamingFactoryInitial"),properties));
+			uddiNode.setFactoryURLPkgs(         TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").javaNamingFactoryUrlPkgs"),properties));
+			uddiNode.setFactoryNamingProvider(  TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").javaNamingProviderUrl"),properties));
 			nodes.put(nodeName,uddiNode);
 		}
 		return nodes;
@@ -239,19 +239,19 @@ public class ClientConfig 
 	
 	private Set<XRegistration> readXRegConfig(Configuration config, Map<String,UDDIClerk> clerks, String entityType) 
 	throws ConfigurationException {
-		String[] entityKeys = config.getStringArray("manager.clerks.xregister." + entityType + "[@entityKey]");
+		String[] entityKeys = config.getStringArray("client.clerks.xregister." + entityType + "[@entityKey]");
 		Set<XRegistration> xRegistrations = new HashSet<XRegistration>();
 		if (entityKeys.length > 0) log.info("XRegistration " + entityKeys.length + " " + entityType + "Keys");
 		for (int i=0; i<entityKeys.length; i++) {
 			XRegistration xRegistration = new XRegistration();
-			xRegistration.setEntityKey(config.getString("manager.clerks.xregister." + entityType + "(" + i + ")[@entityKey]"));
+			xRegistration.setEntityKey(config.getString("client.clerks.xregister." + entityType + "(" + i + ")[@entityKey]"));
 			
-			String fromClerkRef = config.getString("manager.clerks.xregister." + entityType + "(" + i + ")[@fromClerk]");
+			String fromClerkRef = config.getString("client.clerks.xregister." + entityType + "(" + i + ")[@fromClerk]");
 			if (!clerks.containsKey(fromClerkRef)) throw new ConfigurationException("Could not find fromClerk with name=" + fromClerkRef);
 			UDDIClerk fromClerk = clerks.get(fromClerkRef);
 			xRegistration.setFromClerk(fromClerk);
 			
-			String toClerkRef = config.getString("manager.clerks.xregister." + entityType + "(" + i + ")[@toClerk]");
+			String toClerkRef = config.getString("client.clerks.xregister." + entityType + "(" + i + ")[@toClerk]");
 			if (!clerks.containsKey(toClerkRef)) throw new ConfigurationException("Could not find toClerk with name=" + toClerkRef);
 			UDDIClerk toClerk = clerks.get(toClerkRef);
 			xRegistration.setToClerk(toClerk);
@@ -281,7 +281,7 @@ public class ClientConfig 
 	public UDDINode getUDDINode(String nodeName) throws ConfigurationException {
 		if (! uddiNodes.containsKey(nodeName)) {
 			throw new ConfigurationException("Node '" + nodeName 
-					+ "' cannot be found in the config '"+  getManagerName() + "'" );
+					+ "' cannot be found in the config '"+  getClientName() + "'" );
 		}
 		return uddiNodes.get(nodeName);
 	}
@@ -302,8 +302,8 @@ public class ClientConfig 
     	return config;
     }
     
-    public String getManagerName() {
-		return managerName;
+    public String getClientName() {
+		return clientName;
 	}
     
     public String getConfigurationFile() {

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java Sun May 12 14:11:29 2013
@@ -32,16 +32,16 @@ public class UDDIClerkServlet extends Ht
 	
 	private static final long serialVersionUID = -91998529871296125L;
 	private Log logger = LogFactory.getLog(UDDIClerkServlet.class);
-	private UDDIClerkManager manager = null;
+	private UDDIClient manager = null;
 	
 	/**
-	 * Starting the UDDIClerkManager
+	 * Starting the UDDIClient
 	 */
 	@Override
 	public void init(ServletConfig config) throws ServletException {
 		super.init(config);
 		try {
-			manager = WebHelper.getUDDIClerkManager(config.getServletContext());
+			manager = WebHelper.getUDDIClient(config.getServletContext());
 			if (manager.getClientConfig().isRegisterOnStartup()) {
 				manager.registerWSDLs();
 			}

Copied: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java (from r1480519, juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java?p2=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java&p1=juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java&r1=1480519&r2=1481563&rev=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java Sun May 12 14:11:29 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.juddi.v3.client.config;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.rmi.RemoteException;
 import java.util.Collection;
 import java.util.List;
@@ -25,62 +23,56 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.embed.EmbeddedRegistry;
 import org.apache.juddi.v3.annotations.AnnotationProcessor;
 import org.apache.juddi.v3.client.ClassUtil;
-import org.apache.juddi.v3.client.mapping.ReadWSDL;
-import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
-import org.apache.juddi.v3.client.mapping.WSDL2UDDI;
+import org.apache.juddi.v3.client.embed.EmbeddedRegistry;
 import org.apache.juddi.v3.client.transport.InVMTransport;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.apache.juddi.v3.client.transport.TransportException;
 import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.BusinessService;
 
-import com.ibm.wsdl.util.IOUtils;
-
-public class UDDIClerkManager {
+public class UDDIClient {
 	
-	private static Log log = LogFactory.getLog(UDDIClerkManager.class);
+	private static Log log = LogFactory.getLog(UDDIClient.class);
     private ClientConfig clientConfig = null;
     private String CONFIG_FILE = "META-INF/uddi.xml";
     private Properties properties = null;
 	
-    public UDDIClerkManager() throws ConfigurationException {
+    public UDDIClient() throws ConfigurationException {
     	super();
 		clientConfig = new ClientConfig(CONFIG_FILE, properties);
-		UDDIClientContainer.addClerkManager(this);
+		UDDIClientContainer.addClient(this);
     }
 	/**
 	 * Manages the clerks. Initiates reading the client configuration from the uddi.xml.
 	 * @throws ConfigurationException 
 	 */
-	public UDDIClerkManager(String configurationFile) throws ConfigurationException {
+	public UDDIClient(String configurationFile) throws ConfigurationException {
 		super();
 		clientConfig = new ClientConfig(configurationFile);
-		UDDIClientContainer.addClerkManager(this);
+		UDDIClientContainer.addClient(this);
 	}
 	/**
 	 * Manages the clerks. Initiates reading the client configuration from the uddi.xml.
 	 * @throws ConfigurationException 
 	 */
-	public UDDIClerkManager(String configurationFile, Properties properties) throws ConfigurationException {
+	public UDDIClient(String configurationFile, Properties properties) throws ConfigurationException {
 		super();
 		clientConfig = new ClientConfig(configurationFile, properties);
-		UDDIClientContainer.addClerkManager(this);
+		UDDIClientContainer.addClient(this);
 	}
 	/**
 	 * Stops the clerks.
 	 * @throws ConfigurationException 
 	 */
 	public void stop() throws ConfigurationException {
-		log.info("Stopping UDDI Clerks for manager " + clientConfig.getManagerName());
+		log.info("Stopping UDDI Client " + clientConfig.getClientName());
 		releaseResources();
 		UDDIClientContainer.removeClerkManager(getName());
 		
@@ -89,7 +81,7 @@ public class UDDIClerkManager {
 			log.info("Shutting down embedded Server");
 			stopEmbeddedServer();
 		}
-		log.info("UDDI Clerks shutdown completed for manager " + clientConfig.getManagerName());
+		log.info("UDDI Clerks shutdown completed for manager " + clientConfig.getClientName());
 	}
 	
 	private void releaseResources() {
@@ -104,7 +96,7 @@ public class UDDIClerkManager {
 	 */
 	public void start() throws ConfigurationException {
 		
-		if (UDDIClientContainer.addClerkManager(this)) {
+		if (UDDIClientContainer.addClient(this)) {
 			//If running in embedded mode
 			if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
 				log.info("Starting embedded Server");
@@ -282,7 +274,7 @@ public class UDDIClerkManager {
 	}
 	
 	public String getName() {
-		return clientConfig.getManagerName();
+		return clientConfig.getClientName();
 	}
 	/**
 	 * @deprecated, use the getTransport(String nodeName) instead.
@@ -303,8 +295,8 @@ public class UDDIClerkManager {
 	public Transport getTransport(String nodeName) throws ConfigurationException {
 		try {
 			String clazz = clientConfig.getHomeNode().getProxyTransport();
-			String managerName = clientConfig.getManagerName();
-			Class<?> transportClass = ClassUtil.forName(clazz, UDDIClerkManager.class);
+			String managerName = clientConfig.getClientName();
+			Class<?> transportClass = ClassUtil.forName(clazz, UDDIClient.class);
 			if (transportClass!=null) {
 				Transport transport = (Transport) 
 						transportClass.getConstructor(String.class,String.class).newInstance(managerName,nodeName);

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=1481563&r1=1481562&r2=1481563&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 Sun May 12 14:11:29 2013
@@ -25,49 +25,49 @@ import org.apache.commons.logging.LogFac
 public class UDDIClientContainer {
 
 	private static Log log = LogFactory.getLog(UDDIClientContainer.class);
-	private static Map<String,UDDIClerkManager> managers = new HashMap<String, UDDIClerkManager>();
+	private static Map<String,UDDIClient> clients = new HashMap<String, UDDIClient>();
 	
-	public static UDDIClerkManager getUDDIClerkManager(String managerName) 
+	public static UDDIClient getUDDIClient(String clientName) 
 		throws ConfigurationException {
 
-		if (managerName!=null) {
-			if (managers.containsKey(managerName)) {
-				return (managers.get(managerName));
+		if (clientName!=null) {
+			if (clients.containsKey(clientName)) {
+				return (clients.get(clientName));
 			} else {
-				throw new ConfigurationException("No manager by name " + managerName + " was found. " +
-						" Please check your client uddi.xml files, and make sure this manager was started");
+				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 (managers.size()==1 && managerName==null) {
-			log.warn("Deprecated, please specify a manager name");
-			return managers.values().iterator().next();
+		} 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 manager name");
-			UDDIClerkManager manager = new UDDIClerkManager(null);
-			addClerkManager(manager);
-			manager.start();
-			return manager;
+			log.warn("Deprecated, please specify a client name");
+			UDDIClient client = new UDDIClient(null);
+			addClient(client);
+			client.start();
+			return client;
 		}
 	}
 	
-	public static boolean addClerkManager(UDDIClerkManager manager) {
-		if (!managers.containsKey(manager.getClientConfig().getManagerName())) {
-			managers.put(manager.getClientConfig().getManagerName(), manager);
+	public static boolean addClient(UDDIClient manager) {
+		if (!clients.containsKey(manager.getClientConfig().getClientName())) {
+			clients.put(manager.getClientConfig().getClientName(), manager);
 			return true;
 		} else {
 			return false;
 		}
 	}
 	
-	public static void removeClerkManager(String managerName)
+	public static void removeClerkManager(String clientName)
 		throws ConfigurationException {
-		if (managers.containsKey(managerName)) {
-			managers.remove(managerName);
-		} else if (managers.size()==1 && managerName==null) {
-			String name = managers.keySet().iterator().next();
+		if (clients.containsKey(clientName)) {
+			clients.remove(clientName);
+		} else if (clients.size()==1 && clientName==null) {
+			String name = clients.keySet().iterator().next();
 			log.info("Removing " + name + " from UDDIClient.");
-			managers.remove(name);
+			clients.remove(name);
 		} else {
-			throw new ConfigurationException("Could not remove UDDIClerkManager for name " + managerName);
+			throw new ConfigurationException("Could not remove UDDIClient for name " + clientName);
 		}
 	}
 	

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java Sun May 12 14:11:29 2013
@@ -32,7 +32,7 @@ public class UDDINode implements Seriali
 	
 	private boolean isHomeJUDDI;
 	private String name;
-	private String managerName;
+	private String clientName;
 	private String description;
 	private String custodyTransferUrl;
 	private String inquiryUrl;
@@ -54,7 +54,7 @@ public class UDDINode implements Seriali
 	public UDDINode(Node node) {
 		super();
 		name = node.getName();
-		managerName = node.getManagerName();
+		clientName = node.getClientName();
 		description = node.getDescription();
 		custodyTransferUrl = node.getCustodyTransferUrl();
 		inquiryUrl = node.getInquiryUrl();
@@ -86,7 +86,7 @@ public class UDDINode implements Seriali
 		apiNode.setFactoryURLPkgs(factoryURLPkgs);
 		apiNode.setInquiryUrl(inquiryUrl);
 		apiNode.setJuddiApiUrl(juddiApiUrl);
-		apiNode.setManagerName(managerName);
+		apiNode.setClientName(clientName);
 		apiNode.setName(name);
 		apiNode.setProxyTransport(proxyTransport);
 		apiNode.setPublishUrl(publishUrl);
@@ -101,7 +101,7 @@ public class UDDINode implements Seriali
 			try {
 				String clazz = getProxyTransport();
 				Class<?> transportClass = ClassUtil.forName(clazz,this.getClass());
-				transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(managerName,name);
+				transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(clientName,name);
 			} catch (Exception e) {
 				throw new TransportException(e.getMessage(),e);
 			}
@@ -117,12 +117,12 @@ public class UDDINode implements Seriali
 		this.name = name;
 	}
 
-	public String getManagerName() {
-		return managerName;
+	public String getClientName() {
+		return clientName;
 	}
 
-	public void setManagerName(String managerName) {
-		this.managerName = managerName;
+	public void setClientName(String clientName) {
+		this.clientName = clientName;
 	}
 
 	public String getDescription() {

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java Sun May 12 14:11:29 2013
@@ -31,9 +31,9 @@ import org.apache.juddi.v3.client.transp
 public class WebHelper {
 	
 	public static Log logger = LogFactory.getLog(WebHelper.class);
-	public static final String UDDI_CLIENT_MANAGER_NAME  = "uddi.client.manager.name";
+	public static final String UDDI_CLIENT_NAME           = "uddi.client.name";
 	public static final String UDDI_CLIENT_CONFIG_FILE    = "uddi.client.config.file";
-	public static final String JUDDI_CLIENT_MANAGER_NAME  = "juddi.client.manager.name";
+	public static final String JUDDI_CLIENT_NAME          = "juddi.client.name";
 	public static final String JUDDI_CLIENT_TRANSPORT     = "juddi.client.transport";
 	
 
@@ -59,41 +59,41 @@ public class WebHelper {
 	 * @return
 	 * @throws ConfigurationException
 	 */
-	public static UDDIClerkManager getUDDIClerkManager(ServletContext servletContext) throws ConfigurationException 
+	public static UDDIClient getUDDIClient(ServletContext servletContext) throws ConfigurationException 
 	{
-		if (servletContext.getAttribute(JUDDI_CLIENT_MANAGER_NAME)!=null) {
-			String managerName = String.valueOf(servletContext.getAttribute(JUDDI_CLIENT_MANAGER_NAME));
-			return UDDIClientContainer.getUDDIClerkManager(managerName);
+		if (servletContext.getAttribute(JUDDI_CLIENT_NAME)!=null) {
+			String clientName = String.valueOf(servletContext.getAttribute(JUDDI_CLIENT_NAME));
+			return UDDIClientContainer.getUDDIClient(clientName);
 		} else {
-			String managerName = servletContext.getInitParameter(UDDI_CLIENT_MANAGER_NAME);
-			if (managerName!=null) {
+			String clientName = servletContext.getInitParameter(UDDI_CLIENT_NAME);
+			if (clientName!=null) {
 				try {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					logger.info("Manager " + managerName + " was already started.");
-					servletContext.setAttribute(JUDDI_CLIENT_MANAGER_NAME, managerName);
-					return manager;
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					logger.info("Client " + clientName + " was already started.");
+					servletContext.setAttribute(JUDDI_CLIENT_NAME, clientName);
+					return client;
 				} catch (ConfigurationException ce) {
-					logger.debug("Manager " + managerName + " is not yet started.");
+					logger.debug("Client " + clientName + " is not yet started.");
 				}
 			}
 			String clientConfigFile = servletContext.getInitParameter(UDDI_CLIENT_CONFIG_FILE);
 			if (clientConfigFile==null) clientConfigFile = ClientConfig.DEFAULT_UDDI_CONFIG;
 			
-			logger.info("Reading the managerName from the clientConfig file " + clientConfigFile);
-			UDDIClerkManager manager = new UDDIClerkManager(clientConfigFile);
-			if (clientConfigFile==null && manager.getName()==null) {
-				logger.warn("Deprecated, manager name set to 'default', however it should be provided in the uddi.xml");
-				managerName = "default";
+			logger.info("Reading the clientName from the clientConfig file " + clientConfigFile);
+			UDDIClient client = new UDDIClient(clientConfigFile);
+			if (clientConfigFile==null && client.getName()==null) {
+				logger.warn("Deprecated, client name set to 'default', however it should be provided in the uddi.xml");
+				clientName = "default";
 			}
-			if (manager.getName()!=null) {
-				logger.info("Starting Clerk Manager " + manager.getName() + "...");
+			if (client.getName()!=null) {
+				logger.info("Starting Client " + client.getName() + "...");
 			} else {
-				throw new ConfigurationException("A manager name needs to be specified in the client config file.");
+				throw new ConfigurationException("A client name needs to be specified in the client config file.");
 			}
 			
-			manager.start();
-			servletContext.setAttribute(JUDDI_CLIENT_MANAGER_NAME, managerName);
-			return manager;
+			client.start();
+			servletContext.setAttribute(JUDDI_CLIENT_NAME, clientName);
+			return client;
 		}
 	}
 	/**
@@ -103,8 +103,8 @@ public class WebHelper {
 	 * @throws ConfigurationException
 	 */
 	public static UDDINode getUDDIHomeNode(ServletContext servletContext) throws ConfigurationException {
-		UDDIClerkManager manager = getUDDIClerkManager(servletContext);
-		return manager.getClientConfig().getHomeNode();	
+		UDDIClient client = getUDDIClient(servletContext);
+		return client.getClientConfig().getHomeNode();	
 	}
 	
 	public static Transport getTransport(ServletContext servletContext) 
@@ -113,10 +113,10 @@ public class WebHelper {
 	{
 		Transport transport = (Transport) servletContext.getAttribute(JUDDI_CLIENT_TRANSPORT);
 		if (transport==null) {
-			UDDIClerkManager manager = getUDDIClerkManager(servletContext);
-			UDDINode node = manager.getClientConfig().getHomeNode();
+			UDDIClient client = getUDDIClient(servletContext);
+			UDDINode node = client.getClientConfig().getHomeNode();
 			Class<?> transportClass = ClassUtil.forName(node.getProxyTransport(), Transport.class);
-			transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(manager.getName(),node.getName());
+			transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(client.getName(),node.getName());
 			servletContext.setAttribute(JUDDI_CLIENT_TRANSPORT, transport);
 		}
 		return transport;
@@ -128,7 +128,7 @@ public class WebHelper {
 	{
 		Transport transport = (Transport) servletContext.getAttribute(JUDDI_CLIENT_TRANSPORT + "-" + remoteNode.getName());
 		if (transport==null) {
-			UDDIClerkManager manager = getUDDIClerkManager(servletContext);
+			UDDIClient manager = getUDDIClient(servletContext);
 			Class<?> transportClass = ClassUtil.forName(remoteNode.getProxyTransport(), Transport.class);
 			transport = (Transport) transportClass.getConstructor(String.class,String.class).newInstance(manager.getName(),remoteNode.getName());
 			servletContext.setAttribute(JUDDI_CLIENT_TRANSPORT + "-" + remoteNode.getName(), transport);

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/InVMTransport.java Sun May 12 14:11:29 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.juddi.v3.client.transport;
 
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.v3_service.UDDICustodyTransferPortType;
@@ -30,7 +30,7 @@ import org.uddi.v3_service.UDDISubscript
 public class InVMTransport extends Transport {
 
 	private String nodeName = null;
-	private String managerName = null;
+	private String clientName = null;
 	UDDIInquiryPortType inquiryService = null;
 	UDDISecurityPortType securityService = null;
 	UDDIPublicationPortType publishService = null;
@@ -49,18 +49,18 @@ public class InVMTransport extends Trans
 		this.nodeName = nodeName;
 	}
 	
-	public InVMTransport(String managerName, String nodeName) {
+	public InVMTransport(String clientName, String nodeName) {
 		super();
 		this.nodeName = nodeName;
-		this.managerName = managerName;
+		this.clientName = clientName;
 	}
 	
 	public UDDIInquiryPortType getUDDIInquiryService(String endpointURL) throws TransportException {
 		if (inquiryService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				inquiryService = (UDDIInquiryPortType) c.newInstance();
@@ -75,8 +75,8 @@ public class InVMTransport extends Trans
 		if (securityService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				securityService = (UDDISecurityPortType) c.newInstance();
@@ -91,8 +91,8 @@ public class InVMTransport extends Trans
 		if (publishService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getPublishUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				publishService = (UDDIPublicationPortType) c.newInstance();
@@ -107,8 +107,8 @@ public class InVMTransport extends Trans
 		if (subscriptionService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				subscriptionService = (UDDISubscriptionPortType) c.newInstance();
@@ -123,8 +123,8 @@ public class InVMTransport extends Trans
 		if (subscriptionListenerService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				subscriptionListenerService = (UDDISubscriptionListenerPortType) c.newInstance();
@@ -139,8 +139,8 @@ public class InVMTransport extends Trans
 		if (custodyTransferService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				custodyTransferService = (UDDICustodyTransferPortType) c.newInstance();
@@ -155,8 +155,8 @@ public class InVMTransport extends Trans
 		if (publisherService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
 				}
 				Class<?> c = Class.forName(endpointURL);
 				publisherService = (JUDDIApiPortType) c.newInstance();

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java Sun May 12 14:11:29 2013
@@ -25,7 +25,7 @@ import org.apache.commons.configuration.
 import org.apache.juddi.v3.client.JUDDIApiService;
 import org.apache.juddi.v3.client.UDDIService;
 import org.apache.juddi.v3.client.config.Property;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.v3_service.UDDICustodyTransferPortType;
@@ -39,7 +39,7 @@ import org.uddi.v3_service.UDDISubscript
 public class JAXWSTransport extends Transport {
 	
 	String nodeName = null;
-	String managerName = null;
+	String clientName = null;
 	UDDIInquiryPortType inquiryService = null;
 	UDDISecurityPortType securityService = null;
 	UDDIPublicationPortType publishService = null;
@@ -58,9 +58,9 @@ public class JAXWSTransport extends Tran
 		this.nodeName = nodeName;
 	}
 	
-	public JAXWSTransport(String managerName, String nodeName) {
+	public JAXWSTransport(String clientName, String nodeName) {
 		super();
-		this.managerName = managerName;
+		this.clientName = clientName;
 		this.nodeName = nodeName;
 	}
 	
@@ -69,8 +69,8 @@ public class JAXWSTransport extends Tran
 		if (inquiryService==null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
 				}
 				UDDIService service = new UDDIService();
 				inquiryService = service.getUDDIInquiryPort();
@@ -89,8 +89,8 @@ public class JAXWSTransport extends Tran
 		if (securityService==null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
 				}
 				UDDIService service = new UDDIService();
 				securityService = service.getUDDISecurityPort();
@@ -109,8 +109,8 @@ public class JAXWSTransport extends Tran
 		if (publishService==null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getPublishUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl();
 				}
 				UDDIService service = new UDDIService();
 				publishService = service.getUDDIPublicationPort();
@@ -129,8 +129,8 @@ public class JAXWSTransport extends Tran
 		if (subscriptionService==null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
 				}
 				UDDIService service = new UDDIService();
 				subscriptionService = service.getUDDISubscriptionPort();
@@ -148,8 +148,8 @@ public class JAXWSTransport extends Tran
 		if (subscriptionListenerService == null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
 				}
 				UDDIService service = new UDDIService();
 				subscriptionListenerService = service.getUDDISubscriptionListenerPort();
@@ -167,8 +167,8 @@ public class JAXWSTransport extends Tran
 		if (custodyTransferService == null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
 				}
 				UDDIService service = new UDDIService();
 				custodyTransferService = service.getUDDICustodyPort();
@@ -189,8 +189,8 @@ public class JAXWSTransport extends Tran
 		if (publisherService == null) {
 			try {
 				if (endpointURL==null)  {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
 				}
 				JUDDIApiService service = new JUDDIApiService();
 				publisherService = (JUDDIApiPortType) service.getPort(JUDDIApiPortType.class);
@@ -221,8 +221,8 @@ public class JAXWSTransport extends Tran
 	 * @throws ConfigurationException
 	 */
 	private void setCredentials(Map<String, Object> requestContext) throws ConfigurationException {
-		UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-		Properties properties = manager.getClientConfig().getUDDINode(nodeName).getProperties();
+		UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+		Properties properties = client.getClientConfig().getUDDINode(nodeName).getProperties();
 		if (properties!=null) {
     		String username = null;
     		String password = null;

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/RMITransport.java Sun May 12 14:11:29 2013
@@ -26,7 +26,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.client.config.Property;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.uddi.v3_service.UDDICustodyTransferPortType;
@@ -42,7 +42,7 @@ public class RMITransport extends Transp
 	InitialContext context = null;
 	private Log logger = LogFactory.getLog(this.getClass());
 	private String nodeName = null;
-	private String managerName = null;
+	private String clientName = null;
 	
 	public RMITransport() {
 		super();
@@ -55,19 +55,19 @@ public class RMITransport extends Transp
 		initContext();
 	}
 	
-	public RMITransport(String managerName, String nodeName) throws NamingException, ConfigurationException {
+	public RMITransport(String clientName, String nodeName) throws NamingException, ConfigurationException {
 		super();
 		this.nodeName = nodeName;
-		this.managerName = managerName;
+		this.clientName = clientName;
 		initContext();
 	}
 	
 	private void initContext() throws NamingException, ConfigurationException {
 		Properties env = new Properties();
-		UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-		String factoryInitial = manager.getClientConfig().getHomeNode().getFactoryInitial();
-		String factoryURLPkgs = manager.getClientConfig().getHomeNode().getFactoryURLPkgs();
-		String factoryNamingProvider = manager.getClientConfig().getHomeNode().getFactoryNamingProvider();
+		UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+		String factoryInitial = client.getClientConfig().getHomeNode().getFactoryInitial();
+		String factoryURLPkgs = client.getClientConfig().getHomeNode().getFactoryURLPkgs();
+		String factoryNamingProvider = client.getClientConfig().getHomeNode().getFactoryNamingProvider();
         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);
@@ -88,8 +88,8 @@ public class RMITransport extends Transp
 		if (inquiryService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getInquiryUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
@@ -107,8 +107,8 @@ public class RMITransport extends Transp
 		if (securityService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSecurityUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
@@ -126,8 +126,8 @@ public class RMITransport extends Transp
 		if (publishService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getPublishUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
@@ -145,8 +145,8 @@ public class RMITransport extends Transp
 		if (subscriptionService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
@@ -164,8 +164,8 @@ public class RMITransport extends Transp
 		if (subscriptionListenerService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getSubscriptionListenerUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
@@ -183,8 +183,8 @@ public class RMITransport extends Transp
 		if (custodyTransferService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getCustodyTransferUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();
@@ -202,8 +202,8 @@ public class RMITransport extends Transp
 		if (publisherService==null) {
 			try {
 				if (endpointURL==null) {
-					UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-					endpointURL = manager.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
+					UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+					endpointURL = client.getClientConfig().getUDDINode(nodeName).getJuddiApiUrl();
 				}
 				URI endpointURI = new URI(endpointURL);
 		    	String service    = endpointURI.getPath();

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIInquiryService.java Sun May 12 14:11:29 2013
@@ -27,7 +27,7 @@ import javax.xml.transform.dom.DOMSource
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.juddi.v3.client.ClassUtil;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.FindBinding;
@@ -52,13 +52,13 @@ public class UDDIInquiryService {
 	
 	private final static String DEFAULT_NODE_NAME = "default";
 
-	private String managerName = null;
+	private String clientName = null;
 	private String nodeName = null;
 	private HashMap<String, Handler> operations = null;
 
 	public UDDIInquiryService() {
 		super();
-		managerName = System.getProperty("org.apache.juddi.v3.client.manager.name");
+		clientName = System.getProperty("org.apache.juddi.v3.client.client.name");
 		nodeName    = System.getProperty("org.apache.juddi.v3.client.node.name",DEFAULT_NODE_NAME);
 		operations = new HashMap<String, Handler>();
 		operations.put("find_business", new Handler("findBusiness", FindBusiness.class));
@@ -86,14 +86,14 @@ public class UDDIInquiryService {
 	}
 
 	public Node inquire(Element uddiReq) throws Exception {
-	    return inquire(uddiReq, nodeName, managerName);
+	    return inquire(uddiReq, nodeName, clientName);
 	}
 	
-	public Node inquire(Element uddiReq, String nodeName, String managerName) throws Exception {
-	    UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-	    String clazz = manager.getClientConfig().getUDDINode(nodeName).getProxyTransport();
+	public Node inquire(Element uddiReq, String nodeName, String clientName) throws Exception {
+	    UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+	    String clazz = client.getClientConfig().getUDDINode(nodeName).getProxyTransport();
             Class<?> transportClass = ClassUtil.forName(clazz,this.getClass());
-            Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(managerName, nodeName);
+            Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(clientName, nodeName);
             UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
 
 	    //new RequestHandler on it's own thread

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDIPublicationService.java Sun May 12 14:11:29 2013
@@ -19,7 +19,7 @@ package org.apache.juddi.v3.client.trans
 import java.util.HashMap;
 
 import org.apache.juddi.v3.client.ClassUtil;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.AddPublisherAssertions;
@@ -46,7 +46,7 @@ import org.w3c.dom.Node;
 public class UDDIPublicationService {
 	private final static String DEFAULT_NODE_NAME = "default";
 
-	private String managerName = null;
+	private String clientName = null;
 	private String nodeName = null;
 	// collection of valid operations
 	private HashMap<String, Handler> operations = null;
@@ -54,7 +54,7 @@ public class UDDIPublicationService {
 
 	  public UDDIPublicationService() {
 		super();
-		managerName = System.getProperty("org.apache.juddi.v3.client.manager.name");
+		clientName = System.getProperty("org.apache.juddi.v3.client.client.name");
 		nodeName    = System.getProperty("org.apache.juddi.v3.client.node.name",DEFAULT_NODE_NAME);
 		operations = new HashMap<String, Handler>();
 		operations.put("get_registeredInfo", new Handler("getRegisteredInfo", GetRegisteredInfo.class));
@@ -84,15 +84,15 @@ public class UDDIPublicationService {
 	}
 
 	public Node publish(Element uddiReq) throws Exception {
-	    return publish(uddiReq, nodeName, managerName);
+	    return publish(uddiReq, nodeName, clientName);
 	}
 	
-	public Node publish(Element uddiReq, String nodeName, String managerName) throws Exception
+	public Node publish(Element uddiReq, String nodeName, String clientName) throws Exception
 	{
-	    UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-	    String clazz = manager.getClientConfig().getUDDINode(nodeName).getProxyTransport();
+	    UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+	    String clazz = client.getClientConfig().getUDDINode(nodeName).getProxyTransport();
             Class<?> transportClass = ClassUtil.forName(clazz, this.getClass());
-            Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(managerName, nodeName);
+            Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(clientName, nodeName);
             UDDIPublicationPortType publish = transport.getUDDIPublishService();
 
 	    //new RequestHandler on it's own thread

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/UDDISecurityService.java Sun May 12 14:11:29 2013
@@ -19,7 +19,7 @@ package org.apache.juddi.v3.client.trans
 import java.util.HashMap;
 
 import org.apache.juddi.v3.client.ClassUtil;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.uddi.api_v3.DiscardAuthToken;
@@ -36,14 +36,14 @@ public class UDDISecurityService {
 
 	private final static String DEFAULT_NODE_NAME = "default";
 
-	private String managerName = null;
+	private String clientName = null;
 	private String nodeName = null;
 	// collection of valid operations
 	private HashMap<String, Handler> operations = null;
 
 	public UDDISecurityService() {
 		super();
-		managerName = System.getProperty("org.apache.juddi.v3.client.manager.name");
+		clientName = System.getProperty("org.apache.juddi.v3.client.name"); 
 		nodeName    = System.getProperty("org.apache.juddi.v3.client.node.name",DEFAULT_NODE_NAME);
 		operations = new HashMap<String, Handler>();
 		operations.put("get_authToken", new Handler("getAuthToken", GetAuthToken.class));
@@ -61,15 +61,15 @@ public class UDDISecurityService {
 	  }
 	
 	public Node secure(Element uddiReq) throws Exception {
-	    return secure(uddiReq, nodeName, managerName);
+	    return secure(uddiReq, nodeName, clientName);
 	}
 
-	public Node secure(Element uddiReq, String nodeName, String managerName) throws Exception
+	public Node secure(Element uddiReq, String nodeName, String clientName) throws Exception
 	{
-	    UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(managerName);
-	    String clazz = manager.getClientConfig().getUDDINode(nodeName).getProxyTransport();
+	    UDDIClient client = UDDIClientContainer.getUDDIClient(clientName);
+	    String clazz = client.getClientConfig().getUDDINode(nodeName).getProxyTransport();
             Class<?> transportClass = ClassUtil.forName(clazz, this.getClass());
-            Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(managerName, nodeName);
+            Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(clientName, nodeName);
 	    UDDISecurityPortType security = transport.getUDDISecurityService();
 
 	    //new RequestHandler on it's own thread

Added: juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd?rev=1481563&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd (added)
+++ juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd Sun May 12 14:11:29 2013
@@ -0,0 +1,110 @@
+<definitions name='UDDIClient' targetNamespace='urn:juddi-apache-org:v3_client'
+	xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:xsdd='http://www.w3.org/2001/XMLSchema'>
+	<types>
+		<xsd:schema elementFormDefault='qualified'
+			targetNamespace='urn:juddi-apache-org:api_v3' version='1.0'
+			xmlns:ns1='http://www.w3.org/2000/09/xmldsig#' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+			<xsd:element name="uddi">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element type="xsd:short" name="reloadDelay" />
+						<xsd:element name="client" nillable="false">
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element name="nodes">
+										<xsd:complexType>
+											<xsd:sequence>
+												<xsd:element name="node" maxOccurs="unbounded"
+													minOccurs="0">
+													<xsd:complexType>
+														<xsd:sequence>
+															<xsd:element type="xsd:string" name="name" />
+															<xsd:element type="xsd:string" name="description" />
+															<xsd:element name="properties" minOccurs="0">
+																<xsd:complexType>
+																	<xsd:sequence>
+																		<xsd:element name="property" maxOccurs="unbounded"
+																			minOccurs="0">
+																			<xsd:complexType>
+																				<xsd:simpleContent>
+																					<xsd:extension base="xsd:string">
+																						<xsd:attribute type="xsd:string"
+																							name="name" use="optional" />
+																						<xsd:attribute type="xsd:string"
+																							name="value" use="optional" />
+																					</xsd:extension>
+																				</xsd:simpleContent>
+																			</xsd:complexType>
+																		</xsd:element>
+																	</xsd:sequence>
+																</xsd:complexType>
+															</xsd:element>
+															<xsd:element type="xsd:string" name="proxyTransport" />
+															<xsd:element type="xsd:anyURI" name="custodyTransferUrl" />
+															<xsd:element type="xsd:anyURI" name="inquiryUrl" />
+															<xsd:element type="xsd:anyURI" name="publishUrl" />
+															<xsd:element type="xsd:anyURI" name="securityUrl" />
+															<xsd:element type="xsd:anyURI" name="subscriptionUrl" />
+															<xsd:element type="xsd:anyURI" name="subscriptionListenerUrl" />
+															<xsd:element type="xsd:anyURI" name="juddiApiUrl" />
+														</xsd:sequence>
+														<xsd:attribute type="xsd:boolean" name="isHomeJUDDI"
+															use="optional" />
+													</xsd:complexType>
+												</xsd:element>
+											</xsd:sequence>
+										</xsd:complexType>
+									</xsd:element>
+								</xsd:sequence>
+								<xsd:attribute type="xsd:string" name="name" />
+							</xsd:complexType>
+						</xsd:element>
+
+						<xsd:element name="clerks">
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element name="clerk" maxOccurs="unbounded"
+										minOccurs="0">
+										<xsd:complexType>
+											<xsd:sequence>
+												<xsd:element name="wsdl">
+													<xsd:simpleType>
+														<xsd:attribute type="xsd:string" name="businessKey" 
+														    use="optional"/>
+														<xsd:attribute type="xsd:string" name="businessName"
+															use="optional" />
+														<xsd:attribute type="xsd:string" name="keyDomain"
+															use="optional" />
+													</xsd:simpleType>
+												</xsd:element>
+											</xsd:sequence>
+											<xsd:attribute type="xsd:string" name="name"
+												use="required" />
+											<xsd:attribute type="xsd:string" name="node"
+												use="required" />
+											<xsd:attribute type="xsd:string" name="publisher"
+												use="required" />
+											<xsd:attribute type="xsd:string" name="password"
+												use="required" />
+											<xsd:attribute type="xsd:string" name="businessKey"
+												use="optional" />
+											<xsd:attribute type="xsd:string" name="businessName"
+												use="optional" />
+											<xsd:attribute type="xsd:string" name="keyDomain"
+												use="optional" />
+										</xsd:complexType>
+									</xsd:element>
+								</xsd:sequence>
+								<xsd:attribute type="xsd:boolean" name="registerOnStartup"
+									use="optional" />
+							</xsd:complexType>
+						</xsd:element>
+					</xsd:sequence>
+					<xsd:attribute type="xsd:string" name="name" use="required"/>
+				</xsd:complexType>
+			</xsd:element>
+
+		</xsd:sequence>
+		</xsd:complexType>
+		</xsd:element>
+		</xsd:schema>
\ No newline at end of file

Copied: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java (from r1480518, juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java?p2=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java&p1=juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java&r1=1480518&r2=1481563&rev=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClerkManagerTest.java (original)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java Sun May 12 14:11:29 2013
@@ -20,7 +20,7 @@ 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.UDDIClerkManager;
+import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.junit.Assert;
 import org.junit.Test;
@@ -29,17 +29,17 @@ import org.uddi.api_v3.BusinessService;
 /**
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  */
-public class UDDIClerkManagerTest {
+public class UDDIClientTest {
 	
      @Test
      public void testReadingTheConfig() {
 	     try {
-	    	 UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
-	    	 manager.start();
-	    	 manager.getClientConfig().getUDDINode("default");
-	    	 assertEquals(2,manager.getClientConfig().getUDDIClerks().size());
+	    	 UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+	    	 client.start();
+	    	 client.getClientConfig().getUDDINode("default");
+	    	 assertEquals(2,client.getClientConfig().getUDDIClerks().size());
 	    	 Thread.sleep(500);
-	    	 manager.stop();
+	    	 client.stop();
 	     } catch (Exception e) {
 	    	 //we should not have any issues reading the config
 	         e.printStackTrace();
@@ -50,16 +50,16 @@ public class UDDIClerkManagerTest {
      @Test
      public void testMultipleClientConfigFiles() {
     	 try {
-    		 UDDIClerkManager manager = new UDDIClerkManager("META-INF/uddi.xml");
-    		 manager.start();
-			 assertEquals("test-manager", manager.getName());
+    		 UDDIClient client = new UDDIClient("META-INF/uddi.xml");
+    		 client.start();
+			 assertEquals("test-client", client.getName());
 			 
-    		 UDDIClerkManager manager2 = new UDDIClerkManager("META-INF/uddi2.xml");
-    		 manager2.start();
-			 assertEquals("second-manager", manager2.getName());
+    		 UDDIClient client2 = new UDDIClient("META-INF/uddi2.xml");
+    		 client2.start();
+			 assertEquals("second-client", client2.getName());
 			 Thread.sleep(500);
-			 manager.stop();
-			 manager2.stop();
+			 client.stop();
+			 client2.stop();
 			 
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -72,12 +72,12 @@ public class UDDIClerkManagerTest {
      @Test
      public void testDefaultConfigFile() {
     	 try {
-    		 UDDIClerkManager manager = new UDDIClerkManager(null);
-    		 //We're expecting the manager defined in the META-INF/uddi.xml file.
-    		 manager.start();
-			 assertEquals("test-manager", manager.getName());
+    		 UDDIClient client = new UDDIClient(null);
+    		 //We're expecting the client defined in the META-INF/uddi.xml file.
+    		 client.start();
+			 assertEquals("test-client", client.getName());
 			 Thread.sleep(500);
-			 manager.stop();
+			 client.stop();
 			 
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -90,15 +90,15 @@ public class UDDIClerkManagerTest {
      @Test
      public void testDefaultManager() {
     	 try {		
-    		 //This is a special case where the manager in the META-INF/uddi.xml file is 
+    		 //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. 
-    		 UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
-    		 manager.start();
-			 assertEquals("test-manager", manager.getName());
-			 assertEquals("default", manager.getClientConfig().getHomeNode().getName());
+    		 UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+    		 client.start();
+			 assertEquals("test-client", client.getName());
+			 assertEquals("default", client.getClientConfig().getHomeNode().getName());
 			 Thread.sleep(500);
-			 manager.stop();
+			 client.stop();
 			 
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -111,8 +111,8 @@ public class UDDIClerkManagerTest {
      @Test
      public void testReadingAnnotations() {
     	 try {
-    		 UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
-	    	 Map<String,UDDIClerk> clerks = manager.getClientConfig().getUDDIClerks();
+    		 UDDIClient client = UDDIClientContainer.getUDDIClient(null);
+	    	 Map<String,UDDIClerk> clerks = client.getClientConfig().getUDDIClerks();
 	 		 AnnotationProcessor ap = new AnnotationProcessor();
 	 		 if (clerks.containsKey("default")) {
 		 		 UDDIClerk clerk = clerks.get("default");

Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
     <reloadDelay>5000</reloadDelay>
-    <manager name="test-manager">
+    <client name="test-client">
 		<nodes>
 			<node isHomeJUDDI="true">
 			    <!-- required 'default' node -->
@@ -67,5 +66,5 @@
 		   </xregister>
 	   </clerks>
 	  
-	</manager>
+	</client>
 </uddi>
\ No newline at end of file

Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml Sun May 12 14:11:29 2013
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<uddi>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
     <reloadDelay>5000</reloadDelay>
-    <manager name="second-manager">
+    <client name="second-client">
 		<nodes>
 			<node isHomeJUDDI="true">
 				<name>default</name> 
@@ -43,5 +42,5 @@
 		   </xregister>
 	   </clerks>
 	  
-	</manager>
+	</client>
 </uddi>
\ No newline at end of file

Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/JUDDIPublisher.java Sun May 12 14:11:29 2013
@@ -167,7 +167,7 @@ public class JUDDIPublisher implements E
 	
 	public void crossRegister() {
 		String token = getToken();
-		juddiApiService.restartManager(token, new AsyncCallback<JUDDIApiResponse>() 
+		juddiApiService.restartClient(token, new AsyncCallback<JUDDIApiResponse>() 
 		{
 			public void onFailure(Throwable caught) {
 				Window.alert("Error: " + caught.getMessage());

Modified: juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java?rev=1481563&r1=1481562&r2=1481563&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java (original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/MenuBarPanel.java Sun May 12 14:11:29 2013
@@ -33,7 +33,7 @@ public class MenuBarPanel extends FlowPa
 	PushButton newButton = new PushButton();
 	PushButton deleteButton = new PushButton();
 	PushButton syncButton = new PushButton();
-	PushButton managerButton = new PushButton();
+	PushButton clientButton = new PushButton();
 	String context = PUBLISHER;
 
 	public MenuBarPanel(String context) {
@@ -69,11 +69,11 @@ public class MenuBarPanel extends FlowPa
 		}
 		
 		if (PUBLISHER.equals(context)) {
-			managerButton.setHTML(images.manager().getHTML());
-			managerButton.setStyleName(("portlet-form-button"));
-			managerButton.addClickListener(this);
-			managerButton.setTitle("Restart ClerkManager");
-			pushPanel.add(managerButton);
+			clientButton.setHTML(images.manager().getHTML());
+			clientButton.setStyleName(("portlet-form-button"));
+			clientButton.addClickListener(this);
+			clientButton.setTitle("Restart Client");
+			pushPanel.add(clientButton);
 			newButton.setTitle("Create New Publisher");
 			deleteButton.setTitle("Delete Selected Publisher");
 			saveButton.setTitle("Save Publisher");
@@ -96,7 +96,7 @@ public class MenuBarPanel extends FlowPa
 			else if (SUBSCRIPTION.equals(context)) UDDISubscription.getInstance().deleteSubscription();
 		} else if (sender == syncButton) {
 			UDDISubscription.getInstance().syncListedServices();
-		} else if (sender == managerButton) {
+		} else if (sender == clientButton) {
 			JUDDIPublisher.getInstance().crossRegister();
 		}
 		



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


Mime
View raw message