juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1550992 [5/6] - in /juddi/branches/juddi-3.3.x: ./ docs/examples/auth/ juddi-client.net/juddi-client.net-integration.test/resource/ juddi-client.net/juddi-client.net/ juddi-client.net/juddi-client.net/bindings/ juddi-core-openjpa/ juddi-co...
Date Sun, 15 Dec 2013 02:10:26 GMT
Copied: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java (from r1550327, juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java?p2=juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java&p1=juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java&r1=1550327&r2=1550992&rev=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -14,6 +14,7 @@
  */
 package org.apache.juddi.v3.tck;
 
+import java.util.UUID;
 import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
@@ -21,10 +22,15 @@ import org.apache.commons.logging.LogFac
 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.DeleteClerk;
 import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
+import org.apache.juddi.api_v3.DeleteNode;
 //import org.apache.juddi.api_v3.GetClientSubscriptionInfoDetail;
 import org.apache.juddi.api_v3.Node;
+import org.apache.juddi.api_v3.NodeDetail;
+import org.apache.juddi.api_v3.SaveClerkInfo;
 import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
+import org.apache.juddi.api_v3.SaveNodeInfo;
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.apache.juddi.v3_service.JUDDIApiPortType;
@@ -33,107 +39,159 @@ import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
  * jUDDI specific tests
+ *
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
-public class JUDDI_100_ClientSubscriptionInfoTest {
+public class JUDDI_100_ClientSubscriptionInfoIntegrationTest {
 
-	private static UDDISecurityPortType security      = null;
-	private static JUDDIApiPortType publisher         = null;
-	private static Log logger = LogFactory.getLog(JUDDI_100_ClientSubscriptionInfoTest.class);
-	private static String authInfo                    = null;
-	private static UDDIClient manager;
-
-	@BeforeClass
-	public static void startRegistry() throws ConfigurationException {
-
-		manager  = new UDDIClient();
-		manager.start();
-
-
-		logger.debug("Getting auth tokens..");
-		try {
- 			Transport transport = manager.getTransport();
-			
-			security = transport.getUDDISecurityService();
-			authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
-			
-			publisher = transport.getJUDDIApiService();
-                        if (!TckPublisher.isUDDIAuthMode())
-                        {
-                                TckSecurity.setCredentials((BindingProvider)publisher, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+        private static UDDISecurityPortType security = null;
+        private static JUDDIApiPortType publisher = null;
+        private static Log logger = LogFactory.getLog(JUDDI_100_ClientSubscriptionInfoIntegrationTest.class);
+        private static String authInfo = null;
+        private static UDDIClient manager;
+
+        @BeforeClass
+        public static void startRegistry() throws ConfigurationException {
+
+                manager = new UDDIClient();
+                manager.start();
+
+
+                logger.debug("Getting auth tokens..");
+                try {
+                        Transport transport = manager.getTransport();
+
+                        security = transport.getUDDISecurityService();
+                        authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+
+                        publisher = transport.getJUDDIApiService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publisher, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
                         }
-		} catch (Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("Could not obtain authInfo token.");
-		} 
-	}
-
-	@AfterClass
-	public static void stopRegistry() throws ConfigurationException {
-		manager.stop();
-	}
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+        }
+
+        @AfterClass
+        public static void stopRegistry() throws ConfigurationException {
+                manager.stop();
+        }
+
+        @Test
+        public void addClientSubscriptionInfo() throws Exception {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
+
+                ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo();
+
+                Node node = new Node();
+                node.setSecurityUrl("http://localhost:8080/services");
+                node.setCustodyTransferUrl("http://localhost:8080/services");
+                node.setDescription("TEST");
+                node.setInquiryUrl("http://localhost:8080/services");
+                node.setPublishUrl("http://localhost:8080/services");
+                node.setSubscriptionListenerUrl("http://localhost:8080/services");
+                node.setSubscriptionUrl("http://localhost:8080/services");
+                node.setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+                
+                node.setName("addClientSubscriptionInfoNode");
+                node.setClientName("addClientSubscriptionInfoNode");
+
+                Clerk clerk = new Clerk();
+                clerk.setName("addClientSubscriptionInfoClerk");
+                clerk.setPublisher("root");
+                clerk.setNode(node);
+
+                Clerk toClerk = new Clerk();
+                toClerk.setName("addClientSubscriptionInfoClerk2");
+                toClerk.setPublisher("root");
+                toClerk.setNode(node);
+
+                clientSubscriptionInfo.setFromClerk(clerk);
+                clientSubscriptionInfo.setToClerk(toClerk);
+
+                clientSubscriptionInfo.setSubscriptionKey("mykey");
+
+                SaveClientSubscriptionInfo saveClientSubscriptionInfo = new SaveClientSubscriptionInfo();
+                saveClientSubscriptionInfo.setAuthInfo(authInfo);
+                saveClientSubscriptionInfo.getClientSubscriptionInfo().add(clientSubscriptionInfo);
+
+                try {
+                        SaveNodeInfo sni = new SaveNodeInfo();
+                        sni.setAuthInfo(authInfo);
+                        sni.getNode().add(node);
+                        publisher.saveNode(sni);
+                        
+                        saveClerk(clerk);
+                        saveClerk(toClerk);
+                        ClientSubscriptionInfoDetail detail = publisher.saveClientSubscriptionInfo(saveClientSubscriptionInfo);
+
+                        Assert.assertEquals("mykey", detail.getClientSubscriptionInfo().get(0).getSubscriptionKey());
+
+                        DeleteClientSubscriptionInfo deleteInfo = new DeleteClientSubscriptionInfo();
+                        deleteInfo.setAuthInfo(authInfo);
+                        deleteInfo.getSubscriptionKey().add("mykey");
+                        publisher.deleteClientSubscriptionInfo(deleteInfo);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                } finally {
+                        publisher.deleteClerk(new DeleteClerk(authInfo, clerk.getName()));
+                        publisher.deleteClerk(new DeleteClerk(authInfo, toClerk.getName()));
+                        publisher.deleteNode(new DeleteNode(authInfo, node.getName()));
+
+                }
+        }
 
-	@Test
-	public void addClientSubscriptionInfo() {
+        @Test
+        public void addClientSubscriptionInfoNodeDoesntExist() throws Exception {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
-		ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo();
 
-		Node node = new Node();
-		node.setSecurityUrl("http://localhost:8080/services/securityUrl");
-		node.setName("default");
-
-		Clerk clerk = new Clerk();
-		clerk.setName("default");
-		clerk.setPublisher("root");
-		clerk.setNode(node);
-
-		Clerk toClerk = new Clerk();
-		toClerk.setName("medroot");
-		toClerk.setPublisher("root");
-		toClerk.setNode(node);
-
-		clientSubscriptionInfo.setFromClerk(clerk);
-		clientSubscriptionInfo.setToClerk(toClerk);
-
-		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");
-		}
-	}
 
+                Node node = new Node();
+                node.setSecurityUrl("http://localhost:8080/services/securityUrl");
+                node.setName(UUID.randomUUID().toString());
+                node.setClientName(node.getName());
+
+                node.setSecurityUrl("http://localhost:8080/services");
+                node.setCustodyTransferUrl("http://localhost:8080/services");
+                node.setDescription("TEST");
+                node.setInquiryUrl("http://localhost:8080/services");
+                node.setPublishUrl("http://localhost:8080/services");
+                node.setSubscriptionListenerUrl("http://localhost:8080/services");
+                node.setSubscriptionUrl("http://localhost:8080/services");
+                node.setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+                
+
+                Clerk clerk = new Clerk();
+                clerk.setName("addClientSubscriptionInfoClerk");
+                clerk.setPublisher("root");
+                clerk.setNode(node);
+
+
+
+                try {
+                        saveClerk(clerk);
+                        publisher.deleteClerk(new DeleteClerk(authInfo, "addClientSubscriptionInfoClerk"));
+                        Assert.fail();
+                } catch (Exception e) {
+                        logger.error(e.getMessage());
+                }
+        }
+
+        private Clerk saveClerk(Clerk clerk) throws Exception {
+                SaveClerkInfo saveClerkInfo = new SaveClerkInfo();
+                saveClerkInfo.setAuthInfo(authInfo);
+
+                saveClerkInfo.getClerk().add(clerk);
+                return publisher.saveClerk(saveClerkInfo).getClerk().get(0);
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -451,7 +451,7 @@ public class UDDI_080_SubscriptionIntegr
                         tckSubscriptionJoe.subscription.saveSubscription(authInfoJoe, data);
                         Assert.fail();
                 } catch (Exception ex) {
-                        HandleException(ex);
+                        logger.info(ex.getMessage());
 
                 }
         }

Copied: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java (from r1550327, juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java?p2=juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java&p1=juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java&r1=1550327&r2=1550992&rev=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java Sun Dec 15 02:10:24 2013
@@ -14,8 +14,9 @@ package org.apache.juddi.v3.tck;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Random;
@@ -25,26 +26,28 @@ import javax.xml.ws.Endpoint;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.v3.client.Release;
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
 import org.uddi.v3_service.UDDIInquiryPortType;
 import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
 
-import com.dumbster.smtp.SimpleSmtpServer;
-import com.dumbster.smtp.SmtpMessage;
 import java.net.InetAddress;
 import java.util.List;
+import java.util.Locale;
 import javax.xml.ws.BindingProvider;
+import org.apache.commons.net.PrintCommandListener;
+import org.apache.commons.net.pop3.POP3Client;
+import org.apache.commons.net.pop3.POP3MessageInfo;
+import org.apache.commons.net.pop3.POP3SClient;
 import org.apache.juddi.v3.client.UDDIConstants;
 import static org.apache.juddi.v3.tck.TckBusiness.MARY_BUSINESS_XML;
+import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.uddi.api_v3.FindQualifiers;
 import org.uddi.api_v3.FindService;
 import org.uddi.api_v3.Name;
@@ -56,25 +59,23 @@ import org.uddi.sub_v3.Subscription;
  * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
  * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
-public class UDDI_090_SubscriptionListenerIntegrationTest {
+public class UDDI_090_SubscriptionListenerExternalTest {
 
-        public UDDI_090_SubscriptionListenerIntegrationTest() {
+        public UDDI_090_SubscriptionListenerExternalTest() {
                 serialize = false;
                 if (System.getProperty("debug") != null
                         && System.getProperty("debug").equalsIgnoreCase("true")) {
                         serialize = true;
                 }
         }
-        private static Log logger = LogFactory.getLog(UDDI_090_SubscriptionListenerIntegrationTest.class);
-
+        private static Log logger = LogFactory.getLog(UDDI_090_SubscriptionListenerExternalTest.class);
         private static UDDISubscriptionPortType subscriptionMary = null;
         private static UDDIInquiryPortType inquiryMary = null;
         private static TckTModel tckTModelMary = null;
         private static TckBusiness tckBusinessMary = null;
         private static TckBusinessService tckBusinessServiceMary = null;
         private static TckSubscriptionListener tckSubscriptionListenerMary = null;
-        
-        private static String hostname=null;
+        private static String hostname = null;
         private static UDDISubscriptionPortType subscriptionJoe = null;
         private static UDDIInquiryPortType inquiryJoe = null;
         private static TckTModel tckTModelJoe = null;
@@ -82,16 +83,11 @@ public class UDDI_090_SubscriptionListen
         private static TckBusinessService tckBusinessServiceJoe = null;
         private static TckSubscriptionListener tckSubscriptionListenerJoe = null;
         private static Endpoint endPoint;
-        
         private static String authInfoJoe = null;
         private static String authInfoMary = null;
-        
         private static UDDIClient manager;
-        private static SimpleSmtpServer mailServer;
-        private static Integer smtpPort = 25;
+        private static String email = null;
         private static Integer httpPort = 80;
-        
-        
         private static boolean serialize = false;
 
         @AfterClass
@@ -105,32 +101,11 @@ public class UDDI_090_SubscriptionListen
         @BeforeClass
         public static void startManager() throws ConfigurationException {
                 try {
-                        
-                        //TODO how do we set this up for calls from CLI?
-                        smtpPort = 9700 + new Random().nextInt(99);
                         httpPort = 9600 + new Random().nextInt(99);
-                        Properties properties = new Properties();
-                        properties.setProperty("juddi.mail.smtp.host", "localhost");
-                        properties.setProperty("juddi.mail.smtp.port", String.valueOf(smtpPort));
-                        properties.setProperty("juddi.mail.smtp.from", "jUDDI@example.org");
-                        String version = Release.getRegistryVersion().replaceAll(".SNAPSHOT", "-SNAPSHOT");
-                        String curDir = System.getProperty("user.dir");
-                        if (!curDir.endsWith("uddi-tck")) {
-                                curDir += "/uddi-tck";
-                        }
-                        String path = curDir + "/target/juddi-tomcat-" + version + "/temp/";
-                        System.out.println("Saving jUDDI email properties to " + path);
-                        File tmpDir = new File(path);
-                        File tmpFile = new File(tmpDir + "/juddi-mail.properties");
-                        if (!tmpFile.createNewFile()) {
-                                tmpFile.delete();
-                                tmpFile.createNewFile();
-                        }
-                        properties.store(new FileOutputStream(tmpFile), "tmp email settings");
 
                         hostname = InetAddress.getLocalHost().getHostName();
                         //bring up the TCK SubscriptionListener
-                        String httpEndpoint = "http://" +hostname+ ":" + httpPort + "/tcksubscriptionlistener";
+                        String httpEndpoint = "http://" + hostname + ":" + httpPort + "/tcksubscriptionlistener";
                         System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
                         endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
 
@@ -145,42 +120,44 @@ public class UDDI_090_SubscriptionListen
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                         Assert.assertNotNull(authInfoJoe);
-                        
-                        
+
+
 
                         UDDIPublicationPortType publication = transport.getUDDIPublishService();
                         inquiryJoe = transport.getUDDIInquiryService();
                         subscriptionJoe = transport.getUDDISubscriptionService();
-                         if (!TckPublisher.isUDDIAuthMode()){
+                        if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiryJoe, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) subscriptionJoe, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         }
 
-                        
+
                         tckTModelJoe = new TckTModel(publication, inquiryJoe);
                         tckBusinessJoe = new TckBusiness(publication, inquiryJoe);
                         tckBusinessServiceJoe = new TckBusinessService(publication, inquiryJoe);
                         tckSubscriptionListenerJoe = new TckSubscriptionListener(subscriptionJoe, publication);
-                        
-                        
-                        
-                                                
+
+
+
+
                         publication = transport.getUDDIPublishService();
                         inquiryMary = transport.getUDDIInquiryService();
                         subscriptionMary = transport.getUDDISubscriptionService();
-                         if (!TckPublisher.isUDDIAuthMode()){
+                        if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiryJoe, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                                 TckSecurity.setCredentials((BindingProvider) subscriptionJoe, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                         }
 
-                        
+
                         tckTModelMary = new TckTModel(publication, inquiryMary);
                         tckBusinessMary = new TckBusiness(publication, inquiryMary);
                         tckBusinessServiceMary = new TckBusinessService(publication, inquiryMary);
                         tckSubscriptionListenerMary = new TckSubscriptionListener(subscriptionMary, publication);
 
+                        email = TckPublisher.getProperties().getProperty("mail.to");
+
                 } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                         Assert.fail("Could not obtain authInfo token.");
@@ -255,22 +232,139 @@ public class UDDI_090_SubscriptionListen
                 }
         }
 
+        public static final void printMessageInfo(BufferedReader reader, int id) throws IOException {
+                String from = "";
+                String subject = "";
+                String line;
+                while ((line = reader.readLine()) != null) {
+                        String lower = line.toLowerCase(Locale.ENGLISH);
+                        if (lower.startsWith("from: ")) {
+                                from = line.substring(6).trim();
+                        } else if (lower.startsWith("subject: ")) {
+                                subject = line.substring(9).trim();
+                        }
+                }
+
+                System.out.println(Integer.toString(id) + " From: " + from + "  Subject: " + subject);
+        }
+
+        /**
+         * gets all current messages from the mail server and returns return
+         * String is the body of each message
+         */
+        private static int fetchMail(String contains) {
+                /*if (args.length < 3)
+                 {
+                 System.err.println(
+                 "Usage: POP3Mail <pop3 server hostname> <username> <password> [TLS [true=implicit]]");
+                 System.exit(1);
+                 }*/
+                Properties properties = TckPublisher.getProperties();
+
+                String server = properties.getProperty("mail.host");
+                String username = properties.getProperty("mail.username");
+                String password = properties.getProperty("mail.password");
+
+                String proto = properties.getProperty("mail.secureProtocol");
+                boolean implicit = false;
+                try {
+                        implicit = Boolean.parseBoolean(properties.getProperty("mail.secureProtocol"));
+                } catch (Exception ex) {
+                }
+                POP3Client pop3;
+
+                if (proto != null) {
+                        System.out.println("Using secure protocol: " + proto);
+                        pop3 = new POP3SClient(proto, implicit);
+                } else {
+                        pop3 = new POP3Client();
+                }
+                System.out.println("Connecting to server " + server + " on " + pop3.getDefaultPort());
+
+                // We want to timeout if a response takes longer than 60 seconds
+                pop3.setDefaultTimeout(60000);
+
+                // suppress login details
+                pop3.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
+
+                try {
+                        pop3.connect(server);
+                } catch (IOException e) {
+                        logger.error(e);
+                        Assert.fail("Could not connect to mail server." + e.getMessage());
+                }
+
+                try {
+                        if (!pop3.login(username, password)) {
+                                System.err.println("Could not login to server.  Check password.");
+                                pop3.disconnect();
+
+                                Assert.fail("Could not connect to mail server. check password");
+                        }
+
+                        POP3MessageInfo[] messages = pop3.listMessages();
+
+                        if (messages == null) {
+                                logger.warn("Could not retrieve message list.");
+                                pop3.disconnect();
+                                return 0;
+                        } else if (messages.length == 0) {
+                                logger.info("No messages");
+                                pop3.logout();
+                                pop3.disconnect();
+                                return 0;
+                        }
+
+                        int ret = 0;
+                        for (POP3MessageInfo msginfo : messages) {
+                                /*BufferedReader reader = (BufferedReader) pop3.retrieveMessageTop(msginfo.number, 0);
+
+                                 if (reader == null) {
+                                 logger.error("Could not retrieve message header.");
+                                 pop3.disconnect();
+                                 return 0;
+                                 }*/
+                                //printMessageInfo(reader, msginfo.number);
+                                BufferedReader reader = (BufferedReader) pop3.retrieveMessage(msginfo.number);
+                                String line = "";
+                                StringBuilder sb = new StringBuilder();
+                                while ((line = reader.readLine()) != null) {
+                                        String lower = line.toLowerCase(Locale.ENGLISH);
+                                        sb.append(lower);
+                                }
+
+
+                                if (serialize) {
+                                        logger.info("Email contents: " + sb.toString());
+                                }
+                                if (sb.toString().contains(contains.toLowerCase())) {
+                                        ret++;
+                                        pop3.deleteMessage(msginfo.number);
+                                }
+                        }
+
+                        pop3.logout();
+                        pop3.disconnect();
+                        return ret;
+                } catch (IOException e) {
+                        logger.error(e);
+                        return 0;
+                }
+        }
+
         @Test
         public void joePublisherUpdateService_SMTP_FIND_SERVICE() {
+                Assume.assumeNotNull(email);
                 logger.info("joePublisherUpdateService_SMTP_FIND_SERVICE");
                 try {
                         removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
-                        //    if (mailServer != null && !mailServer.isStopped()) {
-                        //        mailServer.stop();
-                        //    }
-                        mailServer = SimpleSmtpServer.start(smtpPort);
 
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
-                        //Saving the binding template that will be called by the server for a subscription event
+
                         tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
                         //Saving the SMTP Listener Service
-                        tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0, hostname);
+                        tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_EXTERNAL_XML, 0, email);
                         //Saving the SMTP Subscription
                         tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_XML);
                         //Changing the service we subscribed to "JoePublisherService"
@@ -279,27 +373,17 @@ public class UDDI_090_SubscriptionListen
                         tckBusinessServiceJoe.updateJoePublisherService(authInfoJoe, "foo");
 
                         //waiting up to 100 seconds for the listener to notice the change.
+                        boolean received = false;
                         for (int i = 0; i < 200; i++) {
                                 Thread.sleep(500);
                                 System.out.print(".");
-                                if (mailServer.getReceivedEmailSize() > 0) {
+                                if (fetchMail("Service One") > 0) {
                                         logger.info("Received Email Notification");
+                                        received = true;
                                         break;
                                 }
                         }
-                        if (mailServer.getReceivedEmailSize() == 0) {
-                                Assert.fail("No SmtpNotification was sent");
-                        }
-                        @SuppressWarnings("rawtypes")
-                        Iterator emailIter = mailServer.getReceivedEmail();
-                        SmtpMessage email = (SmtpMessage) emailIter.next();
-                        if (serialize) {
-                                System.out.println("Subject:" + email.getHeaderValue("Subject"));
-                                System.out.println("Body:" + email.getBody());
-                        }
-                        if (!email.getBody().replace("=", "").contains("Service One")) {
-                                Assert.fail("Notification does not contain the correct service");
-                        }
+                        Assert.assertTrue("No email was received", received);
 
                 } catch (Exception e) {
                         logger.error("No exceptions please.");
@@ -311,7 +395,6 @@ public class UDDI_090_SubscriptionListen
                         tckBusinessServiceJoe.deleteJoePublisherService(authInfoJoe);
                         tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
                         tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
-                        mailServer.stop();
                 }
         }
 
@@ -405,18 +488,16 @@ public class UDDI_090_SubscriptionListen
 
         //@Test
         public void joePublisherUpdateBusiness_SMTP_FIND_BUSINESS() {
+                Assume.assumeNotNull(email);
                 logger.info("joePublisherUpdateBusiness_SMTP_FIND_BUSINESS");
                 try {
-                        removeAllExistingSubscriptions(authInfoJoe,subscriptionJoe);
-                        //  if (mailServer != null && !mailServer.isStopped()) {
-                        //      mailServer.stop();
-                        //  }
-                        mailServer = SimpleSmtpServer.start(smtpPort);
+                        removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
+
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
                         tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
                         //Saving the Listener Service
-                        tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0, hostname);
+                        tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_EXTERNAL_XML, 0, email);
                         //tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
                         //Saving the Subscription
                         tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION2_SMTP_XML);
@@ -426,28 +507,17 @@ public class UDDI_090_SubscriptionListen
                         logger.info("Saving Mary's Business ********** ");
                         tckBusinessMary.saveBusiness(authInfoMary, MARY_BUSINESS_XML, "uddi:uddi.marypublisher.com:marybusinessone");
 
+                        boolean received = false;
                         for (int i = 0; i < 200; i++) {
                                 Thread.sleep(500);
                                 System.out.print(".");
-                                if (mailServer.getReceivedEmailSize() > 0) {
+                                if (fetchMail("uddi:uddi.marypublisher.com:marybusinessone") > 0) {
                                         logger.info("Received Email Notification");
+                                        received = true;
                                         break;
                                 }
                         }
-                        if (mailServer.getReceivedEmailSize() == 0) {
-                                Assert.fail("No SmtpNotification was sent");
-                        }
-                        @SuppressWarnings("rawtypes")
-                        Iterator emailIter = mailServer.getReceivedEmail();
-                        SmtpMessage email = (SmtpMessage) emailIter.next();
-                        if (serialize){
-                        System.out.println("Subject:" + email.getHeaderValue("Subject"));
-                        System.out.println("Body:" + email.getBody());
-                        }
-                        if (!email.getBody().replaceAll("=", "").contains("uddi:uddi.marypublisher.com:marybusinessone")) {
-                                DumpAllBusinesses();
-                                Assert.fail("Notification does not contain the correct service");
-                        }
+                        Assert.assertTrue("No email was received", received);
 
                 } catch (Exception e) {
                         logger.error("No exceptions please.");
@@ -461,7 +531,6 @@ public class UDDI_090_SubscriptionListen
                         tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
                         //      tckTModel.deleteJoePublisherTmodel(authInfoJoe);
                         tckBusinessMary.deleteMaryPublisherBusiness(authInfoMary);
-                        mailServer.stop();
                 }
         }
 
@@ -521,20 +590,17 @@ public class UDDI_090_SubscriptionListen
 
         //@Test
         public void joePublisherUpdateBusiness_SMTP_FIND_TMODEL() {
+                Assume.assumeNotNull(email);
                 logger.info("joePublisherUpdateBusiness_SMTP_FIND_TMODEL");
                 removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
                 try {
-                        if (mailServer != null && !mailServer.isStopped()) {
-                                mailServer.stop();
-                        }
-                        mailServer = SimpleSmtpServer.start(smtpPort);
 
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckTModelJoe.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
                         tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
                         //Saving the Listener Service
-                        tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0, hostname);
+                        tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_EXTERNAL_XML, 0, email);
                         //Saving the Subscription
                         tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_SMTP_XML);
                         //Changing the service we subscribed to "JoePublisherService"
@@ -542,28 +608,17 @@ public class UDDI_090_SubscriptionListen
                         logger.info("Deleting tModel ********** ");
                         tckTModelJoe.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
 
-
+                        boolean received = false;
                         for (int i = 0; i < 200; i++) {
                                 Thread.sleep(500);
                                 System.out.print(".");
-                                if (mailServer.getReceivedEmailSize() > 0) {
+                                if (fetchMail("tModel One") > 0) {
                                         logger.info("Received Email Notification");
+                                        received = true;
                                         break;
                                 }
                         }
-                        if (mailServer.getReceivedEmailSize() == 0) {
-                                Assert.fail("No SmtpNotification was sent");
-                        }
-                        @SuppressWarnings("rawtypes")
-                        Iterator emailIter = mailServer.getReceivedEmail();
-                        SmtpMessage email = (SmtpMessage) emailIter.next();
-                        if (serialize){
-                        System.out.println("Subject:" + email.getHeaderValue("Subject"));
-                        System.out.println("Body:" + email.getBody());
-                        }
-                        if (!email.getBody().contains("tModel One")) {
-                                Assert.fail("Notification does not contain the correct service");
-                        }
+                        Assert.assertTrue("No email was received", received);
 
                 } catch (Exception e) {
                         logger.error("No exceptions please.");
@@ -576,7 +631,6 @@ public class UDDI_090_SubscriptionListen
                         tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
                         tckTModelJoe.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
                         tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
-                        mailServer.stop();
                 }
         }
         //TODO If a subscriber specifies a maximum number of entries to be returned with a subscription and the amount of data to be returned exceeds this limit, or if the node determines based on its policy that there are too many entries to be returned in a single group, then the node SHOULD provide a chunkToken with results.  

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -28,10 +28,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.juddi.v3.client.Release;
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
 import org.uddi.v3_service.UDDIInquiryPortType;
 import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISecurityPortType;
