You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/10/13 15:31:44 UTC

svn commit: r824752 [2/2] - in /webservices/juddi/trunk: ./ juddi-client/ 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/test/java/org/apache/juddi/v3/clie...

Added: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java (added)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.tck;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.Registry;
+import org.apache.juddi.api_v3.Clerk;
+import org.apache.juddi.api_v3.ClientSubscriptionInfo;
+import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
+import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
+import org.apache.juddi.api_v3.GetClientSubscriptionInfoDetail;
+import org.apache.juddi.api_v3.Node;
+import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.transport.Transport;
+import org.apache.juddi.v3_service.JUDDIApiPortType;
+import org.apache.log4j.Logger;
+import org.apache.log4j.helpers.Loader;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.GetAuthToken;
+import org.uddi.v3_service.UDDISecurityPortType;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class JUDDI_100_ClientSubscriptionInfoTest {
+	
+	private static UDDISecurityPortType security      =null;
+	private static JUDDIApiPortType publisher         = null;
+	private static Logger logger                      = Logger.getLogger(JUDDI_100_ClientSubscriptionInfoTest.class);
+	private static String authInfo                    = null;
+	
+	@BeforeClass
+	public static void startRegistry() throws ConfigurationException {
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
+		if (InVMTransport.class.getName().equals(clazz)) {
+			Registry.start();
+		}
+		logger.debug("Getting auth tokens..");
+		try {
+	         Class<?> transportClass = Loader.loadClass(clazz);
+	         if (transportClass!=null) {
+	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
+	        	 security = transport.getUDDISecurityService();
+	        	 GetAuthToken getAuthToken = new GetAuthToken();
+	        	 getAuthToken.setUserID("root");
+	        	 getAuthToken.setCred("");
+	        	 authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
+	        	 publisher = transport.getJUDDIApiService();
+	         } else {
+	        	 Assert.fail();
+	         }
+	     } catch (Exception e) {
+	    	 logger.error(e.getMessage(), e);
+				Assert.fail("Could not obtain authInfo token.");
+	     } 
+	}
+	
+	@AfterClass
+	public static void stopRegistry() throws ConfigurationException {
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
+		if (InVMTransport.class.getName().equals(clazz)) {
+			Registry.stop();
+		}
+	}
+	
+	@Test
+	public void addClientSubscriptionInfo() {
+		ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo();
+		
+		Node node = new Node();
+		node.setSecurityUrl("http://localhost:8080/services/securityUrl");
+		node.setName("default");
+		
+		Clerk clerk = new Clerk();
+		clerk.setName("clerkName");
+		clerk.setPublisher("root");
+		clerk.setNode(node);
+		
+		clientSubscriptionInfo.setClerk(clerk);
+		
+		clientSubscriptionInfo.setSubscriptionKey("mykey");
+		
+		SaveClientSubscriptionInfo saveClientSubscriptionInfo = new SaveClientSubscriptionInfo();
+		saveClientSubscriptionInfo.setAuthInfo(authInfo);
+		saveClientSubscriptionInfo.getClientSubscriptionInfo().add(clientSubscriptionInfo);
+		
+		try {
+			ClientSubscriptionInfoDetail detail = publisher.saveClientSubscriptionInfo(saveClientSubscriptionInfo);
+		
+			GetClientSubscriptionInfoDetail getDetail = new GetClientSubscriptionInfoDetail();
+			getDetail.setAuthInfo(authInfo);
+			getDetail.getClientSubscriptionKey().add("mykey");
+			
+			Assert.assertEquals("mykey", detail.getClientSubscriptionInfo().get(0).getSubscriptionKey());
+			
+			//ClientSubscriptionInfoDetail detail2 = publisher.getClientSubscriptionInfoDetail(getDetail);
+			//Assert.assertEquals("mykey", detail2.getClientSubscriptionInfo().get(0).getSubscriptionKey());
+	
+			DeleteClientSubscriptionInfo deleteInfo = new DeleteClientSubscriptionInfo();
+			deleteInfo.setAuthInfo(authInfo);
+			deleteInfo.getSubscriptionKey().add("mykey");
+			publisher.deleteClientSubscriptionInfo(deleteInfo);
+			
+//			try {
+//				@SuppressWarnings("unused")
+//				ClientSubscriptionInfoDetail detail3 = publisher.getClientSubscriptionInfoDetail(getDetail);
+//				Assert.fail("We're expecting an InvalidKeyPassedException");
+//			} catch (Exception e) {
+//				Assert.assertEquals(InvalidKeyPassedException.class, e.getClass());
+//			}
+		} catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown");
+		}
+	}
+	
+}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -35,7 +35,7 @@
 	
 	@BeforeClass
 	public static void startRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().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().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}
