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/12 01:27:32 UTC

svn commit: r1550327 [1/8] - in /juddi/branches/juddi-3.3.x: ./ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ juddi-core/src/main/java/org/apache/juddi/validation/ juddi-cor...

Author: alexoree
Date: Thu Dec 12 00:27:31 2013
New Revision: 1550327

URL: http://svn.apache.org/r1550327
Log:
JUDDI-743 fixed
JUDDI-583 done, still needs some additional tweaking but its functional. many test cases were revised, all settings externalized. 
JUDDI-744 REST tck test cases added. done

Added:
    juddi/branches/juddi-3.3.x/juddi-tck-runner/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/pom.xml
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/
    juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
    juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties
    juddi/branches/juddi-3.3.x/juddi-tck-runner/uddi.xml
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java
      - copied, changed from r1549359, juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_020_RESTIntergrationTest.java
Removed:
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_020_RESTIntergrationTest.java
Modified:
    juddi/branches/juddi-3.3.x/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
    juddi/branches/juddi-3.3.x/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java
    juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
    juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
    juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
    juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java
    juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
    juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java
    juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
    juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
    juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
    juddi/branches/juddi-3.3.x/pom.xml
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties
    juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml
    juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
    juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java

Modified: juddi/branches/juddi-3.3.x/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Thu Dec 12 00:27:31 2013
@@ -109,6 +109,10 @@ public class ClientConfig 
 		CompositeConfiguration compositeConfig = new CompositeConfiguration();
 		compositeConfig.addConfiguration(new SystemConfiguration());
 		//Properties from XML file
+                if (System.getProperty(UDDI_CONFIG_FILENAME_PROPERTY)!=null){
+                        log.info("Using system property config override");
+                        configurationFile = System.getProperty(UDDI_CONFIG_FILENAME_PROPERTY);
+                }
 		XMLConfiguration xmlConfig = null;
 		if (configurationFile!=null) {
 			xmlConfig = new XMLConfiguration(configurationFile);

Modified: juddi/branches/juddi-3.3.x/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ReadWSDLTest.java Thu Dec 12 00:27:31 2013
@@ -57,8 +57,8 @@ public class ReadWSDLTest {
             System.out.println("Connectivity failed " + e.getMessage());
             return false;
         }
-        System.out.println("Connectivity passed" );
-        return true;
+        //System.out.println("Connectivity passed" );
+        return false;
 
     }
 

Modified: juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/validation/ValidateValuesFromWebService.java Thu Dec 12 00:27:31 2013
@@ -57,16 +57,14 @@ public class ValidateValuesFromWebServic
                 UDDIValueSetValidationPortType vsv = svc.getUDDIValueSetValidationPort();
 
                 if (url == null || url.trim().length() == 0) {
-                        log.error("VSV Validation Failed: Cannot locate class from url null");
+                        log.error("VSV Validation Failed: Calling Url is null");
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidurl"));
                         throw x;
-                }
-                if (url.startsWith(Property.DEFAULT_BASE_URL)
+                } else if (url.startsWith(Property.DEFAULT_BASE_URL)
                         || url.startsWith(Property.DEFAULT_BASE_URL_SECURE)) {
                         vsv = new UDDIValueSetValidationImpl();
 
-                }
-                if (url.startsWith("classpath:")) {
+                } else if (url.startsWith("classpath:/")) {
                         try {
                                 String clz = url.substring(11);
                                 Class<UDDIValueSetValidationPortType> forName = (Class<UDDIValueSetValidationPortType>) Class.forName(clz);
@@ -74,17 +72,23 @@ public class ValidateValuesFromWebServic
                         } catch (Exception ex) {
                                 log.error("VSV Validation Failed: Cannot locate class from url " + url, ex);
                         }
-                } else {
+                } else if (url.toLowerCase().startsWith("http")){
                         //external service, stick with 
                         log.info("Calling External VSV Service");
                         ((BindingProvider) vsv).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url);
                 }
