You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/12/02 01:51:48 UTC

svn commit: r1546875 [6/10] - in /juddi/branches/juddi-3.3.x: ./ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-console/ juddi-core-openjpa/ juddi-core/src/main/java/org/apache/juddi/ juddi-core/src/main/java/org/apache/juddi/api/i...

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=1546875&r1=1546874&r2=1546875&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 Mon Dec  2 00:51:47 2013
@@ -58,475 +58,484 @@ import org.uddi.v3_service.DispositionRe
  */
 public class UDDI_090_SubscriptionListenerIntegrationTest {
 
-    private static Log logger = LogFactory.getLog(UDDI_090_SubscriptionListenerIntegrationTest.class);
-    private static TckTModel tckTModel = null;
-    private static TckBusiness tckBusiness = null;
-    private static TckBusinessService tckBusinessService = null;
-    private static TckSubscriptionListener tckSubscriptionListener = 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 UDDISubscriptionPortType subscription = null;
-    private static UDDIInquiryPortType inquiry=null;
-
-    @AfterClass
-    public static void stopManager() throws ConfigurationException {
-        manager.stop();
-        //shutting down the TCK SubscriptionListener
-        endPoint.stop();
-        endPoint = null;
-    }
-
-    @BeforeClass
-    public static void startManager() throws ConfigurationException {
-        try {
-            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");
-
-            //bring up the TCK SubscriptionListener
-            String httpEndpoint = "http://localhost:" + httpPort + "/tcksubscriptionlistener";
-            System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
-            endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
-
-            manager = new UDDIClient();
-            manager.start();
-
-            logger.debug("Getting auth tokens..");
-
-
-            Transport transport = manager.getTransport();
-            UDDISecurityPortType security = transport.getUDDISecurityService();
-            authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
-            authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
-            Assert.assertNotNull(authInfoJoe);
-            subscription = transport.getUDDISubscriptionService();
-
-            UDDIPublicationPortType publication = transport.getUDDIPublishService();
-             inquiry = transport.getUDDIInquiryService();
-            tckTModel = new TckTModel(publication, inquiry);
-            tckBusiness = new TckBusiness(publication, inquiry);
-            tckBusinessService = new TckBusinessService(publication, inquiry);
-            tckSubscriptionListener = new TckSubscriptionListener(subscription, publication);
-
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            Assert.fail("Could not obtain authInfo token.");
-        }
-    }
-
-    private void removeAllExistingSubscriptions(String authinfo) {
-        List<Subscription> subscriptions;
-        try {
-            subscriptions = subscription.getSubscriptions(authinfo);
-
-            DeleteSubscription ds = new DeleteSubscription();
-            ds.setAuthInfo(authinfo);
-            for (int i = 0; i < subscriptions.size(); i++) {
-                ds.getSubscriptionKey().add(subscriptions.get(i).getSubscriptionKey());
-            }
-            if (!subscriptions.isEmpty()) {
-                logger.info("Purging " + subscriptions.size() + " old subscriptions");
-                subscription.deleteSubscription(ds);
-            }
-        } catch (Exception ex) {
-            logger.warn("error clearing subscriptions", ex);
-        }
-    }
-
-    @Test
-    public void joePublisherUpdateService_HTTP_FIND_SERVICE() {
-        logger.info("joePublisherUpdateService_HTTP_FIND_SERVICE");
-        try {
-            removeAllExistingSubscriptions(authInfoJoe);
-            UDDISubscriptionListenerImpl.notifcationMap.clear();
-            UDDISubscriptionListenerImpl.notificationCount = 0;
-            tckTModel.saveJoePublisherTmodel(authInfoJoe);
-            tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-            //Saving the binding template that will be called by the server for a subscription event
-            tckBusinessService.saveJoePublisherService(authInfoJoe);
-            //Saving the HTTP Listener Service
-            tckSubscriptionListener.saveService(authInfoJoe, "uddi_data/subscriptionnotifier/listenerService.xml", httpPort);
-            //Saving the HTTP Subscription
-            tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, "uddi_data/subscriptionnotifier/subscription1.xml");
-            //Changing the service we subscribed to "JoePublisherService"
-            Thread.sleep(1000);
-            logger.info("Updating Service ********** ");
-            tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
-
-            //waiting up to 100 seconds for the listener to notice the change.
-            for (int i = 0; i < 200; i++) {
-                Thread.sleep(500);
-                System.out.print(".");
-                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
-                    logger.info("Received HTTP Notification");
-                    break;
+        public UDDI_090_SubscriptionListenerIntegrationTest() {
+                serialize = false;
+                if (System.getProperty("debug") != null
+                        && System.getProperty("debug").equalsIgnoreCase("true")) {
+                        serialize = true;
                 }
-            }
-            if (UDDISubscriptionListenerImpl.notificationCount == 0) {
-                Assert.fail("No HttpNotification was sent");
-            }
-            if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
-                Assert.fail("Notification does not contain the correct service");
-            }
-
-        } catch (Exception e) {
-            logger.error("No exceptions please.");
-            e.printStackTrace();
-
-            Assert.fail();
-        } finally {
-            tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, "uddi:uddi.joepublisher.com:subscriptionone");
-            tckBusinessService.deleteJoePublisherService(authInfoJoe);
-            tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-            tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-        }
-    }
-
-    @Test
-    public void joePublisherUpdateService_SMTP_FIND_SERVICE() {
-        logger.info("joePublisherUpdateService_SMTP_FIND_SERVICE");
-        try {
-            removeAllExistingSubscriptions(authInfoJoe);
-            //    if (mailServer != null && !mailServer.isStopped()) {
-            //        mailServer.stop();
-            //    }
-            mailServer = SimpleSmtpServer.start(smtpPort);
-
-            tckTModel.saveJoePublisherTmodel(authInfoJoe);
-            tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-            //Saving the binding template that will be called by the server for a subscription event
-            tckBusinessService.saveJoePublisherService(authInfoJoe);
-            //Saving the SMTP Listener Service
-            tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0);
-            //Saving the SMTP Subscription
-            tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_XML);
-            //Changing the service we subscribed to "JoePublisherService"
-            Thread.sleep(1000);
-            logger.info("Updating Service ********** ");
-            tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
-
-            //waiting up to 100 seconds for the listener to notice the change.
-            for (int i = 0; i < 200; i++) {
-                Thread.sleep(500);
-                System.out.print(".");
-                if (mailServer.getReceivedEmailSize() > 0) {
-                    logger.info("Received Email Notification");
-                    break;
+        }
+        private static Log logger = LogFactory.getLog(UDDI_090_SubscriptionListenerIntegrationTest.class);
+        private static TckTModel tckTModel = null;
+        private static TckBusiness tckBusiness = null;
+        private static TckBusinessService tckBusinessService = null;
+        private static TckSubscriptionListener tckSubscriptionListener = 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 UDDISubscriptionPortType subscription = null;
+        private static UDDIInquiryPortType inquiry = null;
+        private static boolean serialize = false;
+
+        @AfterClass
+        public static void stopManager() throws ConfigurationException {
+                manager.stop();
+                //shutting down the TCK SubscriptionListener
+                endPoint.stop();
+                endPoint = null;
+        }
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
+                try {
+                        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");
+
+                        //bring up the TCK SubscriptionListener
+                        String httpEndpoint = "http://localhost:" + httpPort + "/tcksubscriptionlistener";
+                        System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
+                        endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
+
+                        manager = new UDDIClient();
+                        manager.start();
+
+                        logger.debug("Getting auth tokens..");
+
+
+                        Transport transport = manager.getTransport();
+                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                        authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
+                        Assert.assertNotNull(authInfoJoe);
+                        subscription = transport.getUDDISubscriptionService();
+
+                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
+                        inquiry = transport.getUDDIInquiryService();
+                        tckTModel = new TckTModel(publication, inquiry);
+                        tckBusiness = new TckBusiness(publication, inquiry);
+                        tckBusinessService = new TckBusinessService(publication, inquiry);
+                        tckSubscriptionListener = new TckSubscriptionListener(subscription, publication);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
                 }
-            }
-            if (mailServer.getReceivedEmailSize() == 0) {
-                Assert.fail("No SmtpNotification was sent");
-            }
-            @SuppressWarnings("rawtypes")
-            Iterator emailIter = mailServer.getReceivedEmail();
-            SmtpMessage email = (SmtpMessage) emailIter.next();
-            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");
-            }
-
-        } catch (Exception e) {
-            logger.error("No exceptions please.");
-            e.printStackTrace();
-
-            Assert.fail();
-        } finally {
-            tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY);
-            tckBusinessService.deleteJoePublisherService(authInfoJoe);
-            tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-            tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-            mailServer.stop();
-        }
-    }
-
- //   @Test
-    public void joePublisherUpdateBusiness_HTTP_FIND_BUSINESS() {
-        logger.info("joePublisherUpdateBusiness_HTTP_FIND_BUSINESS");
-        try {
-            removeAllExistingSubscriptions(authInfoJoe);
-            DumpAllBusinesses();
-            Thread.sleep(5000);
-            UDDISubscriptionListenerImpl.notifcationMap.clear();
-            UDDISubscriptionListenerImpl.notificationCount = 0;
-            tckTModel.saveJoePublisherTmodel(authInfoJoe);
-            tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-            tckBusinessService.saveJoePublisherService(authInfoJoe);
-            //Saving the Listener Service
-            logger.info("Saving Joe's callback endpoint ********** ");
-            tckSubscriptionListener.saveService(authInfoJoe, "uddi_data/subscriptionnotifier/listenerService.xml", httpPort);
-            //Saving the Subscription
-            logger.info("Saving Joe's subscription********** ");
-            tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, "uddi_data/subscriptionnotifier/subscription2.xml");
-            //Changing the service we subscribed to "JoePublisherService"
-            DumpAllBusinesses();
-            logger.info("Clearing the inbox********** ");
-            UDDISubscriptionListenerImpl.notifcationMap.clear();
-            UDDISubscriptionListenerImpl.notificationCount = 0;
-            Thread.sleep(2000);
-            logger.info("Saving Mary's Business ********** ");
-            tckBusiness.saveMaryPublisherBusiness(authInfoMary);
-            DumpAllBusinesses();
-            //waiting up to 10 seconds for the listener to notice the change.
-            String test = "";
-            for (int i = 0; i < 20; i++) {
-                Thread.sleep(500);
-                System.out.print(".");
-                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
-                    //logger.info("Received Notification");
-                    //break;
-                } else {
-                    System.out.print(test);
+        }
+
+        private void removeAllExistingSubscriptions(String authinfo) {
+                List<Subscription> subscriptions;
+                try {
+                        subscriptions = subscription.getSubscriptions(authinfo);
+
+                        DeleteSubscription ds = new DeleteSubscription();
+                        ds.setAuthInfo(authinfo);
+                        for (int i = 0; i < subscriptions.size(); i++) {
+                                ds.getSubscriptionKey().add(subscriptions.get(i).getSubscriptionKey());
+                        }
+                        if (!subscriptions.isEmpty()) {
+                                logger.info("Purging " + subscriptions.size() + " old subscriptions");
+                                subscription.deleteSubscription(ds);
+                        }
+                } catch (Exception ex) {
+                        logger.warn("error clearing subscriptions", ex);
                 }
-            }
-            logger.info("RX " + UDDISubscriptionListenerImpl.notificationCount + " notifications");
-            Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
-            while (it.hasNext())
-            {
-                logger.info("Notification: " + it.next());
-            }
-            DumpAllBusinesses();
-            if (UDDISubscriptionListenerImpl.notificationCount == 0) {
-                Assert.fail("No Notification was sent");
-            }
-            if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("uddi:uddi.marypublisher.com:marybusinessone")) {
-                Assert.fail("Notification does not contain the correct service");
-            }
-
-        } catch (Exception e) {
-            logger.error("No exceptions please.");
-            e.printStackTrace();
-
-            Assert.fail();
-        } finally {
-            tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, "uddi:uddi.joepublisher.com:subscriptionone");
-            tckBusinessService.deleteJoePublisherService(authInfoJoe);
-            tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-            tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
-        }
-    }
-
-    private static void DumpAllBusinesses() {
-        logger.warn("Dumping the business/service list for debugging");
-        FindService fs = new FindService();
-        fs.setFindQualifiers(new FindQualifiers());
-        fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
-        fs.getName().add(new Name("%", null));
-        try {
-            ServiceList findService = inquiry.findService(fs);
-            if (findService.getServiceInfos() == null) {
-                logger.warn("NO SERVICES RETURNED!");
-            } else {
-                for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
-                    logger.warn(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getValue() + " lang="
-                            + findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getLang() + " "
-                            + findService.getServiceInfos().getServiceInfo().get(i).getServiceKey() + " "
-                            + findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey());
+        }
+
+        @Test
+        public void joePublisherUpdateService_HTTP_FIND_SERVICE() {
+                logger.info("joePublisherUpdateService_HTTP_FIND_SERVICE");
+                try {
+                        removeAllExistingSubscriptions(authInfoJoe);
+                        UDDISubscriptionListenerImpl.notifcationMap.clear();
+                        UDDISubscriptionListenerImpl.notificationCount = 0;
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        //Saving the binding template that will be called by the server for a subscription event
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        //Saving the HTTP Listener Service
+                        tckSubscriptionListener.saveService(authInfoJoe, "uddi_data/subscriptionnotifier/listenerService.xml", httpPort);
+                        //Saving the HTTP Subscription
+                        tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, "uddi_data/subscriptionnotifier/subscription1.xml");
+                        //Changing the service we subscribed to "JoePublisherService"
+                        Thread.sleep(1000);
+                        logger.info("Updating Service ********** ");
+                        tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
+
+                        //waiting up to 100 seconds for the listener to notice the change.
+                        for (int i = 0; i < 200; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
+                                        logger.info("Received HTTP Notification");
+                                        break;
+                                }
+                        }
+                        if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+                                Assert.fail("No HttpNotification was sent");
+                        }
+                        if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
+                                Assert.fail("Notification does not contain the correct service");
+                        }
+
+                } catch (Exception e) {
+                        logger.error("No exceptions please.");
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+                        tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, "uddi:uddi.joepublisher.com:subscriptionone");
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+                        tckTModel.deleteJoePublisherTmodel(authInfoJoe);
                 }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    //@Test