@@ -42,9 +38,14 @@ import com.dumbster.smtp.SmtpMessage;
 import java.net.InetAddress;
 import java.util.List;
 import javax.xml.ws.BindingProvider;
+import org.apache.commons.codec.language.bm.Rule;
 import org.apache.juddi.v3.client.UDDIConstants;
 import static org.apache.juddi.v3.tck.TckBusiness.MARY_BUSINESS_XML;
-import org.junit.Assume;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.uddi.api_v3.FindQualifiers;
 import org.uddi.api_v3.FindService;
 import org.uddi.api_v3.Name;
@@ -66,15 +67,13 @@ public class UDDI_090_SubscriptionListen
                 }
         }
         private static Log logger = LogFactory.getLog(UDDI_090_SubscriptionListenerIntegrationTest.class);
-
         private static UDDISubscriptionPortType subscriptionMary = null;
         private static UDDIInquiryPortType inquiryMary = null;
         private static TckTModel tckTModelMary = null;
         private static TckBusiness tckBusinessMary = null;
         private static TckBusinessService tckBusinessServiceMary = null;
         private static TckSubscriptionListener tckSubscriptionListenerMary = null;
-        
-        private static String hostname=null;
+        private static String hostname = null;
         private static UDDISubscriptionPortType subscriptionJoe = null;
         private static UDDIInquiryPortType inquiryJoe = null;
         private static TckTModel tckTModelJoe = null;
