juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1550992 [4/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
Modified: juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java Sun Dec 15 02:10:24 2013
@@ -10,45 +10,57 @@ import org.junit.runner.Result;
 public class App {
 
         public static void main(String[] args) {
-                System.out.println("Hello World!");
+                System.out.println("Running! this can take anywhere from 5-15 minutes!");
 
                 JUnitCore junit = new JUnitCore();
                 Result result = junit.run(org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
-                        org.apache.juddi.v3.bpel.BPEL_020_IntegrationTest.class,
+                        
+                        
+                        //the bpel tests really only test wsdl to uddi
+                        // org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
+                       // org.apache.juddi.v3.bpel.BPEL_020_IntegrationTest.class,
+                        
+                        //this test is useless and was removed
+                        
+                       // org.apache.juddi.v3.tck.UDDI_001_UDDIServiceTest.class,
                         org.apache.juddi.v3.tck.JUDDI_010_PublisherIntegrationTest.class,
-                        org.apache.juddi.v3.tck.UDDI_160_RESTIntergrationTest.class,
-                        org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
-                        org.apache.juddi.v3.tck.JUDDI_100_ClientSubscriptionInfoTest.class,
-                        org.apache.juddi.v3.tck.UDDI_001_UDDIServiceTest.class,
                         org.apache.juddi.v3.tck.UDDI_010_PublisherIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_020_TmodelIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_030_BusinessEntityIntegrationTest.class,
-                        org.apache.juddi.v3.tck.UDDI_030_BusinessEntityLoadTest.class,
+                        //org.apache.juddi.v3.tck.UDDI_030_BusinessEntityLoadTest.class,
                         org.apache.juddi.v3.tck.UDDI_040_BusinessServiceIntegrationTest.class,
-                        org.apache.juddi.v3.tck.UDDI_040_BusinessServiceLoadTest.class,
+                        //org.apache.juddi.v3.tck.UDDI_040_BusinessServiceLoadTest.class,
                         org.apache.juddi.v3.tck.UDDI_050_BindingTemplateIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_060_PublisherAssertionIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_070_FindEntityIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_080_SubscriptionIntegrationTest.class,
-                        org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerIntegrationTest.class,
+                        //note that this is different, there is an IntegrationTest version
+                        //however it's for hosting our own mail server and reconfiguring juddi
+                        org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
+                        org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
+                        org.apache.juddi.v3.tck.JUDDI_100_ClientSubscriptionInfoIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_110_FindBusinessIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_140_NegativePublicationIntegrationTest.class,
                         org.apache.juddi.v3.tck.UDDI_141_JIRAIntegrationTest.class,
-                        org.apache.juddi.v3.tck.UDDI_150_CustodyTransferIntegrationTest.class);
+                        org.apache.juddi.v3.tck.UDDI_150_CustodyTransferIntegrationTest.class,
+                        org.apache.juddi.v3.tck.UDDI_160_RESTIntergrationTest.class,
+                        org.apache.juddi.v3.tck.UDDI_170_ValueSetValidation.class);
 
                 System.out.println("Summary");
                 System.out.println("Failed Test Cases: " + result.getFailureCount());
                 System.out.println("Skipped Test Cases: " + result.getIgnoreCount());
                 System.out.println("Ran Test Cases: " + result.getRunCount());
                 System.out.println("Time: " + result.getRunTime());
-                for (int i=0; i < result.getFailures().size(); i++){
+                for (int i = 0; i < result.getFailures().size(); i++) {
                         System.out.println("-------------------------------------");
                         System.out.println(result.getFailures().get(i).getTestHeader());
                         System.out.println(result.getFailures().get(i).getDescription().getClassName());
                         System.out.println(result.getFailures().get(i).getDescription().getMethodName());
                         System.out.println(result.getFailures().get(i).getMessage());
-                        }
+                }
+                junit = null;
+                System.exit(0);
         }
 }

Modified: juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties (original)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties Sun Dec 15 02:10:24 2013
@@ -37,3 +37,15 @@ transfer.enabled=true
 replication.enabled=true
 
 