-    public void joePublisherUpdateBusiness_SMTP_FIND_BUSINESS() {
-        logger.info("joePublisherUpdateBusiness_SMTP_FIND_BUSINESS");
-        try {
-            removeAllExistingSubscriptions(authInfoJoe);
-            //  if (mailServer != null && !mailServer.isStopped()) {
-            //      mailServer.stop();
-            //  }
-            mailServer = SimpleSmtpServer.start(smtpPort);
-            tckTModel.saveJoePublisherTmodel(authInfoJoe);
-            tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-            tckBusinessService.saveJoePublisherService(authInfoJoe);
-            //Saving the Listener Service
-            tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0);
-            //tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
-            //Saving the Subscription
-            tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION2_SMTP_XML);
-            //tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
-
-            Thread.sleep(3000);
-            logger.info("Saving Mary's Business ********** ");
-            tckBusiness.saveBusiness(authInfoMary, MARY_BUSINESS_XML, "uddi:uddi.marypublisher.com:marybusinessone");
-
-            for (int i = 0; i < 200; i++) {
-                Thread.sleep(500);
-                System.out.print(".");
-                if (mailServer.getReceivedEmailSize() > 0) {
-                    logger.info("Received Email Notification");
-                    break;
+        }
+
+        @Test
+        public void joePublisherUpdateService_SMTP_FIND_SERVICE() {
+                logger.info("joePublisherUpdateService_SMTP_FIND_SERVICE");
+                try {
+                        removeAllExistingSubscriptions(authInfoJoe);
+                        //    if (mailServer != null && !mailServer.isStopped()) {
+                        //        mailServer.stop();
+                        //    }
+                        mailServer = SimpleSmtpServer.start(smtpPort);
+
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        //Saving the binding template that will be called by the server for a subscription event
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        //Saving the SMTP Listener Service
+                        tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0);
+                        //Saving the SMTP Subscription
+                        tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_XML);
+                        //Changing the service we subscribed to "JoePublisherService"
+                        Thread.sleep(1000);
+                        logger.info("Updating Service ********** ");
+                        tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
+
+                        //waiting up to 100 seconds for the listener to notice the change.
+                        for (int i = 0; i < 200; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (mailServer.getReceivedEmailSize() > 0) {
+                                        logger.info("Received Email Notification");
+                                        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");
+                        }
+
+                } catch (Exception e) {
+                        logger.error("No exceptions please.");
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+                        tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY);
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+                        tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+                        mailServer.stop();
                 }