@@ -82,16 +81,12 @@ public class UDDI_090_SubscriptionListen
         private static TckBusinessService tckBusinessServiceJoe = null;
         private static TckSubscriptionListener tckSubscriptionListenerJoe = null;
         private static Endpoint endPoint;
-        
         private static String authInfoJoe = null;
         private static String authInfoMary = null;
-        
         private static UDDIClient manager;
         private static SimpleSmtpServer mailServer;
         private static Integer smtpPort = 25;
         private static Integer httpPort = 80;
-        
-        
         private static boolean serialize = false;
 
         @AfterClass
@@ -101,12 +96,10 @@ public class UDDI_090_SubscriptionListen
                 endPoint.stop();
                 endPoint = null;
         }
-
+        
         @BeforeClass
         public static void startManager() throws ConfigurationException {
                 try {
-                        
-                        //TODO how do we set this up for calls from CLI?
                         smtpPort = 9700 + new Random().nextInt(99);
                         httpPort = 9600 + new Random().nextInt(99);
                         Properties properties = new Properties();
@@ -130,7 +123,7 @@ public class UDDI_090_SubscriptionListen
 
                         hostname = InetAddress.getLocalHost().getHostName();
                         //bring up the TCK SubscriptionListener
-                        String httpEndpoint = "http://" +hostname+ ":" + httpPort + "/tcksubscriptionlistener";
+                        String httpEndpoint = "http://" + hostname + ":" + httpPort + "/tcksubscriptionlistener";
                         System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
                         endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
 
@@ -145,37 +138,37 @@ public class UDDI_090_SubscriptionListen
                         authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                         Assert.assertNotNull(authInfoJoe);
-                        
-                        
+
+
 
                         UDDIPublicationPortType publication = transport.getUDDIPublishService();
                         inquiryJoe = transport.getUDDIInquiryService();
                         subscriptionJoe = transport.getUDDISubscriptionService();
-                         if (!TckPublisher.isUDDIAuthMode()){
+                        if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiryJoe, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                                 TckSecurity.setCredentials((BindingProvider) subscriptionJoe, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
                         }
 
-                        
+
                         tckTModelJoe = new TckTModel(publication, inquiryJoe);
                         tckBusinessJoe = new TckBusiness(publication, inquiryJoe);
                         tckBusinessServiceJoe = new TckBusinessService(publication, inquiryJoe);
                         tckSubscriptionListenerJoe = new TckSubscriptionListener(subscriptionJoe, publication);
-                        
-                        
-                        
-                                                
+
+
+
+
                         publication = transport.getUDDIPublishService();
                         inquiryMary = transport.getUDDIInquiryService();
                         subscriptionMary = transport.getUDDISubscriptionService();
-                         if (!TckPublisher.isUDDIAuthMode()){
+                        if (!TckPublisher.isUDDIAuthMode()) {
                                 TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                                 TckSecurity.setCredentials((BindingProvider) inquiryJoe, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                                 TckSecurity.setCredentials((BindingProvider) subscriptionJoe, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
                         }
 
-                        
+
                         tckTModelMary = new TckTModel(publication, inquiryMary);
                         tckBusinessMary = new TckBusiness(publication, inquiryMary);
                         tckBusinessServiceMary = new TckBusinessService(publication, inquiryMary);
@@ -407,7 +400,7 @@ public class UDDI_090_SubscriptionListen
         public void joePublisherUpdateBusiness_SMTP_FIND_BUSINESS() {
                 logger.info("joePublisherUpdateBusiness_SMTP_FIND_BUSINESS");
                 try {
-                        removeAllExistingSubscriptions(authInfoJoe,subscriptionJoe);
+                        removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
                         //  if (mailServer != null && !mailServer.isStopped()) {
                         //      mailServer.stop();
                         //  }
@@ -440,9 +433,9 @@ public class UDDI_090_SubscriptionListen
                         @SuppressWarnings("rawtypes")
                         Iterator emailIter = mailServer.getReceivedEmail();
                         SmtpMessage email = (SmtpMessage) emailIter.next();
-                        if (serialize){
-                        System.out.println("Subject:" + email.getHeaderValue("Subject"));
-                        System.out.println("Body:" + email.getBody());
+                        if (serialize) {
+                                System.out.println("Subject:" + email.getHeaderValue("Subject"));
+                                System.out.println("Body:" + email.getBody());
                         }
                         if (!email.getBody().replaceAll("=", "").contains("uddi:uddi.marypublisher.com:marybusinessone")) {
                                 DumpAllBusinesses();
@@ -557,9 +550,9 @@ public class UDDI_090_SubscriptionListen
                         @SuppressWarnings("rawtypes")
                         Iterator emailIter = mailServer.getReceivedEmail();
                         SmtpMessage email = (SmtpMessage) emailIter.next();
-                        if (serialize){
-                        System.out.println("Subject:" + email.getHeaderValue("Subject"));
-                        System.out.println("Body:" + email.getBody());
+                        if (serialize) {
+                                System.out.println("Subject:" + email.getHeaderValue("Subject"));
+                                System.out.println("Body:" + email.getBody());
                         }
                         if (!email.getBody().contains("tModel One")) {
                                 Assert.fail("Notification does not contain the correct service");

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -876,6 +876,8 @@ public class UDDI_141_JIRAIntegrationTes
                 sb.getBusinessEntity().add(be);
                 BusinessDetail saveBusiness = publicationJoe.saveBusiness(sb);
 
+                List<String> deleteme=new ArrayList<String>();
+                deleteme.add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
                 //ok Joe's callback is setup
 
                 //Setup a business to subscribe to
@@ -887,6 +889,7 @@ public class UDDI_141_JIRAIntegrationTes
                 sb.getBusinessEntity().add(be);
                 BusinessDetail saveBusiness1 = publicationSam.saveBusiness(sb);
 
+                
                 //ok Joe now needs to subscribe for Sam's business
                 Holder<List<Subscription>> list = new Holder<List<Subscription>>();
                 list.value = new ArrayList<Subscription>();
@@ -921,6 +924,10 @@ public class UDDI_141_JIRAIntegrationTes
                         maxwait = maxwait - 1000;
                 }
                 removeAllExistingSubscriptions(subscriptionJoe,authInfoJoe);
+                this.DeleteBusinesses(deleteme, authInfoJoe, publicationJoe);
+                deleteme.clear();
+                deleteme.add(saveBusiness1.getBusinessEntity().get(0).getBusinessKey());
+                this.DeleteBusinesses(deleteme, authInfoSam, publicationSam);
                 ep.stop();
                 if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty()) {
                         Assert.fail("no callbacks were recieved.");
@@ -982,6 +989,8 @@ public class UDDI_141_JIRAIntegrationTes
                 logger.info("setting up joe's callback business");
                 BusinessDetail saveBusiness = publicationJoe.saveBusiness(sb);
 
+                List<String>deleteme = new ArrayList<String>();
+                deleteme.add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
                 //ok Joe's callback is setup
 
                 //Setup a business to subscribe to
@@ -1031,6 +1040,10 @@ public class UDDI_141_JIRAIntegrationTes
                         maxwait = maxwait - 1000;
                 }
                 removeAllExistingSubscriptions(subscriptionJoe,authInfoJoe);
+                DeleteBusinesses(deleteme, authInfoJoe, publicationJoe);
+                deleteme.clear();
+                deleteme.add(saveBusiness1.getBusinessEntity().get(0).getBusinessKey());
+                DeleteBusinesses(deleteme, authInfoSam, publicationSam);
                 ep.stop();
                 if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty()) {
                         logger.error("no callbacks were recieved");
@@ -1110,7 +1123,7 @@ public class UDDI_141_JIRAIntegrationTes
                 BusinessEntity be = new BusinessEntity();
                 be.getName().add(new Name());
                 be.getName().get(0).setValue("Joe's JIRA_575_KR_Biz business");
-                be.setBusinessServices(new BusinessServices());
+                //be.setBusinessServices(new BusinessServices());
                 be.setCategoryBag(new CategoryBag());
                 be.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
                 sb.getBusinessEntity().add(be);
@@ -1143,7 +1156,7 @@ public class UDDI_141_JIRAIntegrationTes
                 BusinessEntity be = new BusinessEntity();
                 be.getName().add(new Name());
                 be.getName().get(0).setValue("Joe's JIRA_575_IDENT_Biz business");
-                be.setBusinessServices(new BusinessServices());
+                //be.setBusinessServices(new BusinessServices());
                 be.setIdentifierBag(new IdentifierBag());
                 be.getIdentifierBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
                 sb.getBusinessEntity().add(be);
@@ -1177,6 +1190,7 @@ public class UDDI_141_JIRAIntegrationTes
                 tm.setName(new Name("JIRA_575_KR_TMODEL", null));
                 tm.setCategoryBag(new CategoryBag());
                 tm.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
+                stm.getTModel().add(tm);
                 try {
                         publicationJoe.saveTModel(stm);
                         Assert.fail("unexpected success");
@@ -1206,6 +1220,7 @@ public class UDDI_141_JIRAIntegrationTes
                 tm.setCategoryBag(new CategoryBag());
                 tm.getCategoryBag().getKeyedReferenceGroup().add(new KeyedReferenceGroup());
                 tm.getCategoryBag().getKeyedReferenceGroup().get(0).setTModelKey(madeupTmodel);
+                stm.getTModel().add(tm);
                 try {
                         publicationJoe.saveTModel(stm);
                         Assert.fail("unexpected success");
@@ -1233,7 +1248,7 @@ public class UDDI_141_JIRAIntegrationTes
                 BusinessEntity be = new BusinessEntity();
                 be.getName().add(new Name());
                 be.getName().get(0).setValue("Joe's JIRA_575_KRGRP_Biz business");
-                be.setBusinessServices(new BusinessServices());
+               // be.setBusinessServices(new BusinessServices());
                 be.setCategoryBag(new CategoryBag());
                 //be.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
                 be.getCategoryBag().getKeyedReferenceGroup().add(new KeyedReferenceGroup());
@@ -1309,7 +1324,7 @@ public class UDDI_141_JIRAIntegrationTes
                 BusinessService bs = new BusinessService();
                 bs.getName().add(new Name());
                 bs.getName().get(0).setValue("Joe's JIRA_575_SVC_KR service");
-                bs.setBindingTemplates(new BindingTemplates());
+                //bs.setBindingTemplates(new BindingTemplates());
                 bs.setCategoryBag(new CategoryBag());
                 bs.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
 
@@ -1347,7 +1362,7 @@ public class UDDI_141_JIRAIntegrationTes
                 BusinessService bs = new BusinessService();
                 bs.getName().add(new Name());
                 bs.getName().get(0).setValue("Joe's JIRA_575_SVC_KRGRP service");
-                bs.setBindingTemplates(new BindingTemplates());
+               // bs.setBindingTemplates(new BindingTemplates());
                 bs.setCategoryBag(new CategoryBag());
                 bs.getCategoryBag().getKeyedReferenceGroup().add(new KeyedReferenceGroup());
                 bs.getCategoryBag().getKeyedReferenceGroup().get(0).setTModelKey(madeupTmodel);

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java Sun Dec 15 02:10:24 2013
@@ -60,7 +60,7 @@ import org.uddi.v3_service.UDDIInquiryPo
 public class UDDI_160_RESTIntergrationTest {
 
         private static UDDIInquiryPortType inquiry = null;
-        private static Log logger = LogFactory.getLog(JUDDI_100_ClientSubscriptionInfoTest.class);
+        private static Log logger = LogFactory.getLog(UDDI_160_RESTIntergrationTest.class);
         private static String authInfo = null;
         private static UDDIClient manager;
 
@@ -113,7 +113,7 @@ public class UDDI_160_RESTIntergrationTe
 
                 Assume.assumeNotNull(url);
                 HttpClient client = new DefaultHttpClient();
-                HttpGet httpGet = new HttpGet(url + "businessKey?" + findBusiness.getBusinessInfos().getBusinessInfo().get(0).getBusinessKey());
+                HttpGet httpGet = new HttpGet(url + "?businessKey=" + findBusiness.getBusinessInfos().getBusinessInfo().get(0).getBusinessKey());
                 HttpResponse response = client.execute(httpGet);
                 Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
                 BusinessEntity unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BusinessEntity.class);
@@ -140,7 +140,7 @@ public class UDDI_160_RESTIntergrationTe
 
                 Assume.assumeNotNull(url);
                 HttpClient client = new DefaultHttpClient();
-                HttpGet httpGet = new HttpGet(url + "tModelKey?" + findTModel.getTModelInfos().getTModelInfo().get(0).getTModelKey());
+                HttpGet httpGet = new HttpGet(url + "?tModelKey=" + findTModel.getTModelInfos().getTModelInfo().get(0).getTModelKey());
                 HttpResponse response = client.execute(httpGet);
                 Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
                 TModel unmarshal = JAXB.unmarshal(response.getEntity().getContent(), TModel.class);
@@ -167,7 +167,7 @@ public class UDDI_160_RESTIntergrationTe
 
                 Assume.assumeNotNull(url);
                 HttpClient client = new DefaultHttpClient();
-                HttpGet httpGet = new HttpGet(url + "tModelKey?" + findService.getServiceInfos().getServiceInfo().get(0).getServiceKey());
+                HttpGet httpGet = new HttpGet(url + "?serviceKey=" + findService.getServiceInfos().getServiceInfo().get(0).getServiceKey());
                 HttpResponse response = client.execute(httpGet);
                 Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
                 BusinessService unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BusinessService.class);
@@ -231,7 +231,7 @@ public class UDDI_160_RESTIntergrationTe
 
                 Assume.assumeNotNull(url);
                 HttpClient client = new DefaultHttpClient();
-                HttpGet httpGet = new HttpGet(url + "bindingKey?" + bt.getBindingKey());
+                HttpGet httpGet = new HttpGet(url + "?bindingKey=" + bt.getBindingKey());
                 HttpResponse response = client.execute(httpGet);
                 Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
                 BindingTemplate unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BindingTemplate.class);

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClerkList.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClerkList.java?rev=1550992&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClerkList.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClerkList.java Sun Dec 15 02:10:24 2013
@@ -0,0 +1,69 @@
+
+package org.apache.juddi.api_v3;
+
+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.XmlType;
+
+
+/**
+ * <p>Java class for clerkList complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="clerkList">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="clerk" type="{urn:juddi-apache-org:api_v3}clerk" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "clerkList", propOrder = {
+    "clerk"
+})
+public class ClerkList {
+
+    @XmlElement(nillable = true)
+    protected List<Clerk> clerk;
+
+    /**
+     * Gets the value of the clerk 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 clerk property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getClerk().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Clerk }
+     * 
+     * 
+     */
+    public List<Clerk> getClerk() {
+        if (clerk == null) {
+            clerk = new ArrayList<Clerk>();
+        }
+        return this.clerk;
+    }
+
+}

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClerk.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClerk.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClerk.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteClerk.java Sun Dec 15 02:10:24 2013
@@ -34,6 +34,11 @@ import javax.xml.bind.annotation.XmlType
 })
 public class DeleteClerk {
 
+        public DeleteClerk(){}
+        public DeleteClerk(String auth, String clerkid){
+                this.authInfo=auth;
+                this.clerkID = clerkid;
+        }
     @XmlElement(required = true)
     protected String authInfo;
     @XmlElement(required = true)

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteNode.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteNode.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteNode.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/DeleteNode.java Sun Dec 15 02:10:24 2013
@@ -34,6 +34,11 @@ import javax.xml.bind.annotation.XmlType
 })
 public class DeleteNode {
 
+        public DeleteNode(){}
+        public DeleteNode(String auth, String nodeid){
+                authInfo=auth;
+                nodeID = nodeid;
+        }
     @XmlElement(required = true)
     protected String authInfo;
     @XmlElement(required = true)

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClerksResponse.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClerksResponse.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClerksResponse.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllClerksResponse.java Sun Dec 15 02:10:24 2013
@@ -1,8 +1,6 @@
 
 package org.apache.juddi.api_v3;
 
-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;
@@ -19,7 +17,7 @@ import javax.xml.bind.annotation.XmlType
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="clerk" type="{urn:juddi-apache-org:api_v3}clerk" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="clerkList" type="{urn:juddi-apache-org:api_v3}clerkList"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -30,40 +28,35 @@ import javax.xml.bind.annotation.XmlType
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "get_AllClerksResponse", propOrder = {
-    "clerk"
+    "clerkList"
 })
 public class GetAllClerksResponse {
 
-    @XmlElement(nillable = true)
-    protected List<Clerk> clerk;
+    @XmlElement(required = true, nillable = true)
+    protected ClerkList clerkList;
 
     /**
-     * Gets the value of the clerk 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 clerk property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getClerk().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Clerk }
+     * Gets the value of the clerkList property.
      * 
+     * @return
+     *     possible object is
+     *     {@link ClerkList }
+     *     
+     */
+    public ClerkList getClerkList() {
+        return clerkList;
+    }
+
+    /**
+     * Sets the value of the clerkList property.
      * 
+     * @param value
+     *     allowed object is
+     *     {@link ClerkList }
+     *     
      */
-    public List<Clerk> getClerk() {
-        if (clerk == null) {
-            clerk = new ArrayList<Clerk>();
-        }
-        return this.clerk;
+    public void setClerkList(ClerkList value) {
+        this.clerkList = value;
     }
 
 }

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllNodesResponse.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllNodesResponse.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllNodesResponse.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/GetAllNodesResponse.java Sun Dec 15 02:10:24 2013
@@ -1,8 +1,6 @@
 
 package org.apache.juddi.api_v3;
 
-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;
@@ -19,7 +17,7 @@ import javax.xml.bind.annotation.XmlType
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
- *         &lt;element name="node" type="{urn:juddi-apache-org:api_v3}node" maxOccurs="unbounded"/>
+ *         &lt;element name="nodeList" type="{urn:juddi-apache-org:api_v3}nodeList"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
@@ -30,40 +28,35 @@ import javax.xml.bind.annotation.XmlType
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "get_AllNodesResponse", propOrder = {
-    "node"
+    "nodeList"
 })
 public class GetAllNodesResponse {
 
-    @XmlElement(required = true)
-    protected List<Node> node;
+    @XmlElement(required = true, nillable = true)
+    protected NodeList nodeList;
 
     /**
-     * Gets the value of the node 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 node property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getNode().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Node }
+     * Gets the value of the nodeList property.
      * 
+     * @return
+     *     possible object is
+     *     {@link NodeList }
+     *     
+     */
+    public NodeList getNodeList() {
+        return nodeList;
+    }
+
+    /**
+     * Sets the value of the nodeList property.
      * 
+     * @param value
+     *     allowed object is
+     *     {@link NodeList }
+     *     
      */
-    public List<Node> getNode() {
-        if (node == null) {
-            node = new ArrayList<Node>();
-        }
-        return this.node;
+    public void setNodeList(NodeList value) {
+        this.nodeList = value;
     }
 
 }

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/NodeList.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/NodeList.java?rev=1550992&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/NodeList.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/NodeList.java Sun Dec 15 02:10:24 2013
@@ -0,0 +1,67 @@
+
+package org.apache.juddi.api_v3;
+
+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.XmlType;
+
+
+/**
+ * <p>Java class for nodeList complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="nodeList">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="node" type="{urn:juddi-apache-org:api_v3}node" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "nodeList", propOrder = {
+    "node"
+})
+public class NodeList {
+
+    protected List<Node> node;
+
+    /**
+     * Gets the value of the node 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 node property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getNode().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Node }
+     * 
+     * 
+     */
+    public List<Node> getNode() {
+        if (node == null) {
+            node = new ArrayList<Node>();
+        }
+        return this.node;
+    }
+
+}

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ObjectFactory.java Sun Dec 15 02:10:24 2013
@@ -1,19 +1,3 @@
-/*
- * 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;
 
@@ -61,7 +45,6 @@ public class ObjectFactory {
     private final static QName _GetAllClerks_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_AllClerks");
     private final static QName _GetPublisherDetail_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_publisherDetail");
     private final static QName _SavePublisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "save_publisher");
-    private final static QName _DeleteClerkResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_ClerkResponse");
     private final static QName _SetAllValidValuesResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "set_allValidValuesResponse");
     private final static QName _DeletePublisher_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_publisher");
     private final static QName _AdminDeleteSubscription_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminDelete_Subscription");
@@ -71,7 +54,6 @@ public class ObjectFactory {
     private final static QName _GetAllNodesResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_AllNodesResponse");
     private final static QName _GetAllClerksResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_AllClerksResponse");
     private final static QName _AdminSaveBusiness_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminSave_Business");
-    private final static QName _DeleteNodeResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "delete_NodeResponse");
     private final static QName _GetReplicationNodes_QNAME = new QName("urn:juddi-apache-org:api_v3", "get_ReplicationNodes");
     private final static QName _AdminSaveSubscription_QNAME = new QName("urn:juddi-apache-org:api_v3", "adminSave_Subscription");
     private final static QName _SetReplicationNodesResponse_QNAME = new QName("urn:juddi-apache-org:api_v3", "set_ReplicationNodesResponse");
@@ -296,14 +278,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link DeleteClerkResponse }
-     * 
-     */
-    public DeleteClerkResponse createDeleteClerkResponse() {
-        return new DeleteClerkResponse();
-    }
-
-    /**
      * Create an instance of {@link GetReplicationNodesResponse }
      * 
      */
@@ -344,14 +318,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link DeleteNodeResponse }
-     * 
-     */
-    public DeleteNodeResponse createDeleteNodeResponse() {
-        return new DeleteNodeResponse();
-    }
-
-    /**
      * Create an instance of {@link DeletePublisher }
      * 
      */
@@ -400,6 +366,22 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link ClerkList }
+     * 
+     */
+    public ClerkList createClerkList() {
+        return new ClerkList();
+    }
+
+    /**
+     * Create an instance of {@link NodeList }
+     * 
+     */
+    public NodeList createNodeList() {
+        return new NodeList();
+    }
+
+    /**
      * Create an instance of {@link ClientSubscriptionInfoDetail }
      * 
      */
@@ -652,15 +634,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteClerkResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "delete_ClerkResponse")
-    public JAXBElement<DeleteClerkResponse> createDeleteClerkResponse(DeleteClerkResponse value) {
-        return new JAXBElement<DeleteClerkResponse>(_DeleteClerkResponse_QNAME, DeleteClerkResponse.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link SetAllValidValuesResponse }{@code >}}
      * 
      */
@@ -742,15 +715,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeleteNodeResponse }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:juddi-apache-org:api_v3", name = "delete_NodeResponse")
-    public JAXBElement<DeleteNodeResponse> createDeleteNodeResponse(DeleteNodeResponse value) {
-        return new JAXBElement<DeleteNodeResponse>(_DeleteNodeResponse_QNAME, DeleteNodeResponse.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link GetReplicationNodes }{@code >}}
      * 
      */

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java Sun Dec 15 02:10:24 2013
@@ -12,15 +12,17 @@ import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 import org.apache.juddi.api_v3.AdminSaveBusinessWrapper;
 import org.apache.juddi.api_v3.AdminSaveTModelWrapper;
-import org.apache.juddi.api_v3.Clerk;
 import org.apache.juddi.api_v3.ClerkDetail;
+import org.apache.juddi.api_v3.ClerkList;
 import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
+import org.apache.juddi.api_v3.DeleteClerk;
 import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
+import org.apache.juddi.api_v3.DeleteNode;
 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.Node;
 import org.apache.juddi.api_v3.NodeDetail;
+import org.apache.juddi.api_v3.NodeList;
 import org.apache.juddi.api_v3.PublisherDetail;
 import org.apache.juddi.api_v3.SaveClerkInfo;
 import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
@@ -223,14 +225,14 @@ public interface JUDDIApiPortType {
      * 
      * @param authInfo
      * @return
-     *     returns java.util.List<org.apache.juddi.api_v3.Node>
+     *     returns org.apache.juddi.api_v3.NodeList
      * @throws DispositionReportFaultMessage
      */
     @WebMethod(operationName = "get_AllNodes", action = "get_AllNodes")
-    @WebResult(name = "node", targetNamespace = "urn:juddi-apache-org:api_v3")
+    @WebResult(name = "nodeList", targetNamespace = "urn:juddi-apache-org:api_v3")
     @RequestWrapper(localName = "get_AllNodes", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.GetAllNodes")
     @ResponseWrapper(localName = "get_AllNodesResponse", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.GetAllNodesResponse")
-    public List<Node> getAllNodes(
+    public NodeList getAllNodes(
         @WebParam(name = "authInfo", targetNamespace = "urn:juddi-apache-org:api_v3")
         String authInfo)
         throws DispositionReportFaultMessage
@@ -244,14 +246,14 @@ public interface JUDDIApiPortType {
      * 
      * @param authInfo
      * @return
-     *     returns java.util.List<org.apache.juddi.api_v3.Clerk>
+     *     returns org.apache.juddi.api_v3.ClerkList
      * @throws DispositionReportFaultMessage
      */
     @WebMethod(operationName = "get_AllClerks", action = "get_AllClerks")
-    @WebResult(name = "clerk", targetNamespace = "urn:juddi-apache-org:api_v3")
+    @WebResult(name = "clerkList", targetNamespace = "urn:juddi-apache-org:api_v3")
     @RequestWrapper(localName = "get_AllClerks", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.GetAllClerks")
     @ResponseWrapper(localName = "get_AllClerksResponse", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.GetAllClerksResponse")
-    public List<Clerk> getAllClerks(
+    public ClerkList getAllClerks(
         @WebParam(name = "authInfo", targetNamespace = "urn:juddi-apache-org:api_v3")
         String authInfo)
         throws DispositionReportFaultMessage
@@ -264,21 +266,14 @@ public interface JUDDIApiPortType {
      * 		@since 3.3
      * 	  
      * 
-     * @param nodeID
-     * @param authInfo
-     * @return
-     *     returns org.uddi.api_v3.DispositionReport
+     * @param body
      * @throws DispositionReportFaultMessage
      */
     @WebMethod(operationName = "delete_Node", action = "delete_Node")
-    @WebResult(name = "dispositionReport", targetNamespace = "urn:juddi-apache-org:api_v3")
-    @RequestWrapper(localName = "delete_Node", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.DeleteNode")
-    @ResponseWrapper(localName = "delete_NodeResponse", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.DeleteNodeResponse")
-    public DispositionReport deleteNode(
-        @WebParam(name = "authInfo", targetNamespace = "urn:juddi-apache-org:api_v3")
-        String authInfo,
-        @WebParam(name = "nodeID", targetNamespace = "urn:juddi-apache-org:api_v3")
-        String nodeID)
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void deleteNode(
+        @WebParam(name = "delete_Node", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "body")
+        DeleteNode body)
         throws DispositionReportFaultMessage
     ;
 
@@ -288,21 +283,14 @@ public interface JUDDIApiPortType {
      * 		@since 3.3
      * 	  
      * 
-     * @param authInfo
-     * @param clerkID
-     * @return
-     *     returns org.uddi.api_v3.DispositionReport
+     * @param request
      * @throws DispositionReportFaultMessage
      */
     @WebMethod(operationName = "delete_Clerk", action = "delete_Clerk")
-    @WebResult(name = "dispositionReport", targetNamespace = "urn:juddi-apache-org:api_v3")
-    @RequestWrapper(localName = "delete_Clerk", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.DeleteClerk")
-    @ResponseWrapper(localName = "delete_ClerkResponse", targetNamespace = "urn:juddi-apache-org:api_v3", className = "org.apache.juddi.api_v3.DeleteClerkResponse")
-    public DispositionReport deleteClerk(
-        @WebParam(name = "authInfo", targetNamespace = "urn:juddi-apache-org:api_v3")
-        String authInfo,
-        @WebParam(name = "clerkID", targetNamespace = "urn:juddi-apache-org:api_v3")
-        String clerkID)
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    public void deleteClerk(
+        @WebParam(name = "delete_Clerk", targetNamespace = "urn:juddi-apache-org:api_v3", partName = "request")
+        DeleteClerk request)
         throws DispositionReportFaultMessage
     ;
 



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


Mime
View raw message