+                else
+                {
+                        log.warn("Unable to figure out how to use the URL " + url  + " as a Value Set Validation Service transport mechanism.");
+                        ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidurl", url));
+                }
+                
                 return vsv;
         }
 
         public static void Validate(String url, BusinessEntity obj) throws ValueNotAllowedException {
 
-                UDDIValueSetValidationPortType vsv=getPort(url);
+                UDDIValueSetValidationPortType vsv = getPort(url);
                 ValidateValues req = new ValidateValues();
                 req.getBusinessEntity().add(obj);
 
@@ -92,14 +96,15 @@ public class ValidateValuesFromWebServic
                         DispositionReport validateValues = vsv.validateValues(req);
                         //TODO parse
                 } catch (Exception ex) {
-                        log.error("VSV Validation Failed: Cannot locate class from url " + url, ex);
+                        log.error("VSV Validation Failed: From external service at " + url + ". Reason: " + ex.getMessage());
+                        log.debug("VSV Validation Failed: From external service at " + url + ". Reason: ", ex);
                         ValueNotAllowedException x = new ValueNotAllowedException(new ErrorMessage("errors.valuesetvalidation.invalidcontent", ex.getMessage()));
                         throw x;
                 }
         }
 
         public static void Validate(String url, TModel obj) throws ValueNotAllowedException {
-                UDDIValueSetValidationPortType vsv=getPort(url);
+                UDDIValueSetValidationPortType vsv = getPort(url);
                 ValidateValues req = new ValidateValues();
                 req.getTModel().add(obj);
 
@@ -112,7 +117,7 @@ public class ValidateValuesFromWebServic
         }
 
         public static void Validate(String url, BusinessService obj) throws ValueNotAllowedException {
-                UDDIValueSetValidationPortType vsv=getPort(url);
+                UDDIValueSetValidationPortType vsv = getPort(url);
                 ValidateValues req = new ValidateValues();
                 req.getBusinessService().add(obj);
 
@@ -125,7 +130,7 @@ public class ValidateValuesFromWebServic
         }
 
         public static void Validate(String url, BindingTemplate obj) throws ValueNotAllowedException {
-                UDDIValueSetValidationPortType vsv=getPort(url);
+                UDDIValueSetValidationPortType vsv = getPort(url);
                 ValidateValues req = new ValidateValues();
                 req.getBindingTemplate().add(obj);
 
@@ -138,7 +143,7 @@ public class ValidateValuesFromWebServic
         }
 
         public static void Validate(String url, PublisherAssertion obj) throws ValueNotAllowedException {
-                UDDIValueSetValidationPortType vsv=getPort(url);
+                UDDIValueSetValidationPortType vsv = getPort(url);
                 ValidateValues req = new ValidateValues();
                 req.getPublisherAssertion().add(obj);
                 try {

Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java Thu Dec 12 00:27:31 2013
@@ -32,6 +32,7 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.uddi.api_v3.TModelList;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -71,7 +72,7 @@ public class API_070_FindEntityTest 
 	@Test
 	public void findEntities() {
 		try {
-			tckTModel.saveJoePublisherTmodel(authInfoJoe);
+			tckTModel.saveJoePublisherTmodel(authInfoJoe, true);
 			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
@@ -93,7 +94,7 @@ public class API_070_FindEntityTest 
 	@Test
 	public void findSignedEntities() {
 		try {
-			tckTModel.saveJoePublisherTmodel(authInfoJoe);
+			tckTModel.saveJoePublisherTmodel(authInfoJoe, true);
 			tckBusiness.saveJoePublisherBusinessX509Signature(authInfoJoe);
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);

Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java Thu Dec 12 00:27:31 2013
@@ -45,7 +45,7 @@ public class API_080_SubscriptionTest 
 	private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
 	private static TckBusinessService tckBusinessService = new TckBusinessService(new UDDIPublicationImpl(), new UDDIInquiryImpl());
 	private static TckBindingTemplate tckBindingTemplate = new TckBindingTemplate(new UDDIPublicationImpl(), new UDDIInquiryImpl());
-	private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl(), new UDDISecurityImpl());
+	private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl());
 
 	private static String authInfoJoe = null;
 	private static String authInfoSam = null;

Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -101,7 +101,7 @@ public class API_090_SubscriptionListene
 			//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, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, "localhost");
 			//Saving the HTTP Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
             //Changing the service we subscribed to "JoePublisherService"
@@ -146,7 +146,7 @@ public class API_090_SubscriptionListene
 			//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);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_XML, 0, "localhost");
 			//Saving the SMTP Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_SMTP_XML);
             //Changing the service we subscribed to "JoePublisherService"
@@ -197,7 +197,7 @@ public class API_090_SubscriptionListene
 			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			//Saving the Listener Service
-			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, "localhost");
 			//Saving the Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
             //Changing the service we subscribed to "JoePublisherService"

Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -120,7 +120,7 @@ public class API_091_RMISubscriptionList
 			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			//Saving the Listener Service
-			tckSubscriptionListenerRMI.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort);
+			tckSubscriptionListenerRMI.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort, "localhost");
 			//Saving the Subscription
 			tckSubscriptionListenerRMI.saveNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI);
 			//Changing the service we subscribed to "JoePublisherService"

Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java Thu Dec 12 00:27:31 2013
@@ -63,7 +63,7 @@ public class SubscriptionNotifierTest {
     private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
     private static TckBusinessService tckBusinessService = new TckBusinessService(new UDDIPublicationImpl(), new UDDIInquiryImpl());
     private static TckBindingTemplate tckBindingTemplate = new TckBindingTemplate(new UDDIPublicationImpl(), new UDDIInquiryImpl());
-    private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl(), new UDDISecurityImpl());
+    private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl());
     private static String authInfoJoe = null;
 
     @BeforeClass

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java Thu Dec 12 00:27:31 2013
@@ -38,160 +38,159 @@ import org.uddi.v3_service.UDDISecurityP
  */
 public class UddiCreatebulk {
 
-    private static UDDISecurityPortType security = null;
-    private static UDDIPublicationPortType publish = null;
+        private static UDDISecurityPortType security = null;
+        private static UDDIPublicationPortType publish = null;
 
-    public UddiCreatebulk() {
-        try {
-            // create a manager and read the config in the archive; 
-            // you can use your config file name
-            UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
-            // register the clerkManager with the client side container
-            UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
-            // supply the nodeName (defined in your uddi.xml.
-            // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
-            Transport transport = clerkManager.getTransport("default");
-            // Now you create a reference to the UDDI API
-            security = transport.getUDDISecurityService();
-            publish = transport.getUDDIPublishService();
-        } catch (Exception e) {
-            e.printStackTrace();
+        public UddiCreatebulk() {
+                try {
+                        // create a manager and read the config in the archive; 
+                        // you can use your config file name
+                        UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+                        // register the clerkManager with the client side container
+                        UDDIClientContainer.addClient(clerkManager);            // a ClerkManager can be a client to multiple UDDI nodes, so 
+                        // supply the nodeName (defined in your uddi.xml.
+                        // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+                        Transport transport = clerkManager.getTransport("default");
+                        // Now you create a reference to the UDDI API
+                        security = transport.getUDDISecurityService();
+                        publish = transport.getUDDIPublishService();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
         }
-    }
 
-    public void publish() {
-        try {
-            // Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges
-            // and can save other publishers).
-            GetAuthToken getAuthTokenRoot = new GetAuthToken();
-            getAuthTokenRoot.setUserID("root");
-            getAuthTokenRoot.setCred("root");
-
-            // Making API call that retrieves the authentication token for the 'root' user.
-            AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
-
-            int servicesPerBusiness = 5;
-            int businesses = 15;
-
-            DatatypeFactory df = DatatypeFactory.newInstance();
-            GregorianCalendar gcal = new GregorianCalendar();
-            gcal.setTimeInMillis(System.currentTimeMillis());
-            XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal);
-            for (int i = 0; i < businesses; i++) {
-                // Creating the parent business entity that will contain our service.
-                BusinessEntity myBusEntity = new BusinessEntity();
-                Name myBusName = new Name();
-                myBusName.setLang("en");
-                myBusName.setValue("My Business " + i + " " + xcal.toString());
-                myBusEntity.getName().add(myBusName);
-
-                // Adding the business entity to the "save" structure, using our publisher's authentication info and saving away.
-                SaveBusiness sb = new SaveBusiness();
-                sb.getBusinessEntity().add(myBusEntity);
-                sb.setAuthInfo(rootAuthToken.getAuthInfo());
-                BusinessDetail bd = publish.saveBusiness(sb);
-                String myBusKey = bd.getBusinessEntity().get(0).getBusinessKey();
-                System.out.println("myBusiness key:  " + myBusKey);
-                for (int k = 0; k < servicesPerBusiness; k++) {
-                    // Creating a service to save.  Only adding the minimum data: the parent business key retrieved from saving the business 
-                    // above and a single name.
-                    BusinessService myService = new BusinessService();
-                    myService.setBusinessKey(myBusKey);
-                    Name myServName = new Name();
-                    myServName.setLang("en");
-                    myServName.setValue("My Service " + i + " " + k + " " + xcal.toString());
-                    myService.getName().add(myServName);
-                    Description d2 = new Description();
-                    d2.setValue("my service description");
-                    d2.setLang("en");
-                    myService.getDescription().add(d2);
-                    // Add binding templates, etc...
-                    BindingTemplate myBindingTemplate = new BindingTemplate();
-                    myBindingTemplate.setCategoryBag(new CategoryBag());
-                    KeyedReference kr = new KeyedReference();
-                    kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
-                    kr.setKeyName("keyname1");
-                    kr.setKeyValue("myvalue1");
-
-                    myBindingTemplate.getCategoryBag().getKeyedReference().add(kr);
-
-                    KeyedReferenceGroup krg = new KeyedReferenceGroup();
-                    krg.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
-                    kr = new KeyedReference();
-                    kr.setTModelKey(UDDIConstants.PROTOCOL_SSLv3);
-                    kr.setKeyName("keyname1grp");
-                    kr.setKeyValue("myvalue1grp");
-
-                    krg.getKeyedReference().add(kr);
-                    myBindingTemplate.getCategoryBag().getKeyedReferenceGroup().add(krg);
-
-
-                    myService.setCategoryBag(new CategoryBag());
-
-                    kr = new KeyedReference();
-                    kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
-                    kr.setKeyName("Servicekeyname2grp");
-                    kr.setKeyValue("Servicemyvalue2grp");
-                    myService.getCategoryBag().getKeyedReference().add(kr);
-
-                    krg = new KeyedReferenceGroup();
-                    krg.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
-                    kr = new KeyedReference();
-                    kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
-                    kr.setKeyName("keyname1grp");
-                    kr.setKeyValue("myvalue1grp");
-
-                    krg.getKeyedReference().add(kr);
-                    myService.getCategoryBag().getKeyedReferenceGroup().add(krg);
-
-                    AccessPoint accessPoint = new AccessPoint();
-                    accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
-                    accessPoint.setValue("http://example.org/services/myservice" + i + k + "?wsdl");
-                    myBindingTemplate.setAccessPoint(accessPoint);
-                    myBindingTemplate.setTModelInstanceDetails(new TModelInstanceDetails());
-                    TModelInstanceInfo tii = new TModelInstanceInfo();
-                    Description d = new Description();
-                    d.setValue("Tmodel instance description");
-                    tii.getDescription().add(d);
-                    tii.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
-                    tii.setInstanceDetails(new InstanceDetails());
-                    tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing this endpoint, up to 4KB of data");
-                    tii.getInstanceDetails().getDescription().add(d);
-                    OverviewDoc od = new OverviewDoc();
-                    d = new Description();
-                    d.setValue("ovweview doc description");
-                    od.getDescription().add(d);
-                    od.setOverviewURL(new OverviewURL());
-                    od.getOverviewURL().setUseType("www");
-                    od.getOverviewURL().setValue("www.apache.org");
-                    tii.getInstanceDetails().getOverviewDoc().add(od);
-                    myBindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
-
-
-                    BindingTemplates myBindingTemplates = new BindingTemplates();
-                    myBindingTemplates.getBindingTemplate().add(myBindingTemplate);
-                    myService.setBindingTemplates(myBindingTemplates);
-                    try {
-                        // Adding the service to the "save" structure, using our publisher's authentication info and saving away.
-                        SaveService ss = new SaveService();
-                        ss.getBusinessService().add(myService);
-                        ss.setAuthInfo(rootAuthToken.getAuthInfo());
-                        ServiceDetail sd = publish.saveService(ss);
-                        String myServKey = sd.getBusinessService().get(0).getServiceKey();
-                        System.out.println("myService key:  " + myServKey);
-                    } catch (Exception x) {
-                        x.printStackTrace();
-                    }
+        public void publish() {
+                try {
+                        // Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges
+                        // and can save other publishers).
+                        GetAuthToken getAuthTokenRoot = new GetAuthToken();
+                        getAuthTokenRoot.setUserID("root");
+                        getAuthTokenRoot.setCred("root");
+
+                        // Making API call that retrieves the authentication token for the 'root' user.
+                        AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
+                        System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
+                        int servicesPerBusiness = 5;
+                        int businesses = 15;
+
+                        DatatypeFactory df = DatatypeFactory.newInstance();
+                        GregorianCalendar gcal = new GregorianCalendar();
+                        gcal.setTimeInMillis(System.currentTimeMillis());
+                        XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal);
+                        for (int i = 0; i < businesses; i++) {
+                                // Creating the parent business entity that will contain our service.
+                                BusinessEntity myBusEntity = new BusinessEntity();
+                                Name myBusName = new Name();
+                                myBusName.setLang("en");
+                                myBusName.setValue("My Business " + i + " " + xcal.toString());
+                                myBusEntity.getName().add(myBusName);
+
+                                // Adding the business entity to the "save" structure, using our publisher's authentication info and saving away.
+                                SaveBusiness sb = new SaveBusiness();
+                                sb.getBusinessEntity().add(myBusEntity);
+                                sb.setAuthInfo(rootAuthToken.getAuthInfo());
+                                BusinessDetail bd = publish.saveBusiness(sb);
+                                String myBusKey = bd.getBusinessEntity().get(0).getBusinessKey();
+                                System.out.println("myBusiness key:  " + myBusKey);
+                                for (int k = 0; k < servicesPerBusiness; k++) {
+                                        // Creating a service to save.  Only adding the minimum data: the parent business key retrieved from saving the business 
+                                        // above and a single name.
+                                        BusinessService myService = new BusinessService();
+                                        myService.setBusinessKey(myBusKey);
+                                        Name myServName = new Name();
+                                        myServName.setLang("en");
+                                        myServName.setValue("My Service " + i + " " + k + " " + xcal.toString());
+                                        myService.getName().add(myServName);
+                                        Description d2 = new Description();
+                                        d2.setValue("my service description");
+                                        d2.setLang("en");
+                                        myService.getDescription().add(d2);
+                                        // Add binding templates, etc...
+                                        BindingTemplate myBindingTemplate = new BindingTemplate();
+                                        myBindingTemplate.setCategoryBag(new CategoryBag());
+                                        KeyedReference kr = new KeyedReference();
+                                        kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
+                                        kr.setKeyName("keyname1");
+                                        kr.setKeyValue("myvalue1");
+
+                                        myBindingTemplate.getCategoryBag().getKeyedReference().add(kr);
+
+                                        KeyedReferenceGroup krg = new KeyedReferenceGroup();
+                                        krg.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
+                                        kr = new KeyedReference();
+                                        kr.setTModelKey(UDDIConstants.PROTOCOL_SSLv3);
+                                        kr.setKeyName("keyname1grp");
+                                        kr.setKeyValue("myvalue1grp");
+
+                                        krg.getKeyedReference().add(kr);
+                                        myBindingTemplate.getCategoryBag().getKeyedReferenceGroup().add(krg);
+
+
+                                        myService.setCategoryBag(new CategoryBag());
+
+                                        kr = new KeyedReference();
+                                        kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
+                                        kr.setKeyName("Servicekeyname2grp");
+                                        kr.setKeyValue("Servicemyvalue2grp");
+                                        myService.getCategoryBag().getKeyedReference().add(kr);
+
+                                        krg = new KeyedReferenceGroup();
+                                        krg.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
+                                        kr = new KeyedReference();
+                                        kr.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
+                                        kr.setKeyName("keyname1grp");
+                                        kr.setKeyValue("myvalue1grp");
+
+                                        krg.getKeyedReference().add(kr);
+                                        myService.getCategoryBag().getKeyedReferenceGroup().add(krg);
+
+                                        AccessPoint accessPoint = new AccessPoint();
+                                        accessPoint.setUseType(AccessPointType.WSDL_DEPLOYMENT.toString());
+                                        accessPoint.setValue("http://example.org/services/myservice" + i + k + "?wsdl");
+                                        myBindingTemplate.setAccessPoint(accessPoint);
+                                        myBindingTemplate.setTModelInstanceDetails(new TModelInstanceDetails());
+                                        TModelInstanceInfo tii = new TModelInstanceInfo();
+                                        Description d = new Description();
+                                        d.setValue("Tmodel instance description");
+                                        tii.getDescription().add(d);
+                                        tii.setTModelKey(UDDIConstants.TRANSPORT_HTTP);
+                                        tii.setInstanceDetails(new InstanceDetails());
+                                        tii.getInstanceDetails().setInstanceParms("heres some useful stuff describing this endpoint, up to 4KB of data");
+                                        tii.getInstanceDetails().getDescription().add(d);
+                                        OverviewDoc od = new OverviewDoc();
+                                        d = new Description();
+                                        d.setValue("ovweview doc description");
+                                        od.getDescription().add(d);
+                                        od.setOverviewURL(new OverviewURL());
+                                        od.getOverviewURL().setUseType("www");
+                                        od.getOverviewURL().setValue("www.apache.org");
+                                        tii.getInstanceDetails().getOverviewDoc().add(od);
+                                        myBindingTemplate.getTModelInstanceDetails().getTModelInstanceInfo().add(tii);
+
+
+                                        BindingTemplates myBindingTemplates = new BindingTemplates();
+                                        myBindingTemplates.getBindingTemplate().add(myBindingTemplate);
+                                        myService.setBindingTemplates(myBindingTemplates);
+                                        try {
+                                                // Adding the service to the "save" structure, using our publisher's authentication info and saving away.
+                                                SaveService ss = new SaveService();
+                                                ss.getBusinessService().add(myService);
+                                                ss.setAuthInfo(rootAuthToken.getAuthInfo());
+                                                ServiceDetail sd = publish.saveService(ss);
+                                                String myServKey = sd.getBusinessService().get(0).getServiceKey();
+                                                System.out.println("myService key:  " + myServKey);
+                                        } catch (Exception x) {
+                                                x.printStackTrace();
+                                        }
+                                }
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
                 }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
-    }
 
-    public static void main(String args[]) {
-        UddiCreatebulk sp = new UddiCreatebulk();
-        sp.publish();
-    }
+        public static void main(String args[]) {
+                UddiCreatebulk sp = new UddiCreatebulk();
+                sp.publish();
+        }
 }

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCustodyTransfer.java Thu Dec 12 00:27:31 2013
@@ -88,7 +88,7 @@ public class UddiCustodyTransfer {
 
         // Making API call that retrieves the authentication token for the 'root' user.
         AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-        System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+        System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
 
 
         getAuthTokenRoot = new GetAuthToken();

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java Thu Dec 12 00:27:31 2013
@@ -172,7 +172,7 @@ public class UddiDigitalSignatureBusines
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
             return rootAuthToken.getAuthInfo();
         } catch (Exception ex) {
             System.out.println("Could not authenticate with the provided credentials " + ex.getMessage());

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureSearch.java Thu Dec 12 00:27:31 2013
@@ -109,7 +109,7 @@ public class UddiDigitalSignatureSearch 
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
             return rootAuthToken.getAuthInfo();
         } catch (Exception ex) {
             System.out.println("Could not authenticate with the provided credentials " + ex.getMessage());

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java Thu Dec 12 00:27:31 2013
@@ -154,7 +154,7 @@ public class UddiDigitalSignatureService
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
             return rootAuthToken.getAuthInfo();
         } catch (Exception ex) {
             System.out.println("Could not authenticate with the provided credentials " + ex.getMessage());

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java Thu Dec 12 00:27:31 2013
@@ -152,7 +152,7 @@ public class UddiDigitalSignatureTmodel 
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
             return rootAuthToken.getAuthInfo();
         } catch (Exception ex) {
             System.out.println("Could not authenticate with the provided credentials " + ex.getMessage());

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindBinding.java Thu Dec 12 00:27:31 2013
@@ -69,8 +69,8 @@ public class UddiFindBinding {
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
-
+            
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
             FindService fs = new FindService();
             fs.getName().add(new Name());
             fs.getName().get(0).setValue("%");

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiGetServiceDetails.java Thu Dec 12 00:27:31 2013
@@ -70,7 +70,7 @@ public class UddiGetServiceDetails {
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
 
             GetServiceDetail fs = new GetServiceDetail();
             fs.setAuthInfo(rootAuthToken.getAuthInfo());

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiRelatedBusinesses.java Thu Dec 12 00:27:31 2013
@@ -76,10 +76,10 @@ public class UddiRelatedBusinesses {
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
 
             AuthToken UDDIAuthToken = security.getAuthToken(getAuthTokenUDDI);
-            System.out.println("UDDI AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("UDDI AUTHTOKEN = " + "***** don't log auth tokens");
 
 
 

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribe.java Thu Dec 12 00:27:31 2013
@@ -114,7 +114,7 @@ public class UddiSubscribe {
 
         // Making API call that retrieves the authentication token for the 'root' user.
         AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-        System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+        System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
 
 
         getAuthTokenRoot = new GetAuthToken();
@@ -123,7 +123,7 @@ public class UddiSubscribe {
 
         // Making API call that retrieves the authentication token for the 'root' user.
         AuthToken uddiAuthToken = security.getAuthToken(getAuthTokenRoot);
-        System.out.println("uddi AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+        System.out.println("uddi AUTHTOKEN = " + "***** don't log auth tokens");
 
         //first publish a business user the user uddi
         BusinessEntity myBusEntity = new BusinessEntity();

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeGet.java Thu Dec 12 00:27:31 2013
@@ -78,7 +78,7 @@ public class UddiSubscribeGet {
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
             List<Subscription> subscriptions = uddiSubscriptionService.getSubscriptions((rootAuthToken.getAuthInfo()));
             for (int i = 0; i < subscriptions.size(); i++) {
                 System.out.println("===============================");

Modified: juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiSubscribeValidate.java Thu Dec 12 00:27:31 2013
@@ -81,7 +81,7 @@ public class UddiSubscribeValidate {
 
             // Making API call that retrieves the authentication token for the 'root' user.
             AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
-            System.out.println("root AUTHTOKEN = " + rootAuthToken.getAuthInfo());
+            System.out.println("root AUTHTOKEN = " + "***** don't log auth tokens");
 
             DatatypeFactory df = DatatypeFactory.newInstance();
             GregorianCalendar gcal = new GregorianCalendar();

Modified: juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/main/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRS.java Thu Dec 12 00:27:31 2013
@@ -193,7 +193,7 @@ public class UDDIInquiryJAXRS {
 
         @GET
         @Path("/XML/getDetail")
-        @Produces("application/json")
+        @Produces("application/xml")
         @org.apache.cxf.jaxrs.model.wadl.Description("Returns the details of a UDDI entity in XML, use query parameters"
                 + "serviceKey,businessKey,tModelKey, bindingKey")
         public Object getDetailXML(@QueryParam("serviceKey") String serviceKey,

Added: juddi/branches/juddi-3.3.x/juddi-tck-runner/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-tck-runner/pom.xml?rev=1550327&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/pom.xml (added)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/pom.xml Thu Dec 12 00:27:31 2013
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.juddi</groupId>
+    <artifactId>juddi-parent</artifactId>
+    <version>3.3.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.juddi</groupId>
+  <artifactId>juddi-tck-runner</artifactId>
+  <version>3.3-SNAPSHOT</version>
+  <name>juddi-tck-runner</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>juddi-client</artifactId>
+      <version>3.3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>uddi-tck-base</artifactId>
+      <version>3.3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>uddi-tck</artifactId>
+      <version>3.3.0-SNAPSHOT</version>
+    </dependency>
+			<dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-tck</artifactId>
+            <type>test-jar</type>
+            <version>${project.parent.version}</version>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>uddi-tck-base</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+  </dependencies>
+  <build>
+		<finalName>${artifactId}-${version}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.1</version>
+				<executions>
+					<execution>
+						<phase>test</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<copy file="${basedir}/uddi.xml" tofile="${basedir}/target/uddi.xml"/>
+								<copy file="${basedir}/tck.properties" tofile="${basedir}/target/tck.properties"/>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<archive>
+						<manifest>
+							<mainClass>org.apache.juddi.tckrunner.App</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Added: 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=1550327&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java (added)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java Thu Dec 12 00:27:31 2013
@@ -0,0 +1,54 @@
+package org.apache.juddi.tckrunner;
+
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+
+/**
+ * Hello world!
+ *
+ */
+public class App {
+
+        public static void main(String[] args) {
+                System.out.println("Hello World!");
+
+                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,
+                        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_040_BusinessServiceIntegrationTest.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,
+                        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);
+
+                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++){
+                        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());
+                        }
+        }
+}

Added: 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=1550327&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties (added)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties Thu Dec 12 00:27:31 2013
@@ -0,0 +1,39 @@
+#some user with administrative rights
+root.publisher = root
+root.password  = root
+
+#the rest of these are regular users with basic CRUD permissions
+uddi.publisher = uddi
+uddi.password  = uddi
+joe.publisher  = joepublisher
+joe.password   = joepublisher
+sam.publisher  = ssyndicator
+sam.password   = ssyndicator
+mary.publisher = marypublisher
+mary.password  = marypublisher
+riftsaw.publisher = riftsaw
+riftsaw.password  = riftsaw
+
+#if this is a jUDDI server, use true, otherwise false
+isJuddi = true
+
+# does the UDDI server support RMI transport?
+rmi.enabled=true
+
+#authentication mechanism, uddi=auth token, http for everything else.
+# in general, MS UDDI = HTTP, all others use Auth Token
+auth_mode = uddi
+
+#does the UDDI server support HTTP GET/REST specification identified by the spec?
+rest.enabled = true
+
+#does the UDDI server support the Value Set Validation APIs?
+vsv.enabled = true
+#does the UDDI server support the Subscription API?
+sub.enabled=true
+#does the UDDI server support the Custody Transfer API?
+transfer.enabled=true
+#does the UDDI server support the Replication API?
+replication.enabled=true
+
+

Added: juddi/branches/juddi-3.3.x/juddi-tck-runner/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-tck-runner/uddi.xml?rev=1550327&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/uddi.xml (added)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/uddi.xml Thu Dec 12 00:27:31 2013
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
+    <reloadDelay>5000</reloadDelay>
+    <client name="test-client">
+        <nodes>
+            <node isHomeJUDDI="true" >
+                <!-- required 'default' node -->
+                <name>default</name> 
+                <description>Main jUDDI node</description>
+                <properties>
+                    <property name="serverName" value="localhost" />
+                    <property name="serverPort" value="8080" />
+                    <!-- for UDDI nodes that use HTTP u/p, using the following 
+                    <property name="basicAuthUsername" value="root" />
+                    <property name="basicAuthPassword" value="password" />
+                    <property name="basicAuthPasswordIsEncrypted" value="false" />
+                    <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+                </properties>
+                <!-- JAX-WS Transport -->
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+				
+                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+				<!-- optional API -->
+				<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest/XML/getDetail</inquiryRESTUrl>
+                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
+                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
+				<replicationUrl>http://${serverName}:${serverPort}/juddiv3/services/replication?wsdl</replicationUrl>
+				<valueSetValidationUrl>http://${serverName}:${serverPort}/juddiv3/services/valueset-validation</valueSetValidationUrl>
+				<valueSetCachingUrl>http://${serverName}:${serverPort}/juddiv3/services/valueset-caching</valueSetCachingUrl>
+				<!-- optional -->
+                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+
+            </node>
+
+        </nodes>
+		
+        <clerks registerOnStartup="false" >
+            <clerk name="default" node="default" publisher="userjoe" password="******" >
+                <!--<wsdl businessKey="" businessName="" keyDomain=""></wsdl>-->
+                <class></class>
+            </clerk>
+        </clerks>
+        <signature>
+			<!-- signing stuff -->
+			<signingKeyStorePath>keystore.jks</signingKeyStorePath>
+			<signingKeyStoreType>JKS</signingKeyStoreType>
+			<signingKeyStoreFilePassword 
+				isPasswordEncrypted="false" 
+				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+			<signingKeyPassword
+				isPasswordEncrypted="false" 
+				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+			<signingKeyAlias>my special key</signingKeyAlias>
+                        
+			<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+			<signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
+			<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+
+			<!-- validation stuff 
+			Used whenever someone views an entity that is signed and validation is required	-->
+			<!-- if this doesn't exist or is incorrect, the client will atempt to load the standard jdk trust store-->
+			<trustStorePath>truststore.jks</trustStorePath>
+			<trustStoreType>JKS</trustStoreType>
+			<trustStorePassword
+				isPasswordEncrypted="false" 
+				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+			
+			<checkTimestamps>true</checkTimestamps>
+			<checkTrust>true</checkTrust>
+			<checkRevocationCRL>true</checkRevocationCRL>
+			<keyInfoInclusionSubjectDN>false</keyInfoInclusionSubjectDN>
+			<keyInfoInclusionSerial>false</keyInfoInclusionSerial>
+			<keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+			<digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
+		</signature>
+        <subscriptionCallbacks>
+            <keyDomain>uddi:somebusiness</keyDomain>
+            <listenUrl>http://MyHostname:4444/callback</listenUrl>
+            <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+            <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+            <signatureBehavior>DoNothing</signatureBehavior>
+            <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+        </subscriptionCallbacks>
+        <XtoWsdl>
+            <IgnoreSSLErrors>false</IgnoreSSLErrors>
+        </XtoWsdl>
+    </client>
+</uddi>
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml Thu Dec 12 00:27:31 2013
@@ -58,10 +58,10 @@
 		<maxInClause>1000</maxInClause>
 
 		<!-- The maximum number of UDDI artifacts allowed per publisher. A value of '-1' indicates any  number of artifacts is valid (These values can be overridden at the individual publisher level).-->
-		<maxBusinessesPerPublisher>100</maxBusinessesPerPublisher>
-		<maxServicesPerBusiness>100</maxServicesPerBusiness>
-		<maxBindingsPerService>100</maxBindingsPerService>
-		<maxTModelsPerPublisher>100</maxTModelsPerPublisher>
+		<maxBusinessesPerPublisher>-1</maxBusinessesPerPublisher>
+		<maxServicesPerBusiness>-1</maxServicesPerBusiness>
+		<maxBindingsPerService>-1</maxBindingsPerService>
+		<maxTModelsPerPublisher>-1</maxTModelsPerPublisher>
 
 		<!-- Days before a transfer request expires-->
 		<transfer>

Modified: juddi/branches/juddi-3.3.x/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/pom.xml?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/pom.xml (original)
+++ juddi/branches/juddi-3.3.x/pom.xml Thu Dec 12 00:27:31 2013
@@ -281,6 +281,7 @@
 		<module>juddi-gui</module>
 		<module>juddi-tomcat</module>
 		<module>uddi-tck</module>
+		<module>juddi-tck-runner</module>
         
   </modules>
 	<distributionManagement>

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=1550327&r1=1550326&r2=1550327&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 Thu Dec 12 00:27:31 2013
@@ -14,85 +14,179 @@
  */
 package org.apache.juddi.v3.tck;
 
+import java.io.File;
+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>
  */
-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 SAM_SYNDICATOR_XML   = "uddi_data/samsyndicator/publisher.xml";
-    public final static String MARY_PUBLISHER_XML   = "uddi_data/marypublisher/publisher.xml";
-    
-	static {
-		try {
-			InputStream inputSteam = TckPublisher.class.getResourceAsStream("/tck.properties");
-			tckProperties.load(inputSteam);
-		} catch (IOException ioe) {
-			ioe.printStackTrace();
-		}
-	}
-
-  
-    public final static String getRootPublisherId() {
-    	return tckProperties.getProperty(Property.ROOT_PUBLISHER);
-    }
-    
-    public final static String getRootPassword() {
-    	return tckProperties.getProperty(Property.ROOT_PASSWORD);
-    }
-    
-    public final static String getUDDIPublisherId() {
-    	return tckProperties.getProperty(Property.UDDI_PUBLISHER);
-    }
-    
-    public final static String getUDDIPassword() {
-    	return tckProperties.getProperty(Property.UDDI_PASSWORD);
-    }
-    
-    public final static String getJoePublisherId() {
-    	return tckProperties.getProperty(Property.JOE_PUBLISHER);
-    }
-    
-    public final static String getJoePassword() {
-    	return tckProperties.getProperty(Property.JOE_PASSWORD);
-    }
-    
-    public final static String getTModelPublisherId() {
-    	return tckProperties.getProperty(Property.TMODEL_PUBLISHER);
-    }
-    
-    public final static String getTModelPassword() {
-    	return tckProperties.getProperty(Property.TMODEL_PASSWORD);
-    }
-    
-    public final static String getSamPublisherId() {
-    	return tckProperties.getProperty(Property.SAM_PUBLISHER);
-    }
-    
-    public final static String getSamPassword() {
-    	return tckProperties.getProperty(Property.SAM_PASSWORD);
-    }
-    
-    public final static String getMaryPublisherId() {
-    	return tckProperties.getProperty(Property.MARY_PUBLISHER);
-    }
-    
-    public final static String getMaryPassword() {
-    	return tckProperties.getProperty(Property.MARY_PASSWORD);
-    }
-    
-    public final static String getRiftSawPublisherId() {
-    	return tckProperties.getProperty(Property.RIFTSAW_PUBLISHER);
-    }
-    
-    public final static String getRiftSawPassword() {
-    	return tckProperties.getProperty(Property.RIFTSAW_PASSWORD);
-    }
+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 SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml";
+        public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml";
+
+        static {
+                InputStream inputSteam = null;
+                try {
+                        File f = new File("tck.properties");
+
+                        if (f.exists()) {
+                                inputSteam = new FileInputStream(f);
+                        } else {
+                                inputSteam = TckPublisher.class.getResourceAsStream("/tck.properties");
+                        }
+                        tckProperties.load(inputSteam);
+                } catch (IOException ioe) {
+                        ioe.printStackTrace();
+                } finally {
+                        if (inputSteam != null) {
+                                try {
+                                        inputSteam.close();
+                                } catch (Exception ex) {
+                                }
+                        }
+                }
+        }
+
+        public final static String getRootPublisherId() {
+                return tckProperties.getProperty(Property.ROOT_PUBLISHER);
+        }
+
+        public final static String getRootPassword() {
+                return tckProperties.getProperty(Property.ROOT_PASSWORD);
+        }
+
+        public final static String getUDDIPublisherId() {
+                return tckProperties.getProperty(Property.UDDI_PUBLISHER);
+        }
+
+        public final static String getUDDIPassword() {
+                return tckProperties.getProperty(Property.UDDI_PASSWORD);
+        }
+
+        public final static String getJoePublisherId() {
+                return tckProperties.getProperty(Property.JOE_PUBLISHER);
+        }
+
+        public final static String getJoePassword() {
+                return tckProperties.getProperty(Property.JOE_PASSWORD);
+        }
+
+        public final static String getTModelPublisherId() {
+                return tckProperties.getProperty(Property.TMODEL_PUBLISHER);
+        }
+
+        public final static String getTModelPassword() {
+                return tckProperties.getProperty(Property.TMODEL_PASSWORD);
+        }
+
+        public final static String getSamPublisherId() {
+                return tckProperties.getProperty(Property.SAM_PUBLISHER);
+        }
+
+        public final static String getSamPassword() {
+                return tckProperties.getProperty(Property.SAM_PASSWORD);
+        }
+
+        public final static String getMaryPublisherId() {
+                return tckProperties.getProperty(Property.MARY_PUBLISHER);
+        }
+
+        public final static String getMaryPassword() {
+                return tckProperties.getProperty(Property.MARY_PASSWORD);
+        }
+
+        public final static String getRiftSawPublisherId() {
+                return tckProperties.getProperty(Property.RIFTSAW_PUBLISHER);
+        }
+
+        public final static String getRiftSawPassword() {
+                return tckProperties.getProperty(Property.RIFTSAW_PASSWORD);
+        }
+
+        static boolean isUDDIAuthMode() {
+                String x = tckProperties.getProperty("auth_mode");
+                if (x != null && x.equalsIgnoreCase("uddi")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isReplicationEnabled() {
+                String x = tckProperties.getProperty("replication.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isInquiryRestEnabled() {
+                String x = tckProperties.getProperty("rest.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isValueSetAPIEnabled() {
+                String x = tckProperties.getProperty("vsv.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isSubscriptionEnabled() {
+                String x = tckProperties.getProperty("sub.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isCustodyTransferEnabled() {
+                String x = tckProperties.getProperty("transfer.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isJUDDI() {
+                String x = tckProperties.getProperty("isJuddi");
+                if (x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static boolean isRMI() {
+                String x = tckProperties.getProperty("rmi.enabled");
+                if (x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        static int getMaxLoadServices() {
+                String x = tckProperties.getProperty("loadtest.maxbusinesses");
+                if (x != null) {
+                        try {
+                                return Integer.parseInt(x);
+                        } catch (Exception ex) {
+                                ex.printStackTrace();
+                        }
+                }
+
+                return 1100;
+        }
 }
\ 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=1550327&r1=1550326&r2=1550327&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 Thu Dec 12 00:27:31 2013
@@ -15,6 +15,7 @@
 package org.apache.juddi.v3.tck;
 
 import java.rmi.RemoteException;
+import javax.xml.ws.BindingProvider;
 
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.v3_service.UDDISecurityPortType;
@@ -26,6 +27,8 @@ public class TckSecurity {
 
 	public static String getAuthToken(UDDISecurityPortType securityService, String pubId, String cred) throws DispositionReportFaultMessage, RemoteException {
 	
+                if (!TckPublisher.isUDDIAuthMode())
+                        return null;
 		org.uddi.api_v3.GetAuthToken ga = new org.uddi.api_v3.GetAuthToken();
 		ga.setUserID(pubId);
 		ga.setCred(cred);
@@ -35,4 +38,9 @@ public class TckSecurity {
 		return token.getAuthInfo();
 	}
 
+        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/TckSubscription.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java Thu Dec 12 00:27:31 2013
@@ -66,12 +66,12 @@ public class TckSubscription 
 	
 	private Log logger = LogFactory.getLog(this.getClass());
     UDDISubscriptionPortType subscription = null;
-	UDDISecurityPortType security = null;
+//	UDDISecurityPortType security = null;
 	
-	public TckSubscription(UDDISubscriptionPortType subscription, UDDISecurityPortType security) {
+	public TckSubscription(UDDISubscriptionPortType subscription) {
 		super();
 		this.subscription = subscription;
-		this.security = security;
+	//	this.security = security;
 	}
 
 	public void saveJoePublisherSubscription(String authInfoJoe, String subscriptionXML,String subscriptionKey) {



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