-            }
-            if (mailServer.getReceivedEmailSize() == 0) {
-                Assert.fail("No SmtpNotification was sent");
-            }
-            @SuppressWarnings("rawtypes")
-            Iterator emailIter = mailServer.getReceivedEmail();
-            SmtpMessage email = (SmtpMessage) emailIter.next();
-            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");
-            }
-
-        } catch (Exception e) {
-            logger.error("No exceptions please.");
-            e.printStackTrace();
-
-            Assert.fail();
-        } finally {
-            tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY);
-            tckBusinessService.deleteJoePublisherService(authInfoJoe);
-            tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-            tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-            //      tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-            tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
-            mailServer.stop();
-        }
-    }
-
-    //tmodel tests
-    //@Test
-    public void joePublisherUpdateBusiness_HTTP_FIND_TMODEL() {
-        logger.info("joePublisherUpdateBusiness_HTTP_FIND_TMODEL");
-        removeAllExistingSubscriptions(authInfoJoe);
-        try {
-            UDDISubscriptionListenerImpl.notifcationMap.clear();
-            UDDISubscriptionListenerImpl.notificationCount = 0;
-            tckTModel.saveJoePublisherTmodel(authInfoJoe);
-            tckTModel.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
-            tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-            tckBusinessService.saveJoePublisherService(authInfoJoe);
-            //Saving the Listener Service
-            tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
-            //Saving the Subscription
-            tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_XML);
-            //Changing the service we subscribed to "JoePublisherService"
-            Thread.sleep(1000);
-            logger.info("Deleting tModel ********** ");
-            tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
-
-            //waiting up to 100 seconds for the listener to notice the change.
-            String test = "";
-            for (int i = 0; i < 200; i++) {
-                Thread.sleep(500);
-                System.out.print(".");
-                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
-                    logger.info("Received Notification");
-                    break;
-                } else {
-                    System.out.print(test);
+        }
+
+        //   @Test
+        public void joePublisherUpdateBusiness_HTTP_FIND_BUSINESS() {
+                logger.info("joePublisherUpdateBusiness_HTTP_FIND_BUSINESS");
+                try {
+                        removeAllExistingSubscriptions(authInfoJoe);
+                        DumpAllBusinesses();
+                        Thread.sleep(5000);
+                        UDDISubscriptionListenerImpl.notifcationMap.clear();
+                        UDDISubscriptionListenerImpl.notificationCount = 0;
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        //Saving the Listener Service
+                        logger.info("Saving Joe's callback endpoint ********** ");
+                        tckSubscriptionListener.saveService(authInfoJoe, "uddi_data/subscriptionnotifier/listenerService.xml", httpPort);
+                        //Saving the Subscription
+                        logger.info("Saving Joe's subscription********** ");
+                        tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, "uddi_data/subscriptionnotifier/subscription2.xml");
+                        //Changing the service we subscribed to "JoePublisherService"
+                        DumpAllBusinesses();
+                        logger.info("Clearing the inbox********** ");
+                        UDDISubscriptionListenerImpl.notifcationMap.clear();
+                        UDDISubscriptionListenerImpl.notificationCount = 0;
+                        Thread.sleep(2000);
+                        logger.info("Saving Mary's Business ********** ");
+                        tckBusiness.saveMaryPublisherBusiness(authInfoMary);
+                        DumpAllBusinesses();
+                        //waiting up to 10 seconds for the listener to notice the change.
+                        String test = "";
+                        for (int i = 0; i < 20; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
+                                        //logger.info("Received Notification");
+                                        //break;
+                                } else {
+                                        System.out.print(test);
+                                }
+                        }
+                        logger.info("RX " + UDDISubscriptionListenerImpl.notificationCount + " notifications");
+                        Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
+                        while (it.hasNext()) {
+                                logger.info("Notification: " + it.next());
+                        }
+                        DumpAllBusinesses();
+                        if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+                                Assert.fail("No Notification was sent");
+                        }
+                        if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("uddi:uddi.marypublisher.com:marybusinessone")) {
+                                Assert.fail("Notification does not contain the correct service");
+                        }
+
+                } catch (Exception e) {
+                        logger.error("No exceptions please.");
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+                        tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, "uddi:uddi.joepublisher.com:subscriptionone");
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
                 }