@@ -52,7 +52,7 @@
      @Test
      public void testAuthToken() {
 	     try {
-	    	 String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+	    	 String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 	         Class<?> transportClass = Loader.loadClass(clazz);
 	         if (transportClass!=null) {
 	        	 Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -46,7 +46,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -76,7 +76,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -48,7 +48,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -79,7 +79,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -52,7 +52,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -85,7 +85,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -54,7 +54,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -86,7 +86,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -50,7 +50,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -83,7 +83,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -55,7 +55,7 @@
 	
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -88,7 +88,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -56,7 +56,7 @@
 
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -93,7 +93,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Tue Oct 13 13:31:43 2009
@@ -58,7 +58,7 @@
 
 	@BeforeClass
 	public static void setup() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.start();
 		}
@@ -93,7 +93,7 @@
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
-		String clazz = UDDIClerkManager.getClientConfig().getNodes().get("default").getProxyTransport();
+		String clazz = UDDIClerkManager.getClientConfig().getUDDINodes().get("default").getProxyTransport();
 		if (InVMTransport.class.getName().equals(clazz)) {
 			Registry.stop();
 		}

Copied: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java (from r824485, webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java?p2=webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java&p1=webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java&r1=824485&r2=824752&rev=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java Tue Oct 13 13:31:43 2009
@@ -1,117 +1,49 @@
-package org.apache.juddi.v3.client.config;
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "clerk", propOrder = {
+    "name",
+    "node",
+    "publisher",
+    "password"
+})
+public class Clerk implements Serializable {
 
-import java.rmi.RemoteException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.v3.client.transport.TransportException;
-import org.apache.log4j.Logger;
-import org.uddi.api_v3.BindingDetail;
-import org.uddi.api_v3.BindingTemplate;
-import org.uddi.api_v3.BusinessService;
-import org.uddi.api_v3.DeleteBinding;
-import org.uddi.api_v3.GetAuthToken;
-import org.uddi.api_v3.GetBindingDetail;
-import org.uddi.api_v3.GetServiceDetail;
-import org.uddi.api_v3.SaveService;
-import org.uddi.api_v3.ServiceDetail;
-import org.uddi.v3_service.DispositionReportFaultMessage;
-
-public class UDDIClerk {
-
-	private Logger log = Logger.getLogger(this.getClass());
-	private String name;
-	private UDDINode node;
-	private String publisher;
-	private String password;
-	private String[] classWithAnnotations;
-	private String authToken;
-	private String managerName;
-	private Map<String,Properties> services = new HashMap<String,Properties>(); 
-
-	public UDDIClerk() {
-		super();
-	}
-
-	/**
-	 * Register a service.
-	 * 
-	 */
-	public BusinessService register(BusinessService service) {
-		
-		BusinessService businessService=null;
-		log.info("Registering service " + service);
-		try {
-			String authToken = getAuthToken();
-			SaveService saveService = new SaveService();
-			saveService.setAuthInfo(authToken);
-			saveService.getBusinessService().add(service);
-			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()
-					+ " ." + e.getMessage(),e);
-		} catch (Throwable t) {
-			log.error("Unable to register service " + service.getName().get(0).getValue()
-					+ " ." + t.getMessage(),t);
-		}
-		log.info("Registering service " + service + " completed.");
-		return businessService;
-	}
-	/**
-	 * Unregisters the BindingTemplates for this service.
-	 * @param service
-	 */
-	public void unRegister(BusinessService service) {
-		log.info("UnRegistering binding for service " + service.getName().get(0).getValue());
-		try {
-			String authToken = getAuthToken();
-			DeleteBinding deleteBinding = new DeleteBinding();
-			deleteBinding.setAuthInfo(authToken);
-			for (BindingTemplate binding : service.getBindingTemplates().getBindingTemplate()) {
-				deleteBinding.getBindingKey().add(binding.getBindingKey());
-			}
-			node.getTransport().getUDDIPublishService().deleteBinding(deleteBinding);
-		} catch (Exception e) {
-			log.error("Unable to register service " + service.getName().get(0).getValue()
-					+ " ." + e.getMessage(),e);
-		}
-	}
-	
-	public BusinessService findService(String serviceKey) throws DispositionReportFaultMessage, RemoteException, 
-	TransportException, ConfigurationException  {
-		GetServiceDetail getServiceDetail = new GetServiceDetail();
-		getServiceDetail.getServiceKey().add(serviceKey);
-		getServiceDetail.setAuthInfo(getAuthToken());
-		ServiceDetail sd = node.getTransport().getUDDIInquiryService().getServiceDetail(getServiceDetail);
-		List<BusinessService> businessServiceList = sd.getBusinessService();
-		if (businessServiceList.size() == 0) throw new ConfigurationException("Could not find Service with key=" + serviceKey);
-		return businessServiceList.get(0);
-	}
+	@XmlTransient
+	private static final long serialVersionUID = 2723174126266580550L;
 	
-	public BindingTemplate findServiceBinding(String bindingKey) throws DispositionReportFaultMessage, RemoteException, 
-			TransportException, ConfigurationException  {
-		GetBindingDetail getBindingDetail = new GetBindingDetail();
-		getBindingDetail.getBindingKey().add(bindingKey);
-		getBindingDetail.setAuthInfo(getAuthToken());
-		BindingDetail bd = node.getTransport().getUDDIInquiryService().getBindingDetail(getBindingDetail);
-		List<BindingTemplate> bindingTemplateList = bd.getBindingTemplate();
-		if (bindingTemplateList.size() == 0) throw new ConfigurationException("Could not find ServiceBbinding with key=" + bindingKey);
-		return bindingTemplateList.get(0);
-	}
+	protected String name;
+	protected Node node;
+	protected String publisher;
+	protected String password;
 	
-	private String getAuthToken() throws TransportException, DispositionReportFaultMessage, RemoteException {
-		if (authToken==null) {
-			GetAuthToken getAuthToken = new GetAuthToken();
-			getAuthToken.setUserID(getPublisher());
-			getAuthToken.setCred(getPassword());
-			authToken = node.getTransport().getUDDISecurityService().getAuthToken(getAuthToken).getAuthInfo();
-		}
-		return authToken;
+	public Clerk() {
+		super();
 	}
+
 	
 	public String getName() {
 		return name;
@@ -121,19 +53,12 @@
 		this.name = name;
 	}
 
-	public String[] getClassWithAnnotations() {
-		return classWithAnnotations;
-	}
-
-	public void setClassWithAnnotations(String[] classWithAnnotations) {
-		this.classWithAnnotations = classWithAnnotations;
-	}
-
-	public UDDINode getNode() {
+	
+	public Node getNode() {
 		return node;
 	}
 
-	public void setNode(UDDINode node) {
+	public void setNode(Node node) {
 		this.node = node;
 	}
 
@@ -152,21 +77,5 @@
 	public void setPassword(String password) {
 		this.password = password;
 	}
-
-	public Map<String, Properties> getServices() {
-		return services;
-	}
-
-	public void setServices(Map<String, Properties> services) {
-		this.services = services;
-	}
-
-	public String getManagerName() {
-		return managerName;
-	}
-
-	public void setManagerName(String managerName) {
-		this.managerName = managerName;
-	}
 	
 }

Propchange: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 13 13:31:43 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/UDDIClerk.java:797614-802957

Added: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java (added)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for save_subscriptionInfo type.  Specific to juddi.
+ * 
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "clientSubscriptionInfo", propOrder = {
+    "subscriptionKey",
+    "clerk",
+    "lastModified"
+})
+public class ClientSubscriptionInfo implements Serializable{
+	
+	@XmlTransient
+	private static final long serialVersionUID = 6885792665298161949L;
+    @XmlElement(required = true)
+    protected String subscriptionKey;
+    @XmlElement(required = true)
+    protected Clerk clerk;
+    protected Date lastModified;
+    
+	public String getSubscriptionKey() {
+		return subscriptionKey;
+	}
+	public void setSubscriptionKey(String subscriptionKey) {
+		this.subscriptionKey = subscriptionKey;
+	}
+	public Clerk getClerk() {
+		return clerk;
+	}
+	public void setClerk(Clerk clerk) {
+		this.clerk = clerk;
+	}
+	public Date getLastModified() {
+		return lastModified;
+	}
+	public void setLastModified(Date lastModified) {
+		this.lastModified = lastModified;
+	}
+
+}
+
\ No newline at end of file

Added: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfoDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfoDetail.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfoDetail.java (added)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfoDetail.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for publisherDetail type. Specific to juddi.
+ * 
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "clientSubscriptionInfoDetail", propOrder = {
+    "clientSubscriptionInfo"
+})
+public class ClientSubscriptionInfoDetail implements Serializable{
+	@XmlTransient
+	private static final long serialVersionUID = -409328006334478420L;
+	protected List<ClientSubscriptionInfo> clientSubscriptionInfo;
+   
+
+    /**
+     * Gets the value of the ClientSubscriptionInfo property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the ClientSubscriptionInfo property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getClientSubscriptionInfo().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ClientSubscriptionInfo }
+     * 
+     * 
+     */
+    public List<ClientSubscriptionInfo> getClientSubscriptionInfo() {
+        if (clientSubscriptionInfo == null) {
+        	clientSubscriptionInfo = new ArrayList<ClientSubscriptionInfo>();
+        }
+        return this.clientSubscriptionInfo;
+    }
+
+}
+
\ No newline at end of file

Added: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClientSubscriptionInfo.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClientSubscriptionInfo.java (added)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClientSubscriptionInfo.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for save_subscriptionInfo type.  Specific to juddi.
+ * 
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "delete_clientSubscriptionInfo", propOrder = {
+    "authInfo",
+    "subscriptionKey"
+})
+public class DeleteClientSubscriptionInfo implements Serializable{
+	
+	@XmlTransient
+	private static final long serialVersionUID = 8973820996268358139L;
+	protected String authInfo;
+    @XmlElement(required = true)
+    protected List<String> subscriptionKey;
+    
+	public String getAuthInfo() {
+		return authInfo;
+	}
+	public void setAuthInfo(String authInfo) {
+		this.authInfo = authInfo;
+	}
+	public List<String> getSubscriptionKey() {
+		if (subscriptionKey==null) {
+			subscriptionKey = new ArrayList<String>();
+		}
+		return subscriptionKey;
+	}
+
+}
+
\ No newline at end of file

Added: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClientSubscriptionInfoDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClientSubscriptionInfoDetail.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClientSubscriptionInfoDetail.java (added)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClientSubscriptionInfoDetail.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for get_allClientSubscriptionInfoDetail type. Specific to juddi.
+ * 
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a> 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "get_allClientSubscriptionInfoDetail", propOrder = {
+    "authInfo"
+})
+public class GetAllClientSubscriptionInfoDetail implements Serializable{
+	@XmlTransient
+	private static final long serialVersionUID = 699262934433717857L;
+	@XmlElement(namespace = "urn:uddi-org:api_v3")
+	protected String authInfo;
+
+    /**
+     * Gets the value of the authInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAuthInfo() {
+        return authInfo;
+    }
+
+    /**
+     * Sets the value of the authInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAuthInfo(String value) {
+        this.authInfo = value;
+    }
+
+}
+
\ No newline at end of file

Added: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetClientSubscriptionInfoDetail.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetClientSubscriptionInfoDetail.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetClientSubscriptionInfoDetail.java (added)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetClientSubscriptionInfoDetail.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for get_publisherDetail type. Specific to juddi.
+ * 
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a> 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "get_clientSubscriptionInfoDetail", propOrder = {
+    "authInfo",
+    "clientSubscriptionKey"
+})
+public class GetClientSubscriptionInfoDetail implements Serializable{
+	
+	@XmlTransient
+	private static final long serialVersionUID = 9207888446436156047L;
+	protected String authInfo;
+    @XmlElement(required = true)
+    protected List<String> clientSubscriptionKey;
+
+    /**
+     * Gets the value of the authInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAuthInfo() {
+        return authInfo;
+    }
+
+    /**
+     * Sets the value of the authInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAuthInfo(String value) {
+        this.authInfo = value;
+    }
+
+    /**
+     * Gets the value of the publisherId property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the businessKey property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPublisherId().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getClientSubscriptionKey() {
+        if (clientSubscriptionKey == null) {
+        	clientSubscriptionKey = new ArrayList<String>();
+        }
+        return this.clientSubscriptionKey;
+    }
+
+}
+
\ No newline at end of file

Copied: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java (from r824485, webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java?p2=webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java&p1=webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java&r1=824485&r2=824752&rev=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java Tue Oct 13 13:31:43 2009
@@ -1,15 +1,55 @@
-package org.apache.juddi.v3.client.config;
-
-import java.util.Properties;
-
-import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3.client.transport.TransportException;
-import org.apache.log4j.helpers.Loader;
-
-
-public class UDDINode {
-	
-	private String name;
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/**
+ * <p>Java class for Node type.  Specific to juddi.
+ * 
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a> 
+ * 
+ */
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "node", propOrder = {
+	"name",
+    "description",
+    "custodyTransferUrl",
+    "inquiryUrl",
+    "publishUrl",
+    "securityUrl",
+	"subscriptionUrl",
+	"subscriptionListenerUrl",
+	"juddiApiUrl",
+	"proxyTransport",
+	"factoryInitial",
+	"factoryURLPkgs",
+	"factoryNamingProvider"
+})
+public class Node implements Serializable{
+	
+	@XmlTransient
+	private static final long serialVersionUID = -4601378453000384721L;
+	protected String name;
 	private String description;
 	private String custodyTransferUrl;
 	private String inquiryUrl;
@@ -23,22 +63,7 @@
 	private String factoryURLPkgs;
 	private String factoryNamingProvider;
 	
-	private Properties properties;
 	
-	private Transport transport;
-	
-	public Transport getTransport() throws TransportException {
-		if (transport==null) {
-			try {
-				String clazz = UDDIClerkManager.getClientConfig().getNodes().get(name).getProxyTransport();
-				Class<?> transportClass = Loader.loadClass(clazz);
-				transport = (Transport) transportClass.getConstructor(String.class).newInstance(name);
-			} catch (Exception e) {
-				throw new TransportException(e.getMessage(),e);
-			}
-		}
-		return transport;
-	}
 	
 	public String getName() {
 		return name;
@@ -120,13 +145,6 @@
 		this.factoryNamingProvider = factoryNamingProvider;
 	}
 
-	public Properties getProperties() {
-		return properties;
-	}
-
-	public void setProperties(Properties properties) {
-		this.properties = properties;
-	}
 	
 	
 }

Propchange: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 13 13:31:43 2009
@@ -0,0 +1 @@
+/webservices/juddi/branches/v3_trunk/uddi-client/src/main/java/org/uddi/api_v3/client/config/UDDINode.java:797614-802957

Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Publisher.java Tue Oct 13 13:31:43 2009
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 The Apache Software Foundation.
+ * Copyright 2001-2009 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
  * limitations under the License.
  *
  */
-
-
 package org.apache.juddi.api_v3;
 
 import java.io.Serializable;

Added: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SaveClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SaveClientSubscriptionInfo.java?rev=824752&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SaveClientSubscriptionInfo.java (added)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/SaveClientSubscriptionInfo.java Tue Oct 13 13:31:43 2009
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2001-2008 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.juddi.api_v3;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for save_subscriptionInfo type.  Specific to juddi.
+ * 
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "save_clientSubscriptionInfo", propOrder = {
+	"authInfo",
+    "clientSubscriptionInfo"
+})
+public class SaveClientSubscriptionInfo implements Serializable{
+	
+	@XmlTransient
+	private static final long serialVersionUID = 6885792665298161949L;
+	protected String authInfo;
+    @XmlElement(required = true)
+    protected List<ClientSubscriptionInfo> clientSubscriptionInfo;
+    
+	public String getAuthInfo() {
+		return authInfo;
+	}
+	
+	public void setAuthInfo(String authInfo) {
+		this.authInfo = authInfo;
+	}
+	
+	public List<ClientSubscriptionInfo> getClientSubscriptionInfo() {
+		if (clientSubscriptionInfo == null) {
+			clientSubscriptionInfo = new ArrayList<ClientSubscriptionInfo>();
+		}
+		return clientSubscriptionInfo;
+	}
+	
+	
+
+}
+
\ No newline at end of file

Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java?rev=824752&r1=824751&r2=824752&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java Tue Oct 13 13:31:43 2009
@@ -28,10 +28,13 @@
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 
+import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
+import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
 import org.apache.juddi.api_v3.DeletePublisher;
 import org.apache.juddi.api_v3.GetAllPublisherDetail;
 import org.apache.juddi.api_v3.GetPublisherDetail;
 import org.apache.juddi.api_v3.PublisherDetail;