+# if the UDDI server supports SMTP based notification
+smtp.notify.enabled=true
+
+#if true, use these settings to verify message delivery/notification
+mail.host=localhost
+mail.port=110
+#this can be TLS
+#mail.secureProtocol=TLS
+#mail.implicit=false
+mail.username=juddi@local.domain
+mail.password=da_password1
+mail.to=juddi@local.domain
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/admin/admin.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/admin/admin.jsp?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/admin/admin.jsp (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/admin/admin.jsp Sun Dec 15 02:10:24 2013
@@ -8,8 +8,8 @@
 <%@page import="org.apache.juddi.api_v3.Publisher"%>
 <%@page import="org.apache.juddi.api_v3.SavePublisher"%>
 <%@page import="org.apache.juddi.api_v3.Clerk"%>
-<%@page import="org.apache.juddi.api_v3.SaveClerk"%>
-<%@page import="org.apache.juddi.api_v3.SyncSubscription"%>
+
+
 <%@page import="org.apache.juddi.api_v3.GetPublisherDetail"%>
 <%@page import="org.apache.juddi.api_v3.GetAllPublisherDetail"%>
 <%@page import="org.apache.juddi.api_v3.DeletePublisher"%>

Modified: juddi/branches/juddi-3.3.x/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/pom.xml?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/pom.xml (original)
+++ juddi/branches/juddi-3.3.x/pom.xml Sun Dec 15 02:10:24 2013
@@ -294,7 +294,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.5</version>
+			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/pom.xml?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/pom.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/pom.xml Sun Dec 15 02:10:24 2013
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.5</version>
+			<version>4.11</version>
 		</dependency>
                 <dependency>
                         <groupId>xmlunit</groupId>

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java Sun Dec 15 02:10:24 2013
@@ -19,18 +19,17 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class TckPublisher {
 
         private static Properties tckProperties = new Properties();
         public final static String JOE_PUBLISHER_XML = "uddi_data/joepublisher/publisher.xml";
-        public final static String TMODEL_PUBLISHER_XML = "uddi_data/tmodels/publisher.xml";
+        //public final static String TMODEL_PUBLISHER_XML = "uddi_data/tmodels/publisher.xml";
         public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml";
         public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml";
 
@@ -113,7 +112,7 @@ public class TckPublisher {
                 return tckProperties.getProperty(Property.RIFTSAW_PASSWORD);
         }
 
-        static boolean isUDDIAuthMode() {
+        public static boolean isUDDIAuthMode() {
                 String x = tckProperties.getProperty("auth_mode");
                 if (x != null && x.equalsIgnoreCase("uddi")) {
                         return true;
@@ -121,7 +120,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isReplicationEnabled() {
+        public static boolean isReplicationEnabled() {
                 String x = tckProperties.getProperty("replication.enabled");
                 if (x != null && x.equalsIgnoreCase("true")) {
                         return true;
@@ -129,7 +128,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isInquiryRestEnabled() {
+        public static boolean isInquiryRestEnabled() {
                 String x = tckProperties.getProperty("rest.enabled");
                 if (x != null && x.equalsIgnoreCase("true")) {
                         return true;
@@ -137,7 +136,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isValueSetAPIEnabled() {
+        public static boolean isValueSetAPIEnabled() {
                 String x = tckProperties.getProperty("vsv.enabled");
                 if (x != null && x.equalsIgnoreCase("true")) {
                         return true;
@@ -145,7 +144,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isSubscriptionEnabled() {
+        public static boolean isSubscriptionEnabled() {
                 String x = tckProperties.getProperty("sub.enabled");
                 if (x != null && x.equalsIgnoreCase("true")) {
                         return true;
@@ -153,7 +152,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isCustodyTransferEnabled() {
+        public static boolean isCustodyTransferEnabled() {
                 String x = tckProperties.getProperty("transfer.enabled");
                 if (x != null && x.equalsIgnoreCase("true")) {
                         return true;
@@ -161,7 +160,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isJUDDI() {
+        public static boolean isJUDDI() {
                 String x = tckProperties.getProperty("isJuddi");
                 if (x.equalsIgnoreCase("true")) {
                         return true;
@@ -169,7 +168,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static boolean isRMI() {
+        public static boolean isRMI() {
                 String x = tckProperties.getProperty("rmi.enabled");
                 if (x.equalsIgnoreCase("true")) {
                         return true;
@@ -177,7 +176,7 @@ public class TckPublisher {
                 return false;
         }
 
-        static int getMaxLoadServices() {
+        public static int getMaxLoadServices() {
                 String x = tckProperties.getProperty("loadtest.maxbusinesses");
                 if (x != null) {
                         try {
@@ -189,4 +188,8 @@ public class TckPublisher {
 
                 return 1100;
         }
+        
+        public static Properties getProperties(){
+                return tckProperties;
+        }
 }
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java Sun Dec 15 02:10:24 2013
@@ -38,7 +38,7 @@ public class TckSecurity {
 		return token.getAuthInfo();
 	}
 
-        static void setCredentials(BindingProvider bindingProvider, String rootPublisherId, String rootPassword) {
+        public static void setCredentials(BindingProvider bindingProvider, String rootPublisherId, String rootPassword) {
                 bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, rootPublisherId);
                 bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, rootPassword);
         }

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java Sun Dec 15 02:10:24 2013
@@ -29,31 +29,31 @@ import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.DeleteBinding;
 import org.uddi.api_v3.SaveBinding;
 import org.uddi.api_v3.SaveService;
+import org.uddi.api_v3.ServiceDetail;
 import org.uddi.sub_v3.DeleteSubscription;
 import org.uddi.sub_v3.Subscription;
 import org.uddi.v3_service.UDDIPublicationPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
 
-
 /**
  * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
  */
-public class TckSubscriptionListener
-{
-	public static String LISTENER_HTTP_SERVICE_XML    = "uddi_data/subscriptionnotifier/listenerService.xml";
-	public static String LISTENER_SMTP_SERVICE_XML    = "uddi_data/subscriptionnotifier/listenerServiceSMTP.xml";
-	public static String LISTENER_RMI_SERVICE_XML     = "uddi_data/subscriptionnotifier/listenerServiceRMI.xml";
-        public static String LISTENER_SERVICE_KEY         = "uddi:uddi.joepublisher.com:listenerone";
-
-	
-       /**
-        * find service http
-        * note that the subscription1.xml contains the binding template for the UDDI server to call back into
-        */
-	public static String SUBSCRIPTION_XML = "uddi_data/subscriptionnotifier/subscription1.xml";
+public class TckSubscriptionListener {
+
+        public static String LISTENER_HTTP_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerService.xml";
+        public static String LISTENER_SMTP_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerServiceSMTP.xml";
+        public static String LISTENER_SMTP_SERVICE_EXTERNAL_XML = "uddi_data/subscriptionnotifier/listenerServiceSMTP-external.xml";
+        public static String LISTENER_RMI_SERVICE_XML = "uddi_data/subscriptionnotifier/listenerServiceRMI.xml";
+        public static String LISTENER_SERVICE_KEY = "uddi:uddi.joepublisher.com:listenerone";
         /**
-         * find business http
-         * note that the subscription1.xml contains the binding template for the UDDI server to call back into
+         * find service http note that the subscription1.xml contains the
+         * binding template for the UDDI server to call back into
+         * "uddi_data/subscriptionnotifier/subscription1.xml"
+         */
+        public static String SUBSCRIPTION_XML = "uddi_data/subscriptionnotifier/subscription1.xml";
+        /**
+         * find business http note that the subscription1.xml contains the
+         * binding template for the UDDI server to call back into
          */
         public static String SUBSCRIPTION2_XML = "uddi_data/subscriptionnotifier/subscription2.xml";
         /**
@@ -62,145 +62,157 @@ public class TckSubscriptionListener
         public static String SUBSCRIPTION2_SMTP_XML = "uddi_data/subscriptionnotifier/subscription2SMTP.xml";
         /**
          * find service smtp
+         * "uddi_data/subscriptionnotifier/subscription1SMTP.xml"
          */
-	public static String SUBSCRIPTION_SMTP_XML = "uddi_data/subscriptionnotifier/subscription1SMTP.xml";
-        
+        public static String SUBSCRIPTION_SMTP_XML = "uddi_data/subscriptionnotifier/subscription1SMTP.xml";
         /**
-         * find tmodel http
-         * note that the subscription1.xml contains the binding template for the UDDI server to call back into
+         * find tmodel http note that the subscription1.xml contains the binding
+         * template for the UDDI server to call back into
          */
         public static String SUBSCRIPTION3_XML = "uddi_data/subscriptionnotifier/subscription3.xml";
         /**
          * find tmodel smtp
          */
         public static String SUBSCRIPTION3_SMTP_XML = "uddi_data/subscriptionnotifier/subscription3SMTP.xml";
-        
-        
-        
         public static String SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone";
         public static String SUBSCRIPTION_SMTP_KEY = "uddi:uddi.joepublisher.com:subscriptiononesmtp";
-
         private Log logger = LogFactory.getLog(this.getClass());
         private UDDIPublicationPortType publication = null;
         private UDDISubscriptionPortType subscription = null;
         private SaveService ss = null;
 
-	public TckSubscriptionListener(
-			UDDISubscriptionPortType subscription,
-			UDDIPublicationPortType publication) {
-		super();
-		this.subscription = subscription;
-		this.publication = publication;
-	}
-	
-	public void saveNotifierBinding(String authInfo, String bindingXML, String bindingKey, Integer port) {
-		try {
-			SaveBinding sb = new SaveBinding();
-			sb.setAuthInfo(authInfo);
-			BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(bindingXML, "org.uddi.api_v3");
-			String value = btIn.getAccessPoint().getValue();
-			value = value.replace("{randomPort}", port.toString());
-			sb.getBindingTemplate().add(btIn);
-			publication.saveBinding(sb);		
-		}
-		catch(Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown: " + e.getMessage());
-		}
-	}
-	
-	public void deleteBinding(String authInfo, String bindingKey) {
-		try {
-			// Delete the entity and make sure it is removed
-			DeleteBinding db = new DeleteBinding();
-			db.setAuthInfo(authInfo);
-			
-			db.getBindingKey().add(bindingKey);
-			publication.deleteBinding(db);
-		}
-		catch(Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown.");
-		}
-		
-	}
-	
-	public void saveService(String authInfo, String listenerService, Integer port, String hostname) {
-		try {
-			// First save the entity
-			ss = new SaveService();
-			ss.setAuthInfo(authInfo);
-			
-			org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(listenerService, "org.uddi.api_v3");
-			if (port > 0) {
-				for (BindingTemplate btIn: bsIn.getBindingTemplates().getBindingTemplate()) {
-					String value = btIn.getAccessPoint().getValue();
-					value = value.replace("{randomPort}", port.toString());
+        public TckSubscriptionListener(
+                UDDISubscriptionPortType subscription,
+                UDDIPublicationPortType publication) {
+                super();
+                this.subscription = subscription;
+                this.publication = publication;
+        }
+
+        public void saveNotifierBinding(String authInfo, String bindingXML, String bindingKey, Integer port) {
+                try {
+                        SaveBinding sb = new SaveBinding();
+                        sb.setAuthInfo(authInfo);
+                        BindingTemplate btIn = (BindingTemplate) EntityCreator.buildFromDoc(bindingXML, "org.uddi.api_v3");
+                        String value = btIn.getAccessPoint().getValue();
+                        value = value.replace("{randomPort}", port.toString());
+                        sb.getBindingTemplate().add(btIn);
+                        publication.saveBinding(sb);
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown: " + e.getMessage());
+                }
+        }
+
+        public void deleteBinding(String authInfo, String bindingKey) {
+                try {
+                        // Delete the entity and make sure it is removed
+                        DeleteBinding db = new DeleteBinding();
+                        db.setAuthInfo(authInfo);
+
+                        db.getBindingKey().add(bindingKey);
+                        publication.deleteBinding(db);
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown.");
+                }
+
+        }
+
+        public void saveService(String authInfo, String listenerService, Integer port, String hostname) {
+                try {
+                        // First save the entity
+                        ss = new SaveService();
+                        ss.setAuthInfo(authInfo);
+
+                        org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService) EntityCreator.buildFromDoc(listenerService, "org.uddi.api_v3");
+                       // if (port > 0) {
+                                for (BindingTemplate btIn : bsIn.getBindingTemplates().getBindingTemplate()) {
+                                        String value = btIn.getAccessPoint().getValue();
+                                        value = value.replace("{randomPort}", port.toString());
                                         value = value.replace("{hostname}", hostname);
-					btIn.getAccessPoint().setValue(value);
-				}
-			}
-			ss.getBusinessService().add(bsIn);
-			publication.saveService(ss);
-			
-		}
-		catch(Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown.");
-		}
-	}
-
-	public void saveNotifierSubscription(String authInfo, String subscriptionXML) {
-		saveSubscription(authInfo, subscriptionXML, SUBSCRIPTION_KEY);
-	}
-	
-	public void deleteNotifierSubscription(String authInfo, String subscriptionKey) {
-		deleteSubscription(authInfo, subscriptionKey);
-	}
-	
-	public void saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey) {
-		try {
-			Subscription subIn = (Subscription)EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
-			List<Subscription> subscriptionList = new ArrayList<Subscription>();
-			subscriptionList.add(subIn);
-			Holder<List<Subscription>> subscriptionHolder = new Holder<List<Subscription>>();
-			subscriptionHolder.value = subscriptionList;
-			
-			subscription.saveSubscription(authInfo, subscriptionHolder);
-			
-			Subscription subDirectOut = subscriptionHolder.value.get(0);
-			assertEquals(subIn.getSubscriptionKey(), subDirectOut.getSubscriptionKey());
-			
-			List<Subscription> outSubscriptionList = subscription.getSubscriptions(authInfo);
-			Assert.assertNotNull(outSubscriptionList);
-			Subscription subOut = outSubscriptionList.get(0);
-			
-			//assertEquals(subIn.getSubscriptionKey(), subOut.getSubscriptionKey());
-			assertEquals(subDirectOut.getExpiresAfter().getMonth(), subOut.getExpiresAfter().getMonth());
-			assertEquals(subDirectOut.getExpiresAfter().getDay(), subOut.getExpiresAfter().getDay());
-			assertEquals(subDirectOut.getExpiresAfter().getYear(), subOut.getExpiresAfter().getYear());
-			
-			//assertEquals(subIn.getSubscriptionFilter().getFindService().getName().get(0).getValue(), 
-			//			 subOut.getSubscriptionFilter().getFindService().getName().get(0).getValue());
-			
-		} catch (Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown");		
-		}	
-	}
-	
-	public void deleteSubscription(String authInfo, String subscriptionKey) {
-		try {
-			// Delete the entity and make sure it is removed
-			DeleteSubscription ds = new DeleteSubscription();
-			ds.setAuthInfo(authInfo);
-			
-			ds.getSubscriptionKey().add(subscriptionKey);
-			subscription.deleteSubscription(ds);
-		}
-		catch(Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown.");
-		}
-	}	
+                                        btIn.getAccessPoint().setValue(value);
+                                        logger.info("service " + bsIn.getServiceKey() + " access point " + btIn.getAccessPoint().getValue() + " key:" + btIn.getBindingKey());
+                                }
+                        //}
+                        ss.getBusinessService().add(bsIn);
+                        ServiceDetail bsOut = publication.saveService(ss);
+                        Assert.assertNotNull(bsOut);
+                        Assert.assertEquals(bsOut.getBusinessService().get(0).getBusinessKey(), bsIn.getBusinessKey());
+                        if (bsIn.getBindingTemplates() != null) {
+                                Assert.assertNotNull(bsOut.getBusinessService().get(0).getBindingTemplates());
+                                Assert.assertEquals(bsOut.getBusinessService().get(0).getBindingTemplates().getBindingTemplate().size(), bsIn.getBindingTemplates().getBindingTemplate().size());
+                                for (int i=0; i < bsIn.getBindingTemplates().getBindingTemplate().size(); i++) {
+                                        Assert.assertEquals(bsIn.getBindingTemplates().getBindingTemplate().get(i).getAccessPoint().getValue(), 
+                                                bsOut.getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(i).getAccessPoint().getValue());
+                                        
+                                }
+                        }
+                        Assert.assertEquals(bsOut.getBusinessService().get(0).getServiceKey(), bsIn.getServiceKey());
+                        logger.info("service " + bsIn.getServiceKey() + " saved");
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown.");
+                }
+        }
+
+        public void saveNotifierSubscription(String authInfo, String subscriptionXML) {
+                saveSubscription(authInfo, subscriptionXML, SUBSCRIPTION_KEY);
+        }
+
+        public void deleteNotifierSubscription(String authInfo, String subscriptionKey) {
+                deleteSubscription(authInfo, subscriptionKey);
+        }
+
+        public void saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey) {
+                saveSubscription(authInfo, subscriptionXML, subscriptionKey, null);
+        }
+
+        public void saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey, String bindingkey) {
+                try {
+                        Subscription subIn = (Subscription) EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
+                        List<Subscription> subscriptionList = new ArrayList<Subscription>();
+                        subscriptionList.add(subIn);
+                        Holder<List<Subscription>> subscriptionHolder = new Holder<List<Subscription>>();
+                        subscriptionHolder.value = subscriptionList;
+
+                        subscription.saveSubscription(authInfo, subscriptionHolder);
+
+                        Subscription subDirectOut = subscriptionHolder.value.get(0);
+                        assertEquals(subIn.getSubscriptionKey(), subDirectOut.getSubscriptionKey());
+
+                        List<Subscription> outSubscriptionList = subscription.getSubscriptions(authInfo);
+                        Assert.assertNotNull(outSubscriptionList);
+                        Subscription subOut = outSubscriptionList.get(0);
+
+
+                        //TODO this is invalid
+
+                        assertEquals(subDirectOut.getExpiresAfter().getMonth(), subOut.getExpiresAfter().getMonth());
+                        assertEquals(subDirectOut.getExpiresAfter().getDay(), subOut.getExpiresAfter().getDay());
+                        assertEquals(subDirectOut.getExpiresAfter().getYear(), subOut.getExpiresAfter().getYear());
+
+                        //assertEquals(subIn.getSubscriptionFilter().getFindService().getName().get(0).getValue(), 
+                        //			 subOut.getSubscriptionFilter().getFindService().getName().get(0).getValue());
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+
+        public void deleteSubscription(String authInfo, String subscriptionKey) {
+                try {
+                        // Delete the entity and make sure it is removed
+                        DeleteSubscription ds = new DeleteSubscription();
+                        ds.setAuthInfo(authInfo);
+
+                        ds.getSubscriptionKey().add(subscriptionKey);
+                        subscription.deleteSubscription(ds);
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown.");
+                }
+        }
 }
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties Sun Dec 15 02:10:24 2013
@@ -1,6 +1,6 @@
 #some user with administrative rights
 root.publisher = root
-root.password  = 
+root.password  = root
 
 #the rest of these are regular users with basic CRUD permissions
 uddi.publisher = uddi
@@ -37,5 +37,16 @@ transfer.enabled=true
 replication.enabled=true
 
 
-#for load testing, this is the max number of businesses and services to create
-loadtest.maxbusinesses=1100
\ No newline at end of file
+# if the UDDI server supports SMTP based notification
+smtp.notify.enabled=true
+
+#if true, use these settings to verify message delivery/notification
+mail.host=localhost
+mail.port=110
+mail.socketFactory
+#this can be TLS
+#mail.secureProtocol=TLS
+#mail.implicit=false
+mail.username=username
+mail.password=pass
+mail.to=username@domain.com
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisher.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisher.xml?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisher.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisher.xml Sun Dec 15 02:10:24 2013
@@ -20,8 +20,8 @@
   <emailAddress>jpublisher@business.com</emailAddress>
   <isAdmin>true</isAdmin>
   <isEnabled>True</isEnabled>
-  <maxBindingsPerService>199</maxBindingsPerService>
-  <maxBusinesses>100</maxBusinesses>
-  <maxServicePerBusiness>100</maxServicePerBusiness>
-  <maxTModels>100</maxTModels>
+  <maxBindingsPerService>1500</maxBindingsPerService>
+  <maxBusinesses>1500</maxBusinesses>
+  <maxServicePerBusiness>1500</maxServicePerBusiness>
+  <maxTModels>1500</maxTModels>
 </publisher>

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisher.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisher.xml?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisher.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisher.xml Sun Dec 15 02:10:24 2013
@@ -21,7 +21,7 @@
   <isAdmin>false</isAdmin>
   <isEnabled>True</isEnabled>
   <maxBindingsPerService>199</maxBindingsPerService>
-  <maxBusinesses>100</maxBusinesses>
-  <maxServicePerBusiness>100</maxServicePerBusiness>
-  <maxTModels>100</maxTModels>
+  <maxBusinesses>1500</maxBusinesses>
+  <maxServicePerBusiness>1500</maxServicePerBusiness>
+  <maxTModels>1500</maxTModels>
 </publisher>

Added: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP-external.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP-external.xml?rev=1550992&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP-external.xml (added)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP-external.xml Sun Dec 15 02:10:24 2013
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+ *
+ */ -->
+<businessService xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace"
+     businessKey="uddi:uddi.joepublisher.com:businessone" serviceKey="uddi:uddi.joepublisher.com:listeneronesmtp">
+  <name xml:lang="en">Listener Two SMTP</name>
+  <name xml:lang="es">Listener Dos SMTP </name>
+  <description xml:lang="en">This is the description of listener two SMTP.</description>
+  <description xml:lang="es">Ésta es la descripción del listener dos SMTP.</description>
+  <bindingTemplates>
+	<bindingTemplate xmlns="urn:uddi-org:api_v3" bindingKey="uddi:uddi.joepublisher.com:bindinglistenersmtp">
+	  <description xml:lang="en">This is the endpoint for the SMTP subscription listener</description>
+	  <accessPoint useType="endpoint">mailto:{hostname}</accessPoint>
+	  <!-- this is replaced at save time -->
+      <tModelInstanceDetails>
+	    <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:smtp"/>
+	  </tModelInstanceDetails>
+	  <!--<categoryBag>
+	    <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+	  </categoryBag>-->
+	</bindingTemplate>
+  </bindingTemplates>
+  <!--<categoryBag>
+    <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
+    <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
+    <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
+      <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+    </keyedReferenceGroup>
+  </categoryBag>-->
+</businessService>

Modified: juddi/branches/juddi-3.3.x/uddi-tck/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/pom.xml?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/pom.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/pom.xml Sun Dec 15 02:10:24 2013
@@ -87,6 +87,13 @@
 			<artifactId>dumbster</artifactId>
 			<version>1.5</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+			<version>3.3</version>
+		</dependency>
+					
 	</dependencies>
 	<build>
 		<plugins>

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -14,6 +14,7 @@
  */
 package org.apache.juddi.v3.bpel;
 
+import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -38,89 +39,96 @@ import org.uddi.v3_service.UDDISecurityP
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  */
 public class BPEL_010_IntegrationTest {
-	
-	private static TckTModel tckTModel           = null;
-	private static TckBusinessService tckService = null;
-	private static TckBusiness tckBusiness       = null;
-	private static Log logger = LogFactory.getLog(BPEL_010_IntegrationTest.class);
-	
-	private static String authInfoRiftSaw        = null;
-	
-	private static UDDIClient manager;
-	
-	
-	@BeforeClass
-	public static void startManager() throws ConfigurationException {
-		
-		manager  = new UDDIClient();
-		manager.start();
-		logger.debug("Getting auth token for user riftsaw/riftsaw..");
-		try {
-			 Transport transport = manager.getTransport();
-	        	 
-        	 UDDISecurityPortType security = transport.getUDDISecurityService();
-        	 authInfoRiftSaw = TckSecurity.getAuthToken(security, 
-        			 TckPublisher.getRiftSawPublisherId(),  TckPublisher.getRiftSawPassword());
-        	 Assert.assertNotNull(authInfoRiftSaw);
-        	
-        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
-        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-        	 tckTModel  = new TckTModel(publication, inquiry);
-        	 tckService = new TckBusinessService(publication, inquiry);
-        	 tckBusiness= new TckBusiness(publication, inquiry);
-        	
-	     } catch (Exception e) {
-	    	 logger.error(e.getMessage(), e);
-				Assert.fail("Could not obtain authInfo token.");
-	     } 
-	}
-	
-	@Before //jUDDI only
-	public void saveRiftSawKeyGenerator() {
-		tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PUBLISHER_TMODEL_XML, TckTModel.RIFTSAW_PUBLISHER_TMODEL_KEY);
-		tckBusiness.saveBusiness(authInfoRiftSaw, TckBusiness.RIFTSAW_BUSINESS_XML, TckBusiness.RIFTSAW_BUSINESS_KEY);
-	}
-	
-	@After //jUDDI only
-	public void deleteRiftSawKeyGenerator() {
-		tckBusiness.deleteBusiness(authInfoRiftSaw, TckBusiness.RIFTSAW_BUSINESS_XML, TckBusiness.RIFTSAW_BUSINESS_KEY);
-		tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PUBLISHER_TMODEL_XML, TckTModel.RIFTSAW_PUBLISHER_TMODEL_KEY);
-	}
-	
-	@AfterClass
-	public static void stopManager() throws ConfigurationException {
-		manager.stop();
-	}
-	
-	@Test //You need to have the RiftSaw keyGenerator tModel in your registry.
-	public void registerWSDLPortTypeTModels() {
-		
-		//Agent
-		tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY);
-		//Customer
-		tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_KEY);
-	}
-	
-	@Test //You need to have the RiftSaw keyGenerator tModel in your registry.
-	public void registerBPEL4WSTModel() {
-		
-		//Process
-		tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PROCESS_TMODEL_XML, TckTModel.RIFTSAW_PROCESS_TMODEL_KEY);
-		
-	}
-	
-	@Test //You need to have the RiftSaw keyGenerator tModel in your registry.
-	public void registerBPELService() {
-		
-		//Service
-		tckService.saveService(authInfoRiftSaw, TckBusinessService.RIFTSAW_PROCESS_XML, TckBusinessService.RIFTSAW_PROCESS_KEY);
-		
-	}
-	
-	
-	
-	
-	
-	
-	
+
+        private static TckTModel tckTModel = null;
+        private static TckBusinessService tckService = null;
+        private static TckBusiness tckBusiness = null;
+        private static Log logger = LogFactory.getLog(BPEL_010_IntegrationTest.class);
+        private static String authInfoRiftSaw = null;
+        private static UDDIClient manager;
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
+
+                manager = new UDDIClient();
+                manager.start();
+                logger.debug("Getting auth token for user riftsaw/riftsaw..");
+                try {
+                        Transport transport = manager.getTransport();
+
+                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        authInfoRiftSaw = TckSecurity.getAuthToken(security, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword());
+                        //Assert.assertNotNull(authInfoRiftSaw);
+
+                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
+                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword());
+                        }
+
+                        tckTModel = new TckTModel(publication, inquiry);
+                        tckService = new TckBusinessService(publication, inquiry);
+                        tckBusiness = new TckBusiness(publication, inquiry);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+                 tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PUBLISHER_TMODEL_XML, TckTModel.RIFTSAW_PUBLISHER_TMODEL_KEY);
+                tckBusiness.saveBusiness(authInfoRiftSaw, TckBusiness.RIFTSAW_BUSINESS_XML, TckBusiness.RIFTSAW_BUSINESS_KEY);
+        }
+
+        @Before //jUDDI only
+        public void saveRiftSawKeyGenerator() {
+               
+        }
+
+        @After //jUDDI only
+        public void deleteRiftSawKeyGenerator() {
+                
+        }
+
+        @AfterClass
+        public static void stopManager() throws ConfigurationException {
+                tckBusiness.deleteBusiness(authInfoRiftSaw, TckBusiness.RIFTSAW_BUSINESS_XML, TckBusiness.RIFTSAW_BUSINESS_KEY);
+                tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PUBLISHER_TMODEL_XML, TckTModel.RIFTSAW_PUBLISHER_TMODEL_KEY);
+                manager.stop();
+        }
+
+        @Test //You need to have the RiftSaw keyGenerator tModel in your registry.
+        public void registerWSDLPortTypeTModels() {
+
+                //Agent
+                tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY);
+                //Customer
+                tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_KEY);
+                
+                tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_KEY);
+                tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY);
+        }
+
+        @Test //You need to have the RiftSaw keyGenerator tModel in your registry.
+        public void registerBPEL4WSTModel() {
+
+                //Process
+                tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PROCESS_TMODEL_XML, TckTModel.RIFTSAW_PROCESS_TMODEL_KEY);
+                tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PROCESS_TMODEL_XML, TckTModel.RIFTSAW_PROCESS_TMODEL_KEY);
+
+        }
+
+        @Test //You need to have the RiftSaw keyGenerator tModel in your registry.
+        public void registerBPELService() {
+//Agent
+                tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY);
+                //Customer
+                tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_KEY);
+                
+                //Service
+                tckService.saveService(authInfoRiftSaw, TckBusinessService.RIFTSAW_PROCESS_XML, TckBusinessService.RIFTSAW_PROCESS_KEY);
+                tckService.deleteService(authInfoRiftSaw, TckBusinessService.RIFTSAW_PROCESS_KEY);
+tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_CUST_PORTTYPE_TMODEL_KEY);
+                tckTModel.deleteTModel(authInfoRiftSaw, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_XML, TckTModel.RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY);
+                
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java?rev=1550992&r1=1550991&r2=1550992&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -24,6 +24,7 @@ import javax.wsdl.Definition;
 import javax.wsdl.PortType;
 import javax.wsdl.WSDLException;
 import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
 
 import junit.framework.Assert;
 
@@ -53,96 +54,102 @@ import org.uddi.v3_service.UDDISecurityP
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  */
 public class BPEL_020_IntegrationTest {
-private static Log logger = LogFactory.getLog(BPEL_010_IntegrationTest.class);
-	
-	private static TckTModel tckTModel           = null;
-	private static TckBusinessService tckService = null;
-	private static TckBusiness tckBusiness       = null;
-	private static String authInfoRiftSaw        = null;
-	private static UDDIClient manager;
-	static ReadWSDL rw;
-	
-	@BeforeClass
-	public static void startManager() throws ConfigurationException {
-		
-		manager  = new UDDIClient();
-		manager.start();
-		
-		logger.debug("Getting auth token for user riftsaw/riftsaw..");
-		try {
-			 Transport transport = manager.getTransport();
-	        	 
-        	 UDDISecurityPortType security = transport.getUDDISecurityService();
-        	 authInfoRiftSaw = TckSecurity.getAuthToken(security, 
-        			 TckPublisher.getRiftSawPublisherId(),  TckPublisher.getRiftSawPassword());
-        	 Assert.assertNotNull(authInfoRiftSaw);
-        	
-        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
-        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-        	 tckTModel  = new TckTModel(publication, inquiry);
-        	 tckService = new TckBusinessService(publication, inquiry);
-        	 tckBusiness= new TckBusiness(publication, inquiry);
-        	
-	     } catch (Exception e) {
-	    	 logger.error(e.getMessage(), e);
-				Assert.fail("Could not obtain authInfo token.");
-	     } 
-	     rw = new ReadWSDL();
-	}
-	
-	@Before //jUDDI only to add the keygenerator and business
-	public void saveRiftSawKeyGenerator() {
-		tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PUBLISHER_TMODEL_XML, TckTModel.RIFTSAW_PUBLISHER_TMODEL_KEY);
-		tckBusiness.saveBusiness(authInfoRiftSaw, TckBusiness.RIFTSAW_BUSINESS_XML, TckBusiness.RIFTSAW_BUSINESS_KEY);
-	}
-	
-	@Test
-	public void parseWSDL_PortTypeTModels() throws WSDLException , Exception {
-		
-	    Definition wsdlDefinition = rw.readWSDL("uddi_data/bpel/riftsaw/bpel-technote.wsdl");
-		@SuppressWarnings("unchecked")
-		Map<QName,PortType> portTypes = (Map<QName,PortType>) wsdlDefinition.getAllPortTypes();
-		String ns = wsdlDefinition.getTargetNamespace();
-		System.out.println("Namespace: " + ns);
-		
-		int i=0;
-	    for (QName qName : portTypes.keySet()) {
-	    	String nsp = qName.getNamespaceURI();
-	    	String localpart = qName.getLocalPart();
-	    	System.out.println("Namespace: " + nsp);
-	    	System.out.println("LocalPart: " + localpart);
-	    	if (i++==0) Assert.assertEquals("InterfaceOfTravelAgent", localpart);
-	    	else Assert.assertEquals("InterfaceOfCustomer", localpart);
-		}
-	}
-	
-	@Test
-	public void registerBPELProcess() throws WSDLException, ConfigurationException,
-		MalformedURLException, RemoteException, TransportException, Exception  {
-		
-		UDDIClerk clerk = new UDDIClerk();
-		clerk.setManagerName(manager.getName());
-		clerk.setName("testClerk");
-		clerk.setPublisher(TckPublisher.getRiftSawPublisherId());
-		clerk.setPassword(TckPublisher.getRiftSawPassword());
-		
-		clerk.setUDDINode(manager.getClientConfig().getHomeNode());
-		
-		Properties properties = manager.getClientConfig().getHomeNode().getProperties();
-		properties.put("keyDomain", "riftsaw.jboss.org");
-		properties.put("nodeName", "localhost");
-		properties.put("businessName", "redhat-jboss");
-		BPEL2UDDI bpel2UDDI = new BPEL2UDDI(clerk, new URLLocalizerDefaultImpl(), properties);
-		
-	    Definition wsdlDefinition = rw.readWSDL("uddi_data/bpel/riftsaw/HelloWorld.wsdl");
-		QName serviceName = new QName("http://www.jboss.org/bpel/examples/wsdl","HelloService");
-		String portName = "HelloPort";
-		URL serviceUrl = new URL("http://localhost:8080/helloworld");
-		bpel2UDDI.register(serviceName, portName, serviceUrl, wsdlDefinition);
-		
-		System.out.println("DONE");
-		
-		bpel2UDDI.unRegister(serviceName, portName, serviceUrl);
-	}
-	
+
+        private static Log logger = LogFactory.getLog(BPEL_010_IntegrationTest.class);
+        private static TckTModel tckTModel = null;
+        private static TckBusinessService tckService = null;
+        private static TckBusiness tckBusiness = null;
+        private static String authInfoRiftSaw = null;
+        private static UDDIClient manager;
+        static ReadWSDL rw;
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
+
+                manager = new UDDIClient();
+                manager.start();
+
+                logger.debug("Getting auth token for user riftsaw/riftsaw..");
+                try {
+                        Transport transport = manager.getTransport();
+
+                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        authInfoRiftSaw = TckSecurity.getAuthToken(security, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword());
+                        //Assert.assertNotNull(authInfoRiftSaw);
+
+                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
+                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword());
+                        }
+
+                        tckTModel = new TckTModel(publication, inquiry);
+                        tckService = new TckBusinessService(publication, inquiry);
+                        tckBusiness = new TckBusiness(publication, inquiry);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+                rw = new ReadWSDL();
+        }
+
+        @Before //jUDDI only to add the keygenerator and business
+        public void saveRiftSawKeyGenerator() {
+                tckTModel.saveTModel(authInfoRiftSaw, TckTModel.RIFTSAW_PUBLISHER_TMODEL_XML, TckTModel.RIFTSAW_PUBLISHER_TMODEL_KEY);
+                tckBusiness.saveBusiness(authInfoRiftSaw, TckBusiness.RIFTSAW_BUSINESS_XML, TckBusiness.RIFTSAW_BUSINESS_KEY);
+        }
+
+        @Test
+        public void parseWSDL_PortTypeTModels() throws WSDLException, Exception {
+
+                Definition wsdlDefinition = rw.readWSDL("uddi_data/bpel/riftsaw/bpel-technote.wsdl");
+                @SuppressWarnings("unchecked")
+                Map<QName, PortType> portTypes = (Map<QName, PortType>) wsdlDefinition.getAllPortTypes();
+                String ns = wsdlDefinition.getTargetNamespace();
+                System.out.println("Namespace: " + ns);
+
+                int i = 0;
+                for (QName qName : portTypes.keySet()) {
+                        String nsp = qName.getNamespaceURI();
+                        String localpart = qName.getLocalPart();
+                        System.out.println("Namespace: " + nsp);
+                        System.out.println("LocalPart: " + localpart);
+                        if (i++ == 0) {
+                                Assert.assertEquals("InterfaceOfTravelAgent", localpart);
+                        } else {
+                                Assert.assertEquals("InterfaceOfCustomer", localpart);
+                        }
+                }
+        }
+
+        @Test
+        public void registerBPELProcess() throws WSDLException, ConfigurationException,
+                MalformedURLException, RemoteException, TransportException, Exception {
+
+                UDDIClerk clerk = new UDDIClerk();
+                clerk.setManagerName(manager.getName());
+                clerk.setName("testClerk");
+                clerk.setPublisher(TckPublisher.getRiftSawPublisherId());
+                clerk.setPassword(TckPublisher.getRiftSawPassword());
+
+                clerk.setUDDINode(manager.getClientConfig().getHomeNode());
+
+                Properties properties = manager.getClientConfig().getHomeNode().getProperties();
+                properties.put("keyDomain", "riftsaw.jboss.org");
+                properties.put("nodeName", "localhost");
+                properties.put("businessName", "redhat-jboss");
+                BPEL2UDDI bpel2UDDI = new BPEL2UDDI(clerk, new URLLocalizerDefaultImpl(), properties);
+
+                Definition wsdlDefinition = rw.readWSDL("uddi_data/bpel/riftsaw/HelloWorld.wsdl");
+                QName serviceName = new QName("http://www.jboss.org/bpel/examples/wsdl", "HelloService");
+                String portName = "HelloPort";
+                URL serviceUrl = new URL("http://localhost:8080/helloworld");
+                bpel2UDDI.register(serviceName, portName, serviceUrl, wsdlDefinition);
+
+                System.out.println("DONE");
+
+                bpel2UDDI.unRegister(serviceName, portName, serviceUrl);
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.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/JUDDI_010_PublisherIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java Sun Dec 15 02:10:24 2013
@@ -14,8 +14,6 @@
  */
 package org.apache.juddi.v3.tck;
 
-import static junit.framework.Assert.assertEquals;
-
 import java.rmi.RemoteException;
 import java.util.List;
 
@@ -24,9 +22,11 @@ import javax.xml.ws.soap.SOAPFaultExcept
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.api_v3.ClerkList;
 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.NodeList;
 import org.apache.juddi.api_v3.Publisher;
 import org.apache.juddi.api_v3.PublisherDetail;
 import org.apache.juddi.api_v3.SavePublisher;
@@ -46,237 +46,264 @@ import org.uddi.v3_service.UDDISecurityP
 
 /**
  * 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_010_PublisherIntegrationTest {
-	
-	private static Log logger = LogFactory.getLog(JUDDI_010_PublisherIntegrationTest.class);
-	private static UDDIClient manager;
-	private static UDDISecurityPortType security =null;
-	private static JUDDIApiPortType publisher = null;
-	private static String authInfo = null;
-	
-	@BeforeClass
-	public static void startManager() throws ConfigurationException {
-		Assume.assumeTrue(TckPublisher.isJUDDI());
-		manager  = new UDDIClient();
-		manager.start();
-
-
-		logger.debug("Getting auth tokens..");
-		try {
-			Transport transport = manager.getTransport();
-			
-			security = transport.getUDDISecurityService();
-			GetAuthToken getAuthToken = new GetAuthToken();
-			getAuthToken.setUserID(TckPublisher.getRootPublisherId());
-			getAuthToken.setCred(TckPublisher.getRootPassword());
-			authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
-			
-			publisher = transport.getJUDDIApiService();
-		} catch (Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("Could not obtain authInfo token.");
-		} 
-	}
-	
-	@AfterClass
-	public static void stopManager() throws ConfigurationException {
-		manager.stop();
-	}
-	
-     @Test
-     public void testAuthToken() {
-             Assume.assumeTrue(TckPublisher.isUDDIAuthMode());
-	     try {
-	    	 Transport transport = manager.getTransport();
-        	 
-        	 UDDISecurityPortType securityService = transport.getUDDISecurityService();
-        	 GetAuthToken getAuthToken = new GetAuthToken();
-        	 getAuthToken.setUserID("root");
-        	 getAuthToken.setCred("");
-        	 AuthToken authToken = securityService.getAuthToken(getAuthToken);
-        	 System.out.println(authToken.getAuthInfo());
-        	 Assert.assertNotNull(authToken);
-	     } catch (Exception e) {
-	         e.printStackTrace();
-	         Assert.fail();
-	     } 
-     }
-     
-     @Test
- 	public void testJoePublisher() {
-             Assume.assumeTrue(TckPublisher.isJUDDI());
- 		//We can only test this if the publisher is not there already.
- 		//If it already there is probably has foreign key relationships.
- 		//This test should really only run on an empty database. Seed
- 		//data will be added if the root publisher is missing.
- 		if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
- 			saveJoePublisher();
- 			deleteJoePublisher();
- 		}
- 	}
- 	
- 	@Test
- 	public void testSamSyndicator() {
+
+        private static Log logger = LogFactory.getLog(JUDDI_010_PublisherIntegrationTest.class);
+        private static UDDIClient manager;
+        private static UDDISecurityPortType security = null;
+        private static JUDDIApiPortType publisher = null;
+        private static String authInfo = null;
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
- 		//We can only test this if the publisher is not there already.
- 		if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
- 			saveSamSyndicator();
- 			deleteSamSyndicator();
- 		}
- 	}
- 	
- 	@Test
- 	public void testGetAllPublishers(){
+                manager = new UDDIClient();
+                manager.start();
+
+
+                logger.debug("Getting auth tokens..");
+                try {
+                        Transport transport = manager.getTransport();
+
+                        security = transport.getUDDISecurityService();
+                        GetAuthToken getAuthToken = new GetAuthToken();
+                        getAuthToken.setUserID(TckPublisher.getRootPublisherId());
+                        getAuthToken.setCred(TckPublisher.getRootPassword());
+                        authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
+
+                        publisher = transport.getJUDDIApiService();
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+        }
+
+        @AfterClass
+        public static void stopManager() throws ConfigurationException {
+                manager.stop();
+        }
+
+        @Test
+        public void testAuthToken() {
+                Assume.assumeTrue(TckPublisher.isUDDIAuthMode());
+                try {
+                        Transport transport = manager.getTransport();
+
+                        UDDISecurityPortType securityService = transport.getUDDISecurityService();
+                        GetAuthToken getAuthToken = new GetAuthToken();
+                        getAuthToken.setUserID("root");
+                        getAuthToken.setCred("");
+                        AuthToken authToken = securityService.getAuthToken(getAuthToken);
+                        System.out.println(authToken.getAuthInfo());
+                        Assert.assertNotNull(authToken);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        Assert.fail();
+                }
+        }
+
+        @Test
+        public void testJoePublisher() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
+                //We can only test this if the publisher is not there already.
+                //If it already there is probably has foreign key relationships.
+                //This test should really only run on an empty database. Seed
+                //data will be added if the root publisher is missing.
+                if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
+                        saveJoePublisher();
+                        deleteJoePublisher();
+                }
+        }
+
+        @Test
+        public void testSamSyndicator() {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
-		GetAllPublisherDetail gp = new GetAllPublisherDetail();
-		gp.setAuthInfo(authInfo);
-		try {
-			PublisherDetail publisherDetail = publisher.getAllPublisherDetail(gp);
-			Assert.assertTrue(publisherDetail.getPublisher().size() > 1);
-		} catch (Exception e) {
-			Assert.fail();
-		}
-	}
- 	
- 	/**
- 	 * Persists Joe Publisher to the database.
- 	 * @return - true if the published did not exist already, 
- 	 * 		   - false in all other cases.
- 	 */
- 	public boolean saveJoePublisher() {
+                //We can only test this if the publisher is not there already.
+                if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
+                        saveSamSyndicator();
+                        deleteSamSyndicator();
+                }
+        }
+
+        @Test
+        public void testGetAllPublishers() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
+                GetAllPublisherDetail gp = new GetAllPublisherDetail();
+                gp.setAuthInfo(authInfo);
+                try {
+                        PublisherDetail publisherDetail = publisher.getAllPublisherDetail(gp);
+                        Assert.assertTrue(publisherDetail.getPublisher().size() > 1);
+                } catch (Exception e) {
+                        Assert.fail();
+                }
+        }
+
+        /**
+         * Persists Joe Publisher to the database.
+         *
+         * @return - true if the published did not exist already, - false in all
+         * other cases.
+         */
+        public boolean saveJoePublisher() {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
- 		if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
- 			savePublisher(TckPublisher.getJoePublisherId(), TckPublisher.JOE_PUBLISHER_XML);
- 			return true;
- 		} else {
- 			return false;
- 		}
- 	}
- 	/**
- 	 * Removes Joe Publisher from the database, this will fail if there
- 	 * are child objects attached; think Services etc.
- 	 */
- 	public void deleteJoePublisher() {
+                if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
+                        savePublisher(TckPublisher.getJoePublisherId(), TckPublisher.JOE_PUBLISHER_XML);
+                        return true;
+                } else {
+                        return false;
+                }
+        }
+
+        /**
+         * Removes Joe Publisher from the database, this will fail if there are
+         * child objects attached; think Services etc.
+         */
+        public void deleteJoePublisher() {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
- 		deletePublisher(TckPublisher.getJoePublisherId());
- 	}
- 	/**
- 	 * Persists Sam Syndicator to the database.
- 	 * @return publisherId
- 	 */
- 	public String saveSamSyndicator() {
+                deletePublisher(TckPublisher.getJoePublisherId());
+        }
+
+        /**
+         * Persists Sam Syndicator to the database.
+         *
+         * @return publisherId
+         */
+        public String saveSamSyndicator() {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
- 		if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
- 			savePublisher(TckPublisher.getSamPublisherId(), TckPublisher.SAM_SYNDICATOR_XML);
- 		}
- 		return TckPublisher.getSamPublisherId();
- 	}
- 	/**
- 	 * Removes Sam Syndicator from the database, this will fail if there
- 	 * are child objects attached; think Services etc.
- 	 */
- 	public void deleteSamSyndicator() {
+                if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
+                        savePublisher(TckPublisher.getSamPublisherId(), TckPublisher.SAM_SYNDICATOR_XML);
+                }
+                return TckPublisher.getSamPublisherId();
+        }
+
+        /**
+         * Removes Sam Syndicator from the database, this will fail if there are
+         * child objects attached; think Services etc.
+         */
+        public void deleteSamSyndicator() {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
- 		deletePublisher(TckPublisher.getSamPublisherId());
- 	}
- 	
- 	private void savePublisher(String publisherId, String publisherXML) {
-		try {
-			authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
-			logger.debug("Saving new publisher: " + publisherXML);
-			SavePublisher sp = new SavePublisher();
-			sp.setAuthInfo(authInfo);
-			Publisher pubIn = (Publisher)EntityCreator.buildFromDoc(publisherXML, "org.apache.juddi.api_v3");
-			sp.getPublisher().add(pubIn);
-			publisher.savePublisher(sp);
-	
-			// Now get the entity and check the values
-			GetPublisherDetail gp = new GetPublisherDetail();
-			gp.getPublisherId().add(publisherId);
-			gp.setAuthInfo(authInfo);
-			PublisherDetail pd = publisher.getPublisherDetail(gp);
-			List<Publisher> pubOutList = pd.getPublisher();
-			Publisher pubOut = pubOutList.get(0);
-
-			assertEquals(pubIn.getAuthorizedName(), pubOut.getAuthorizedName());
-			assertEquals(pubIn.getPublisherName(), pubOut.getPublisherName());
-			assertEquals(pubIn.getEmailAddress(), pubOut.getEmailAddress());
-			assertEquals(pubIn.getIsAdmin(), pubOut.getIsAdmin());
-			assertEquals(pubIn.getIsEnabled(), pubOut.getIsEnabled());
-			assertEquals(pubIn.getMaxBindingsPerService(), pubOut.getMaxBindingsPerService());
-			assertEquals(pubIn.getMaxBusinesses(), pubOut.getMaxBusinesses());
-			assertEquals(pubIn.getMaxServicePerBusiness(), pubOut.getMaxServicePerBusiness());
-			assertEquals(pubIn.getMaxTModels(), pubOut.getMaxTModels());
-			
-			logger.debug("Querying for publisher: " + publisherXML);
-			//Querying for this publisher to make sure it's really gone
-			//We're expecting a invalid Key exception at this point.
-			PublisherDetail pdBeforeDelete =null;
-			try {
-				pdBeforeDelete = publisher.getPublisherDetail(gp);
-				Assert.assertNotNull(pdBeforeDelete);
-			} catch (Exception e) {
-				Assert.fail("We expected to find publisher " + publisherXML);
-			}
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-	
-	private void deletePublisher(String publisherId) {
-		try {
-			authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
-			logger.debug("Delete publisher: " + publisherId);
-			//Now deleting this publisher
-			DeletePublisher dp = new DeletePublisher();
-			dp.setAuthInfo(authInfo);
-			dp.getPublisherId().add(publisherId);
-			publisher.deletePublisher(dp);
-			
-			logger.info("Querying for publisher: " + publisherId + " after deletion.");
-			//Querying for this publisher to make sure it's really gone
-			//We're expecting a invalid Key exception at this point.
-			GetPublisherDetail gp = new GetPublisherDetail();
-			gp.getPublisherId().add(publisherId);
-			gp.setAuthInfo(authInfo);
-			PublisherDetail pdAfterDelete =null;
-			try {
-				pdAfterDelete = publisher.getPublisherDetail(gp);
-				Assert.fail("We did not expect to find this publisher anymore.");
-				//don't think we really want a SOAPFaulException be thrown here.
-			} catch (SOAPFaultException e) {
-				Assert.assertNull(pdAfterDelete);
-			}
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(), e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-	
-	private boolean isExistPublisher(String publisherId) {
-		GetPublisherDetail gp = new GetPublisherDetail();
-		gp.setAuthInfo(authInfo);
-		gp.getPublisherId().add(publisherId);
-		try {
-			publisher.getPublisherDetail(gp);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-	
-	protected String authInfoJoe() throws RemoteException, DispositionReportFaultMessage {
-		return TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
-	}
-	
-	protected String authInfoSam() throws RemoteException,  DispositionReportFaultMessage {
-		return TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
-	}
-	
+                deletePublisher(TckPublisher.getSamPublisherId());
+        }
+
+        private void savePublisher(String publisherId, String publisherXML) {
+                try {
+                        authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+                        logger.debug("Saving new publisher: " + publisherXML);
+                        SavePublisher sp = new SavePublisher();
+                        sp.setAuthInfo(authInfo);
+                        Publisher pubIn = (Publisher) EntityCreator.buildFromDoc(publisherXML, "org.apache.juddi.api_v3");
+                        sp.getPublisher().add(pubIn);
+                        publisher.savePublisher(sp);
+
+                        // Now get the entity and check the values
+                        GetPublisherDetail gp = new GetPublisherDetail();
+                        gp.getPublisherId().add(publisherId);
+                        gp.setAuthInfo(authInfo);
+                        PublisherDetail pd = publisher.getPublisherDetail(gp);
+                        List<Publisher> pubOutList = pd.getPublisher();
+                        Publisher pubOut = pubOutList.get(0);
+
+                        Assert.assertEquals(pubIn.getAuthorizedName(), pubOut.getAuthorizedName());
+                        Assert.assertEquals(pubIn.getPublisherName(), pubOut.getPublisherName());
+                        Assert.assertEquals(pubIn.getEmailAddress(), pubOut.getEmailAddress());
+                        Assert.assertEquals(pubIn.getIsAdmin(), pubOut.getIsAdmin());
+                        Assert.assertEquals(pubIn.getIsEnabled(), pubOut.getIsEnabled());
+                        Assert.assertEquals(pubIn.getMaxBindingsPerService(), pubOut.getMaxBindingsPerService());
+                        Assert.assertEquals(pubIn.getMaxBusinesses(), pubOut.getMaxBusinesses());
+                        Assert.assertEquals(pubIn.getMaxServicePerBusiness(), pubOut.getMaxServicePerBusiness());
+                        Assert.assertEquals(pubIn.getMaxTModels(), pubOut.getMaxTModels());
+
+                        logger.debug("Querying for publisher: " + publisherXML);
+                        //Querying for this publisher to make sure it's really gone
+                        //We're expecting a invalid Key exception at this point.
+                        PublisherDetail pdBeforeDelete = null;
+                        try {
+                                pdBeforeDelete = publisher.getPublisherDetail(gp);
+                                Assert.assertNotNull(pdBeforeDelete);
+                        } catch (Exception e) {
+                                Assert.fail("We expected to find publisher " + publisherXML);
+                        }
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+
+        private void deletePublisher(String publisherId) {
+                try {
+                        authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+                        logger.debug("Delete publisher: " + publisherId);
+                        //Now deleting this publisher
+                        DeletePublisher dp = new DeletePublisher();
+                        dp.setAuthInfo(authInfo);
+                        dp.getPublisherId().add(publisherId);
+                        publisher.deletePublisher(dp);
+
+                        logger.info("Querying for publisher: " + publisherId + " after deletion.");
+                        //Querying for this publisher to make sure it's really gone
+                        //We're expecting a invalid Key exception at this point.
+                        GetPublisherDetail gp = new GetPublisherDetail();
+                        gp.getPublisherId().add(publisherId);
+                        gp.setAuthInfo(authInfo);
+                        PublisherDetail pdAfterDelete = null;
+                        try {
+                                pdAfterDelete = publisher.getPublisherDetail(gp);
+                                Assert.fail("We did not expect to find this publisher anymore.");
+                                //don't think we really want a SOAPFaulException be thrown here.
+                        } catch (SOAPFaultException e) {
+                                Assert.assertNull(pdAfterDelete);
+                        }
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+
+        private boolean isExistPublisher(String publisherId) {
+                GetPublisherDetail gp = new GetPublisherDetail();
+                gp.setAuthInfo(authInfo);
+                gp.getPublisherId().add(publisherId);
+                try {
+                        publisher.getPublisherDetail(gp);
+                        return true;
+                } catch (Exception e) {
+                        return false;
+                }
+        }
+
+        protected String authInfoJoe() throws RemoteException, DispositionReportFaultMessage {
+                return TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+        }
+
+        protected String authInfoSam() throws RemoteException, DispositionReportFaultMessage {
+                return TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+        }
+
+        @Test
+        public void getAllnodes() throws Exception {
+                NodeList allNodes = publisher.getAllNodes(authInfo);
+                Assert.assertNotNull(allNodes);
+                //Assert.assertFalse(allNodes.isEmpty());
+                for (int i = 0; i < allNodes.getNode().size(); i++) {
+                        Assert.assertNotNull(allNodes.getNode().get(i).getName());
+                }
+        }
+
+        @Test
+        public void getAllclerks() throws Exception {
+
+                ClerkList allNodes = publisher.getAllClerks(authInfo);
+                Assert.assertNotNull(allNodes);
+                for (int i = 0; i < allNodes.getClerk().size(); i++) {
+                        Assert.assertNotNull(allNodes.getClerk().get(i).getName());
+                        Assert.assertNotNull(allNodes.getClerk().get(i).getNode());
+                }
+
+        }
 }



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


Mime
View raw message