-            }
-            if (UDDISubscriptionListenerImpl.notificationCount == 0) {
-                Assert.fail("No Notification was sent");
-            }
-            if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">tModel One</name>")) {
-                Assert.fail("Notification does not contain the correct service");
-            }
-
-        } catch (Exception e) {
-            logger.error("No exceptions please.");
-            e.printStackTrace();
-
-            Assert.fail();
-        } finally {
-            tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_KEY);
-            tckBusinessService.deleteJoePublisherService(authInfoJoe);
-            tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-            tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-            tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
-        }
-    }
-
-    //@Test
-    public void joePublisherUpdateBusiness_SMTP_FIND_TMODEL() {
-        logger.info("joePublisherUpdateBusiness_SMTP_FIND_TMODEL");
-        removeAllExistingSubscriptions(authInfoJoe);
-        try {
-            if (mailServer != null && !mailServer.isStopped()) {
-                mailServer.stop();
-            }
-            mailServer = SimpleSmtpServer.start(smtpPort);
-
-            tckTModel.saveJoePublisherTmodel(authInfoJoe);
-            tckTModel.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
-            tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-            tckBusinessService.saveJoePublisherService(authInfoJoe);
-            //Saving the Listener Service
-            tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0);
-            //Saving the Subscription
-            tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_SMTP_XML);
-            //Changing the service we subscribed to "JoePublisherService"
-            Thread.sleep(1000);
-            logger.info("Deleting tModel ********** ");
-            tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
-
-
-            for (int i = 0; i < 200; i++) {
-                Thread.sleep(500);
-                System.out.print(".");
-                if (mailServer.getReceivedEmailSize() > 0) {
-                    logger.info("Received Email Notification");
-                    break;
+        }
+
+        private static void DumpAllBusinesses() {
+                logger.warn("Dumping the business/service list for debugging");
+                FindService fs = new FindService();
+                fs.setFindQualifiers(new FindQualifiers());
+                fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                fs.getName().add(new Name("%", null));
+                try {
+                        ServiceList findService = inquiry.findService(fs);
+                        if (findService.getServiceInfos() == null) {
+                                logger.warn("NO SERVICES RETURNED!");
+                        } else {
+                                for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
+                                        logger.warn(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getValue() + " lang="
+                                                + findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getLang() + " "
+                                                + findService.getServiceInfos().getServiceInfo().get(i).getServiceKey() + " "
+                                                + findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey());
+                                }
+                        }
+                } catch (Exception ex) {
+                        ex.printStackTrace();
+                }
+        }
+
+        //@Test
+        public void joePublisherUpdateBusiness_SMTP_FIND_BUSINESS() {
+                logger.info("joePublisherUpdateBusiness_SMTP_FIND_BUSINESS");
+                try {
+                        removeAllExistingSubscriptions(authInfoJoe);
+                        //  if (mailServer != null && !mailServer.isStopped()) {
+                        //      mailServer.stop();
+                        //  }
+                        mailServer = SimpleSmtpServer.start(smtpPort);
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        //Saving the Listener Service
+                        tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0);
+                        //tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
+                        //Saving the Subscription
+                        tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION2_SMTP_XML);
+                        //tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
+
+                        Thread.sleep(3000);
+                        logger.info("Saving Mary's Business ********** ");
+                        tckBusiness.saveBusiness(authInfoMary, MARY_BUSINESS_XML, "uddi:uddi.marypublisher.com:marybusinessone");
+
+                        for (int i = 0; i < 200; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (mailServer.getReceivedEmailSize() > 0) {
+                                        logger.info("Received Email Notification");
+                                        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");
+                        }
+
+                } catch (Exception e) {
+                        logger.error("No exceptions please.");
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+                        tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY);
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+                        tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+                        //      tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
+                        mailServer.stop();
                 }