+import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
 import org.apache.juddi.api_v3.SavePublisher;
 import org.uddi.api_v3.DeleteTModel;
 import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -109,7 +112,6 @@
 
 
     /**
-     * 
      * @param body
      * @throws DispositionReportFaultMessage, RemoteException
      */
@@ -121,5 +123,25 @@
         throws DispositionReportFaultMessage, RemoteException
     ;
     
+    /**
+     * @param body
+     * @throws DispositionReportFaultMessage, RemoteException
+     */
+    @WebMethod(operationName = "save_ClientSubscriptionInfo", action = "save_ClientSubscriptionInfo")
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public ClientSubscriptionInfoDetail saveClientSubscriptionInfo(
+		@WebParam(name = "save_ClientSubscriptionInfo", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
+        SaveClientSubscriptionInfo body)
+        throws DispositionReportFaultMessage, RemoteException
+    ;
+    
+    @WebMethod(operationName = "delete_ClientSubscriptionInfo", action = "delete_ClientSubscriptionInfo")
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void deleteClientSubscriptionInfo(
+		@WebParam(name = "delete_ClientSubscriptionInfo", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
+        DeleteClientSubscriptionInfo body)
+        throws DispositionReportFaultMessage, RemoteException
+    ;
+    
 }
 
\ 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