-            }
-            if (mailServer.getReceivedEmailSize() == 0) {
-                Assert.fail("No SmtpNotification was sent");
-            }
-            @SuppressWarnings("rawtypes")
-            Iterator emailIter = mailServer.getReceivedEmail();
-            SmtpMessage email = (SmtpMessage) emailIter.next();
-            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");
-            }
-
-        } catch (Exception e) {
-            logger.error("No exceptions please.");
-            e.printStackTrace();
-
-            Assert.fail();
-        } finally {
-            tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY);
-            tckBusinessService.deleteJoePublisherService(authInfoJoe);
-            tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-            tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
-            tckTModel.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.  
-    
-    
-    //TODO  If no more results are pending, the value of the chunkToken MUST be "0".
+        }
+
+        //tmodel tests
+        //@Test
+        public void joePublisherUpdateBusiness_HTTP_FIND_TMODEL() {
+                logger.info("joePublisherUpdateBusiness_HTTP_FIND_TMODEL");
+                removeAllExistingSubscriptions(authInfoJoe);
+                try {
+                        UDDISubscriptionListenerImpl.notifcationMap.clear();
+                        UDDISubscriptionListenerImpl.notificationCount = 0;
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckTModel.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        //Saving the Listener Service
+                        tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
+                        //Saving the Subscription
+                        tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_XML);
+                        //Changing the service we subscribed to "JoePublisherService"
+                        Thread.sleep(1000);
+                        logger.info("Deleting tModel ********** ");
+                        tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
+
+                        //waiting up to 100 seconds for the listener to notice the change.
+                        String test = "";
+                        for (int i = 0; i < 200; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
+                                        logger.info("Received Notification");
+                                        break;
+                                } else {
+                                        System.out.print(test);
+                                }
+                        }
+                        if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+                                Assert.fail("No Notification was sent");
+                        }
+                        if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">tModel One</name>")) {
+                                Assert.fail("Notification does not contain the correct service");
+                        }
+
+                } catch (Exception e) {
+                        logger.error("No exceptions please.");
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+                        tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_KEY);
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+                        tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+                        tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+                }
+        }
+
+        //@Test
+        public void joePublisherUpdateBusiness_SMTP_FIND_TMODEL() {
+                logger.info("joePublisherUpdateBusiness_SMTP_FIND_TMODEL");
+                removeAllExistingSubscriptions(authInfoJoe);
+                try {
+                        if (mailServer != null && !mailServer.isStopped()) {
+                                mailServer.stop();
+                        }
+                        mailServer = SimpleSmtpServer.start(smtpPort);
+
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckTModel.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        //Saving the Listener Service
+                        tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0);
+                        //Saving the Subscription
+                        tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_SMTP_XML);
+                        //Changing the service we subscribed to "JoePublisherService"
+                        Thread.sleep(1000);
+                        logger.info("Deleting tModel ********** ");
+                        tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
+
+
+                        for (int i = 0; i < 200; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (mailServer.getReceivedEmailSize() > 0) {
+                                        logger.info("Received Email Notification");
+                                        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");
+                        }
+
+                } catch (Exception e) {
+                        logger.error("No exceptions please.");
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+                        tckSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY);
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+                        tckTModel.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+                        tckTModel.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.  
+        //TODO  If no more results are pending, the value of the chunkToken MUST be "0".
 }

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,96 @@
+
+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 adminDelete_SubscriptionRequest complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminDelete_SubscriptionRequest">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="authInfo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="subscriptionKey" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminDelete_SubscriptionRequest", propOrder = {
+    "authInfo",
+    "subscriptionKey"
+})
+public class AdminDeleteSubscriptionRequest {
+
+    protected String authInfo;
+    @XmlElement(required = true)
+    protected List<String> subscriptionKey;
+
+    /**
+     * 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 subscriptionKey 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 subscriptionKey property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getSubscriptionKey().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getSubscriptionKey() {
+        if (subscriptionKey == null) {
+            subscriptionKey = new ArrayList<String>();
+        }
+        return this.subscriptionKey;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,32 @@
+
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for adminDelete_SubscriptionResponse complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminDelete_SubscriptionResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminDelete_SubscriptionResponse")
+public class AdminDeleteSubscriptionResponse {
+
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,94 @@
+
+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 adminSave_Business complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_Business">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="authInfo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="values" type="{urn:juddi-apache-org:api_v3}adminSave_BusinessWrapper" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_Business", propOrder = {
+    "authInfo",
+    "values"
+})
+public class AdminSaveBusiness {
+
+    protected String authInfo;
+    protected List<AdminSaveBusinessWrapper> values;
+
+    /**
+     * 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 values 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 values property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getValues().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AdminSaveBusinessWrapper }
+     * 
+     * 
+     */
+    public List<AdminSaveBusinessWrapper> getValues() {
+        if (values == null) {
+            values = new ArrayList<AdminSaveBusinessWrapper>();
+        }
+        return this.values;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,63 @@
+
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.uddi.api_v3.DispositionReport;
+
+
+/**
+ * <p>Java class for adminSave_BusinessResponse complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_BusinessResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="dispositionReport" type="{urn:uddi-org:api_v3}dispositionReport"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_BusinessResponse", propOrder = {
+    "dispositionReport"
+})
+public class AdminSaveBusinessResponse {
+
+    @XmlElement(required = true)
+    protected DispositionReport dispositionReport;
+
+    /**
+     * Gets the value of the dispositionReport property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DispositionReport }
+     *     
+     */
+    public DispositionReport getDispositionReport() {
+        return dispositionReport;
+    }
+
+    /**
+     * Sets the value of the dispositionReport property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DispositionReport }
+     *     
+     */
+    public void setDispositionReport(DispositionReport value) {
+        this.dispositionReport = value;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,97 @@
+
+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;
+import org.uddi.api_v3.BusinessEntity;
+
+
+/**
+ * <p>Java class for adminSave_BusinessWrapper complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_BusinessWrapper">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="publisherID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element ref="{urn:uddi-org:api_v3}businessEntity" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_BusinessWrapper", propOrder = {
+    "publisherID",
+    "businessEntity"
+})
+public class AdminSaveBusinessWrapper {
+
+    protected String publisherID;
+    @XmlElement(namespace = "urn:uddi-org:api_v3", required = true)
+    protected List<BusinessEntity> businessEntity;
+
+    /**
+     * Gets the value of the publisherID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPublisherID() {
+        return publisherID;
+    }
+
+    /**
+     * Sets the value of the publisherID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublisherID(String value) {
+        this.publisherID = value;
+    }
+
+    /**
+     * Gets the value of the businessEntity 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 businessEntity property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getBusinessEntity().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link BusinessEntity }
+     * 
+     * 
+     */
+    public List<BusinessEntity> getBusinessEntity() {
+        if (businessEntity == null) {
+            businessEntity = new ArrayList<BusinessEntity>();
+        }
+        return this.businessEntity;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,124 @@
+
+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;
+import org.uddi.sub_v3.Subscription;
+
+
+/**
+ * <p>Java class for adminSave_SubscriptionRequest complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_SubscriptionRequest">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="authInfo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="publisherOrUsername" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="subscriptions" type="{urn:uddi-org:sub_v3}subscription" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_SubscriptionRequest", propOrder = {
+    "authInfo",
+    "publisherOrUsername",
+    "subscriptions"
+})
+public class AdminSaveSubscriptionRequest {
+
+    protected String authInfo;
+    protected String publisherOrUsername;
+    @XmlElement(required = true)
+    protected List<Subscription> subscriptions;
+
+    /**
+     * 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 publisherOrUsername property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPublisherOrUsername() {
+        return publisherOrUsername;
+    }
+
+    /**
+     * Sets the value of the publisherOrUsername property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublisherOrUsername(String value) {
+        this.publisherOrUsername = value;
+    }
+
+    /**
+     * Gets the value of the subscriptions 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 subscriptions property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getSubscriptions().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Subscription }
+     * 
+     * 
+     */
+    public List<Subscription> getSubscriptions() {
+        if (subscriptions == null) {
+            subscriptions = new ArrayList<Subscription>();
+        }
+        return this.subscriptions;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,32 @@
+
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for adminSave_SubscriptionResponse complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_SubscriptionResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_SubscriptionResponse")
+public class AdminSaveSubscriptionResponse {
+
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,94 @@
+
+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 adminSave_tModel complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_tModel">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="authInfo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="values" type="{urn:juddi-apache-org:api_v3}adminSave_tModelWrapper" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_tModel", propOrder = {
+    "authInfo",
+    "values"
+})
+public class AdminSaveTModel {
+
+    protected String authInfo;
+    protected List<AdminSaveTModelWrapper> values;
+
+    /**
+     * 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 values 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 values property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getValues().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AdminSaveTModelWrapper }
+     * 
+     * 
+     */
+    public List<AdminSaveTModelWrapper> getValues() {
+        if (values == null) {
+            values = new ArrayList<AdminSaveTModelWrapper>();
+        }
+        return this.values;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,63 @@
+
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.uddi.api_v3.DispositionReport;
+
+
+/**
+ * <p>Java class for adminSave_tModelResponse complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_tModelResponse">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="dispositionReport" type="{urn:uddi-org:api_v3}dispositionReport"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_tModelResponse", propOrder = {
+    "dispositionReport"
+})
+public class AdminSaveTModelResponse {
+
+    @XmlElement(required = true)
+    protected DispositionReport dispositionReport;
+
+    /**
+     * Gets the value of the dispositionReport property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DispositionReport }
+     *     
+     */
+    public DispositionReport getDispositionReport() {
+        return dispositionReport;
+    }
+
+    /**
+     * Sets the value of the dispositionReport property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DispositionReport }
+     *     
+     */
+    public void setDispositionReport(DispositionReport value) {
+        this.dispositionReport = value;
+    }
+
+}

Added: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelWrapper.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelWrapper.java?rev=1546875&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelWrapper.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelWrapper.java Mon Dec  2 00:51:47 2013
@@ -0,0 +1,97 @@
+
+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;
+import org.uddi.api_v3.TModel;
+
+
+/**
+ * <p>Java class for adminSave_tModelWrapper complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="adminSave_tModelWrapper">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="publisherID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="tModel" type="{urn:uddi-org:api_v3}tModel" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "adminSave_tModelWrapper", propOrder = {
+    "publisherID",
+    "tModel"
+})
+public class AdminSaveTModelWrapper {
+
+    protected String publisherID;
+    @XmlElement(nillable = true)
+    protected List<TModel> tModel;
+
+    /**
+     * Gets the value of the publisherID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPublisherID() {
+        return publisherID;
+    }
+
+    /**
+     * Sets the value of the publisherID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublisherID(String value) {
+        this.publisherID = value;
+    }
+
+    /**
+     * Gets the value of the tModel 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 tModel property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTModel().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TModel }
+     * 
+     * 
+     */
+    public List<TModel> getTModel() {
+        if (tModel == null) {
+            tModel = new ArrayList<TModel>();
+        }
+        return this.tModel;
+    }
+
+}

Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java?rev=1546875&r1=1546874&r2=1546875&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Clerk.java Mon Dec  2 00:51:47 2013
@@ -1,81 +1,141 @@
-/*
- * 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 {
-
-	@XmlTransient
-	private static final long serialVersionUID = 2723174126266580550L;
-	
-	protected String name;
-	protected Node node;
-	protected String publisher;
-	protected String password;
-	
-	public Clerk() {
-		super();
-	}
-
-	
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	
-	public Node getNode() {
-		return node;
-	}
-
-	public void setNode(Node node) {
-		this.node = node;
-	}
-
-	public String getPublisher() {
-		return publisher;
-	}
-
-	public void setPublisher(String publisher) {
-		this.publisher = publisher;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	
-}
+
+package org.apache.juddi.api_v3;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for clerk complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="clerk">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="node" type="{urn:juddi-apache-org:api_v3}node" minOccurs="0"/>
+ *         &lt;element name="publisher" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="password" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "clerk", propOrder = {
+    "name",
+    "node",
+    "publisher",
+    "password"
+})
+public class Clerk {
+
+    protected String name;
+    protected Node node;
+    protected String publisher;
+    protected String password;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the node property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Node }
+     *     
+     */
+    public Node getNode() {
+        return node;
+    }
+
+    /**
+     * Sets the value of the node property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Node }
+     *     
+     */
+    public void setNode(Node value) {
+        this.node = value;
+    }
+
+    /**
+     * Gets the value of the publisher property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPublisher() {
+        return publisher;
+    }
+
+    /**
+     * Sets the value of the publisher property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublisher(String value) {
+        this.publisher = value;
+    }
+
+    /**
+     * Gets the value of the password property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPassword(String value) {
+        this.password = value;
+    }
+
+}



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