juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject [2/6] git commit: JUDDI-856 added but needs testing JUDDI-751 refactor for rmi, http and smtp
Date Fri, 28 Feb 2014 17:34:40 GMT
JUDDI-856 added but needs testing
JUDDI-751 refactor for rmi, http and smtp


Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/f0099f0d
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/f0099f0d
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/f0099f0d

Branch: refs/heads/master
Commit: f0099f0da89269b4073485e460b1b9fbfa729737
Parents: c11d3d8
Author: alexoree <alexoree@apache.org>
Authored: Tue Feb 25 21:17:32 2014 -0500
Committer: alexoree <alexoree@apache.org>
Committed: Tue Feb 25 21:17:32 2014 -0500

----------------------------------------------------------------------
 .../juddi/api/impl/AuthenticatedService.java    |   2 +-
 .../java/org/apache/juddi/config/Property.java  |   9 +
 .../org/apache/juddi/v3/auth/Authenticator.java |  11 +-
 .../v3/auth/CryptedXMLDocAuthenticator.java     |   3 +
 .../v3/auth/HTTPContainerAuthenticator.java     | 115 +++++
 .../juddi/v3/auth/HTTPHeaderAuthenticator.java  | 120 +++++
 .../juddi/v3/auth/JUDDIAuthenticator.java       |   3 +-
 .../v3/auth/LdapExpandedAuthenticator.java      |   3 +-
 .../juddi/v3/auth/LdapSimpleAuthenticator.java  |   3 +-
 .../juddi/v3/auth/XMLDocAuthenticator.java      |   5 +-
 .../src/main/resources/messages.properties      |   3 +-
 uddi-migration-tool/pom.xml                     |   2 +-
 .../juddi/v3/tck/TckSubscriptionListener.java   |  79 ++-
 .../v3/tck/TckSubscriptionListenerRMI.java      |   2 +
 uddi-tck-base/src/main/resources/tck.properties |   2 +-
 .../subscriptionnotifier/subscription2RMI.xml   |  32 ++
 .../subscriptionnotifier/subscription3RMI.xml   |  32 ++
 uddi-tck-runner/pom.xml                         |   6 +-
 .../java/org/apache/juddi/tckrunner/App.java    |  34 +-
 .../v2/tck/UDDI_020_TmodelIntegrationTest.java  |   4 +-
 .../UDDI_030_BusinessEntityIntegrationTest.java |   4 +-
 ...UDDI_040_BusinessServiceIntegrationTest.java |   4 +-
 ...UDDI_050_BindingTemplateIntegrationTest.java |   4 +-
 ...I_060_PublisherAssertionIntegrationTest.java |   4 +-
 .../tck/UDDI_070_FindEntityIntegrationTest.java |   4 +-
 .../UDDI_110_FindBusinessIntegrationTest.java   |   4 +-
 .../tck/JUDDI_010_PublisherIntegrationTest.java |   3 +-
 ..._RMISubscriptionListenerIntegrationTest.java |   3 +-
 ...0_ClientSubscriptionInfoIntegrationTest.java |   4 +-
 ...tSubscriptionCallbackAPIIntegrationTest.java |   4 +-
 .../v3/tck/JUDDI_200_GUI_IntegrationTest.java   |   1 +
 .../tck/UDDI_010_PublisherIntegrationTest.java  |   4 +
 .../v3/tck/UDDI_020_TmodelIntegrationTest.java  |   4 +-
 .../UDDI_030_BusinessEntityIntegrationTest.java |  17 +-
 ...I_030_BusinessEntityLoadIntegrationTest.java |   4 +-
 ...UDDI_040_BusinessServiceIntegrationTest.java |   4 +-
 ...UDDI_050_BindingTemplateIntegrationTest.java |   4 +-
 ...I_060_PublisherAssertionIntegrationTest.java |   4 +-
 .../tck/UDDI_070_FindEntityIntegrationTest.java |   4 +-
 .../UDDI_080_SubscriptionIntegrationTest.java   |   4 +-
 .../juddi/v3/tck/UDDI_090_HttpExternalTest.java | 170 +++++++
 .../tck/UDDI_090_HttpMavenIntegrationTest.java  | 155 ++++++
 .../v3/tck/UDDI_090_RMIIntegrationTest.java     | 160 ++++++
 .../v3/tck/UDDI_090_Smtp_ExternalTest.java      | 229 +++++++++
 ...DI_090_SubscriptionListenerExternalTest.java |   4 +-
 ...090_SubscriptionListenerIntegrationBase.java | 509 +++++++++++++++++++
 ...090_SubscriptionListenerIntegrationTest.java |   4 +-
 .../UDDI_110_FindBusinessIntegrationTest.java   |   4 +-
 ...eCategoryBagsFindServiceIntegrationTest.java |   4 +-
 ...CategoryBagsFindBusinessIntegrationTest.java |   4 +-
 ..._140_NegativePublicationIntegrationTest.java |   4 +-
 .../v3/tck/UDDI_141_JIRAIntegrationTest.java    |   4 +-
 ...DDI_142_DigitalSignatureIntegrationTest.java |   4 +-
 ...UDDI_150_CustodyTransferIntegrationTest.java |   4 +-
 .../v3/tck/UDDI_160_RESTIntergrationTest.java   |   4 +-
 .../v3/tck/UDDI_170_ValueSetValidation.java     |   4 +-
 56 files changed, 1712 insertions(+), 113 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
index 052c21e..38665b6 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
@@ -137,7 +137,7 @@ public abstract class AuthenticatedService {
                     
                 }
 		Authenticator authenticator = AuthenticatorFactory.getAuthenticator();
-		UddiEntityPublisher entityPublisher = authenticator.identify(authInfo, modelAuthToken.getAuthorizedName());
+		UddiEntityPublisher entityPublisher = authenticator.identify(authInfo, modelAuthToken.getAuthorizedName(), ctx);
 		
 		// Must make sure the returned publisher has all the necessary fields filled
 		if (entityPublisher == null) {

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/config/Property.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Property.java b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
index 0168c86..358da8d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/Property.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
@@ -68,6 +68,9 @@ public interface Property {
      */
     public final static String JUDDI_AUTH_TOKEN_ENFORCE_SAME_IP = "juddi.auth.token.enforceSameIPRule";
     
+    /**
+     * This points to the class of the authenticator
+     */
     public final static String JUDDI_AUTHENTICATOR = "juddi.auth.authenticator.class";
     /**
      * @see LdapSimpleAuthenticator
@@ -175,4 +178,10 @@ public interface Property {
      * @since 3.2, used for Apache Commons Configuration XML config file
      */
     public static final String ENCRYPTED_ATTRIBUTE="[@encrypted]";
+    
+    /**
+     * Used for HTTP Header based authentication for web proxies
+     * @since 3.2.1
+     */
+    public static final String JUDDI_AUTHENTICATOR_HTTP_HEADER_NAME="juddi.auth.authenticator.header";
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/Authenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/Authenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/Authenticator.java
index 3799d89..35bb1b3 100644
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/Authenticator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/Authenticator.java
@@ -17,6 +17,7 @@
 
 package org.apache.juddi.v3.auth;
 
+import javax.xml.ws.WebServiceContext;
 import org.apache.juddi.model.UddiEntityPublisher;
 import org.apache.juddi.v3.error.AuthenticationException;
 import org.apache.juddi.v3.error.FatalErrorException;
@@ -36,13 +37,15 @@ import org.apache.juddi.v3.error.FatalErrorException;
 public interface Authenticator {
 
 	/**
-	 * 
+	 * This function is called from the Security API's GetAuthToken().
+         * 
 	 * @param authorizedName - userId of the user making the registry request
 	 * @param cred   - some authentical creditial (i.e. a password) which can be used to 
 	 * 		           authenticate the user.
 	 * 
 	 * @return The publisherID for this user
-	 * @throws {@link AuthenticationException}, {@link FatalErrorException}
+         * @throws org.apache.juddi.v3.error.AuthenticationException
+         * @throws org.apache.juddi.v3.error.FatalErrorException
 	 */
 	String authenticate(String authorizedName, String cred) throws AuthenticationException, FatalErrorException;
 	
@@ -51,8 +54,8 @@ public interface Authenticator {
 	 * 
 	 * @param authInfo - the authorization token
 	 * @param authorizedName - the authorized Name
-	 * 
+	 * @param ctx - WebServiceContext, used for HTTP based authentication if desired (since 3.2.1)
 	 * @return - The entity publisher
 	 */
-	UddiEntityPublisher identify(String authInfo, String authorizedName) throws AuthenticationException, FatalErrorException;
+	UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException, FatalErrorException;
 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java
index 117606b..eab3420 100644
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java
@@ -65,6 +65,9 @@ public class CryptedXMLDocAuthenticator extends XMLDocAuthenticator {
 	}
 	/**
 	 *
+         * @return user id
+         * @throws org.apache.juddi.v3.error.AuthenticationException 
+         * @throws org.apache.juddi.v3.error.FatalErrorException 
 	 */
 	public String authenticate(String userID, String credential)
 	throws AuthenticationException, FatalErrorException {

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPContainerAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPContainerAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPContainerAuthenticator.java
new file mode 100644
index 0000000..35b3123
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPContainerAuthenticator.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.auth;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.PersistenceManager;
+import org.apache.juddi.config.Property;
+import org.apache.juddi.model.Publisher;
+import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.v3.error.AuthenticationException;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.FatalErrorException;
+import org.apache.juddi.v3.error.UnknownUserException;
+
+/**
+ * This authenticator trust's what's provided by the container, such as HTTP
+ * BASIC, DIGEST, or CLIENT CERT
+ *
+ * @author Alex O'Ree
+ */
+public class HTTPContainerAuthenticator implements Authenticator {
+
+        private Log log = LogFactory.getLog(this.getClass());
+        @Override
+        public String authenticate(String authorizedName, String cred) throws AuthenticationException, FatalErrorException {
+                throw new UnknownUserException(new ErrorMessage("errros.UnsupportedAuthenticator"));
+        }
+
+        @Override
+        public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException, FatalErrorException {
+                int MaxBindingsPerService = -1;
+                int MaxServicesPerBusiness = -1;
+                int MaxTmodels = -1;
+                int MaxBusinesses = -1;
+                try {
+                        MaxBindingsPerService = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_BINDINGS_PER_SERVICE, -1);
+                        MaxServicesPerBusiness = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_SERVICES_PER_BUSINESS, -1);
+                        MaxTmodels = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_TMODELS_PER_PUBLISHER, -1);
+                        MaxBusinesses = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_BUSINESSES_PER_PUBLISHER, -1);
+                } catch (Exception ex) {
+                        MaxBindingsPerService = -1;
+                        MaxServicesPerBusiness = -1;
+                        MaxTmodels = -1;
+                        MaxBusinesses = -1;
+                        log.error("config exception! " + authorizedName, ex);
+                }
+                EntityManager em = PersistenceManager.getEntityManager();
+                EntityTransaction tx = em.getTransaction();
+                try {
+                        String user = null;
+                        if (ctx==null)
+                                throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher", "no web service context!"));
+                        if (ctx.getUserPrincipal() != null) {
+                                user = ctx.getUserPrincipal().getName();
+                        }
+                        if (user == null) {
+                                MessageContext mc = ctx.getMessageContext();
+                                HttpServletRequest req = null;
+                                if (mc != null) {
+                                        req = (HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST);
+                                }
+                                if (req != null && req.getUserPrincipal()!=null) {
+                                        user = req.getUserPrincipal().getName();
+                                }
+                        }
+                        if (user==null || user.length()==0){
+                                throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher"));
+                        }
+                        tx.begin();
+                        Publisher publisher = em.find(Publisher.class, user);
+                        if (publisher == null) {
+                                log.warn("Publisher \"" + authorizedName + "\" was not found, adding the publisher in on the fly.");
+                                publisher = new Publisher();
+                                publisher.setAuthorizedName(authorizedName);
+                                publisher.setIsAdmin("false");
+                                publisher.setIsEnabled("true");
+                                publisher.setMaxBindingsPerService(MaxBindingsPerService);
+                                publisher.setMaxBusinesses(MaxBusinesses);
+                                publisher.setMaxServicesPerBusiness(MaxServicesPerBusiness);
+                                publisher.setMaxTmodels(MaxTmodels);
+                                publisher.setPublisherName("Unknown");
+                                em.persist(publisher);
+                                tx.commit();
+                        }
+                        
+                        return publisher;
+                } finally {
+                        if (tx.isActive()) {
+                                tx.rollback();
+                        }
+                        em.close();
+                }
+        }
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPHeaderAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPHeaderAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPHeaderAuthenticator.java
new file mode 100644
index 0000000..902d1e5
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/HTTPHeaderAuthenticator.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.auth;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.PersistenceManager;
+import org.apache.juddi.config.Property;
+import org.apache.juddi.model.Publisher;
+import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.v3.error.AuthenticationException;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.FatalErrorException;
+import org.apache.juddi.v3.error.UnknownUserException;
+
+/**
+ * Authenticates via a trusted web proxy via an HTTP HEADER. <br>
+ * Examples:<ul>
+ * <li>via Apache HTTPD</li>
+ * <li>Bluecoat</li>
+ * <li>Reverse SSL Proxies</li>
+ * </ul>
+ * Requires the config setting:
+ * {@link Property#JUDDI_AUTHENTICATOR_HTTP_HEADER_NAME}
+ *
+ * @author Alex O'Ree
+ */
+public class HTTPHeaderAuthenticator implements Authenticator {
+
+        private Log log = LogFactory.getLog(this.getClass());
+
+        @Override
+        public String authenticate(String authorizedName, String cred) throws AuthenticationException, FatalErrorException {
+                throw new UnknownUserException(new ErrorMessage("errros.UnsupportedAuthenticator"));
+        }
+
+        @Override
+        public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException, FatalErrorException {
+                int MaxBindingsPerService = -1;
+                int MaxServicesPerBusiness = -1;
+                int MaxTmodels = -1;
+                int MaxBusinesses = -1;
+                String http_header_name = null;
+                try {
+                        http_header_name = AppConfig.getConfiguration().getString(Property.JUDDI_AUTHENTICATOR_HTTP_HEADER_NAME);
+                        MaxBindingsPerService = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_BINDINGS_PER_SERVICE, -1);
+                        MaxServicesPerBusiness = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_SERVICES_PER_BUSINESS, -1);
+                        MaxTmodels = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_TMODELS_PER_PUBLISHER, -1);
+                        MaxBusinesses = AppConfig.getConfiguration().getInt(Property.JUDDI_MAX_BUSINESSES_PER_PUBLISHER, -1);
+                } catch (Exception ex) {
+                        MaxBindingsPerService = -1;
+                        MaxServicesPerBusiness = -1;
+                        MaxTmodels = -1;
+                        MaxBusinesses = -1;
+                        log.error("config exception! " + authorizedName, ex);
+                }
+                if (http_header_name == null) {
+                        throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher", "misconfiguration!"));
+                }
+                EntityManager em = PersistenceManager.getEntityManager();
+                EntityTransaction tx = em.getTransaction();
+                try {
+                        String user = null;
+
+                        MessageContext mc = ctx.getMessageContext();
+                        HttpServletRequest req = null;
+                        if (mc != null) {
+                                req = (HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST);
+                                user = req.getHeader(http_header_name);
+                        }
+                        
+                        if (user == null || user.length() == 0) {
+                                throw new UnknownUserException(new ErrorMessage("errors.auth.NoPublisher"));
+                        }
+                        tx.begin();
+                        Publisher publisher = em.find(Publisher.class, user);
+                        if (publisher == null) {
+                                log.warn("Publisher \"" + authorizedName + "\" was not found, adding the publisher in on the fly.");
+                                publisher = new Publisher();
+                                publisher.setAuthorizedName(authorizedName);
+                                publisher.setIsAdmin("false");
+                                publisher.setIsEnabled("true");
+                                publisher.setMaxBindingsPerService(MaxBindingsPerService);
+                                publisher.setMaxBusinesses(MaxBusinesses);
+                                publisher.setMaxServicesPerBusiness(MaxServicesPerBusiness);
+                                publisher.setMaxTmodels(MaxTmodels);
+                                publisher.setPublisherName("Unknown");
+                                em.persist(publisher);
+                                tx.commit();
+                        }
+
+                        return publisher;
+                } finally {
+                        if (tx.isActive()) {
+                                tx.rollback();
+                        }
+                        em.close();
+                }
+        }
+
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
index 0854907..add0e16 100644
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/JUDDIAuthenticator.java
@@ -18,6 +18,7 @@ package org.apache.juddi.v3.auth;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
+import javax.xml.ws.WebServiceContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -100,7 +101,7 @@ public class JUDDIAuthenticator implements Authenticator {
                 }
         }
 
-        public UddiEntityPublisher identify(String authInfo, String authorizedName) throws AuthenticationException {
+        public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException {
                 EntityManager em = PersistenceManager.getEntityManager();
                 EntityTransaction tx = em.getTransaction();
                 try {

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapExpandedAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapExpandedAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapExpandedAuthenticator.java
index 3fb9ca7..eb9018d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapExpandedAuthenticator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapExpandedAuthenticator.java
@@ -25,6 +25,7 @@ import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
+import javax.xml.ws.WebServiceContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -193,7 +194,7 @@ public class LdapExpandedAuthenticator implements Authenticator {
         return authorizedName;
     }
 
-    public UddiEntityPublisher identify(String authInfo, String authorizedName) throws AuthenticationException, FatalErrorException {
+    public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException, FatalErrorException {
         EntityManager em = PersistenceManager.getEntityManager();
         EntityTransaction tx = em.getTransaction();
         try {

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java
index c97ec96..f8793bf 100644
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/LdapSimpleAuthenticator.java
@@ -23,6 +23,7 @@ import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
+import javax.xml.ws.WebServiceContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -194,7 +195,7 @@ public class LdapSimpleAuthenticator implements Authenticator {
         return authorizedName;
     }
 
-    public UddiEntityPublisher identify(String authInfo, String authorizedName) throws AuthenticationException, FatalErrorException {
+    public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException, FatalErrorException {
         EntityManager em = PersistenceManager.getEntityManager();
         EntityTransaction tx = em.getTransaction();
         try {

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
index 09fbf6c..5264885 100644
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
@@ -31,6 +31,7 @@ import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.WebServiceContext;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
@@ -121,6 +122,8 @@ public class XMLDocAuthenticator implements Authenticator
 
 	/**
 	 *
+         * @param userID
+         * @param credential
 	 */
 	public String authenticate(String userID,String credential)
 	throws AuthenticationException, FatalErrorException
@@ -145,7 +148,7 @@ public class XMLDocAuthenticator implements Authenticator
 		return userID;
 	}
 	
-	public UddiEntityPublisher identify(String authInfo, String authorizedName) throws AuthenticationException {
+	public UddiEntityPublisher identify(String authInfo, String authorizedName, WebServiceContext ctx) throws AuthenticationException {
 
 		EntityManager em = PersistenceManager.getEntityManager();
 		EntityTransaction tx = em.getTransaction();

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index c2e4f95..caf30bc 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -1,4 +1,4 @@
-errors.businessentity.SignedButNoKey#/*
+#/*
 # * Copyright 2001-2008 The Apache Software Foundation.
 # * 
 # * Licensed under the Apache License, Version 2.0 (the "License");
@@ -64,6 +64,7 @@ E_valueNotAllowed=A value did not pass validation because of contextual issues.
 errors.DatatypeFactor=Can't create a DatatypeFactory instance.
 errors.Unspecified=An unspecified error occurred
 errors.Unsupported=This version does not support this feature or API
+errros.UnsupportedAuthenticator=This selected authenticator does not support AuthTokens.
 errors.Unsupported.findQualifier=An invalid or unsupported findQualifier value was passed
 errors.configuration.Retrieval=An error occurred attempting to retrieve configuration information
 errors.install.AlreadyInstalled=It appears that the application is already installed.  Please un-install before proceeding.

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-migration-tool/pom.xml
----------------------------------------------------------------------
diff --git a/uddi-migration-tool/pom.xml b/uddi-migration-tool/pom.xml
index 1459458..a335eb8 100644
--- a/uddi-migration-tool/pom.xml
+++ b/uddi-migration-tool/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.2.1-SNAPSHOT</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
----------------------------------------------------------------------
diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
index ac0e3ef..3ad6da4 100644
--- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
+++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
@@ -14,8 +14,6 @@ package org.apache.juddi.v3.tck;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -85,8 +83,8 @@ public class TckSubscriptionListener {
         private SaveService ss = null;
 
         public TckSubscriptionListener(
-                UDDISubscriptionPortType subscription,
-                UDDIPublicationPortType publication) {
+             UDDISubscriptionPortType subscription,
+             UDDIPublicationPortType publication) {
                 super();
                 this.subscription = subscription;
                 this.publication = publication;
@@ -122,21 +120,29 @@ public class TckSubscriptionListener {
 
         }
 
-        public void saveService(String authInfo, String listenerService, Integer port, String hostname) {
+        /**
+         *
+         * @param authInfo
+         * @param listenerService
+         * @param port
+         * @param hostname
+         * @return the first binding key if it exists
+         */
+        public String 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);
-                                        logger.info("service " + bsIn.getServiceKey() + " access point " + btIn.getAccessPoint().getValue() + " key:" + btIn.getBindingKey());
-                                }
+                        // 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);
+                                logger.info("service " + bsIn.getServiceKey() + " access point " + btIn.getAccessPoint().getValue() + " key:" + btIn.getBindingKey());
+                        }
                         //}
                         ss.getBusinessService().add(bsIn);
                         ServiceDetail bsOut = publication.saveService(ss);
@@ -145,37 +151,54 @@ public class TckSubscriptionListener {
                         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());
-                                        
+                                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");
+                        if (bsOut.getBusinessService().get(0).getBindingTemplates() != null && !bsOut.getBusinessService().get(0).getBindingTemplates().getBindingTemplate().isEmpty()) {
+                                return bsOut.getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey();
+                        }
 
                 } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                         Assert.fail("No exception should be thrown.");
                 }
+                return null;
         }
 
-        public void saveNotifierSubscription(String authInfo, String subscriptionXML) {
-                saveSubscription(authInfo, subscriptionXML, SUBSCRIPTION_KEY);
+        /**
+         * returns subscription key
+         *
+         * @param authInfo
+         * @param subscriptionXML
+         * @return
+         */
+        public String saveNotifierSubscription(String authInfo, String subscriptionXML) {
+                return 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) {
+        /**
+         * returns subscription key
+         *
+         * @param authInfo
+         * @param subscriptionXML
+         * @param subscriptionKey
+         * @return
+         */
+        public String saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey) {
                 try {
-                        logger.info("saving subscription " + subscriptionKey + " " + subscriptionXML + " " + bindingkey);
                         Subscription subIn = (Subscription) EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
+                        logger.info("saving subscription " + subscriptionKey + " " + subscriptionXML + " " + subIn.getBindingKey());
+                        if (subscriptionKey!=null && !subscriptionKey.equalsIgnoreCase(subIn.getSubscriptionKey()))
+                                logger.warn("subscription key mismatch");
                         List<Subscription> subscriptionList = new ArrayList<Subscription>();
                         subscriptionList.add(subIn);
                         Holder<List<Subscription>> subscriptionHolder = new Holder<List<Subscription>>();
@@ -190,12 +213,11 @@ public class TckSubscriptionListener {
                         Assert.assertNotNull(outSubscriptionList);
                         Subscription subOut = outSubscriptionList.get(0);
 
-
-
                         Assert.assertEquals(subDirectOut.getExpiresAfter().getMonth(), subOut.getExpiresAfter().getMonth());
                         Assert.assertEquals(subDirectOut.getExpiresAfter().getDay(), subOut.getExpiresAfter().getDay());
                         Assert.assertEquals(subDirectOut.getExpiresAfter().getYear(), subOut.getExpiresAfter().getYear());
 
+                        return subDirectOut.getSubscriptionKey();
                         //assertEquals(subIn.getSubscriptionFilter().getFindService().getName().get(0).getValue(), 
                         //			 subOut.getSubscriptionFilter().getFindService().getName().get(0).getValue());
 
@@ -203,6 +225,7 @@ public class TckSubscriptionListener {
                         logger.error(e.getMessage(), e);
                         Assert.fail("No exception should be thrown");
                 }
+                return null;
         }
 
         public void deleteSubscription(String authInfo, String subscriptionKey) {
@@ -218,4 +241,4 @@ public class TckSubscriptionListener {
                         Assert.fail("No exception should be thrown.");
                 }
         }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java
----------------------------------------------------------------------
diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java
index 5e36b7d..6a98546 100644
--- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java
+++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListenerRMI.java
@@ -29,6 +29,8 @@ public class TckSubscriptionListenerRMI extends TckSubscriptionListener
 
 	/** note that the subscription1.xml contains the binding template for the UDDI server to call back into */
 	public final static String SUBSCRIPTION_XML_RMI = "uddi_data/subscriptionnotifier/subscription1RMI.xml";
+        public final static String SUBSCRIPTION_XML2_RMI = "uddi_data/subscriptionnotifier/subscription2RMI.xml";
+        public final static String SUBSCRIPTION_XML3_RMI = "uddi_data/subscriptionnotifier/subscription3RMI.xml";
     public final static String SUBSCRIPTION_KEY_RMI = "uddi:uddi.joepublisher.com:subscriptiononermi";
     
     public TckSubscriptionListenerRMI(

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-base/src/main/resources/tck.properties
----------------------------------------------------------------------
diff --git a/uddi-tck-base/src/main/resources/tck.properties b/uddi-tck-base/src/main/resources/tck.properties
index f0e3f6d..27182bb 100644
--- a/uddi-tck-base/src/main/resources/tck.properties
+++ b/uddi-tck-base/src/main/resources/tck.properties
@@ -32,7 +32,7 @@ vsv.enabled = true
 #does the UDDI server support the Subscription API?
 sub.enabled=true
 #subscription callback timeouts, in seconds
-sub.timeout=60
+sub.timeout=15
 
 #does the UDDI server support the Custody Transfer API?
 transfer.enabled=true

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml
new file mode 100644
index 0000000..8554504
--- /dev/null
+++ b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2RMI.xml
@@ -0,0 +1,32 @@
+<?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.
+ *
+ */
+-->
+<subscription xmlns="urn:uddi-org:sub_v3">
+  <subscriptionKey>uddi:uddi.joepublisher.com:subscriptiononermi</subscriptionKey>
+  <subscriptionFilter>
+    <find_business xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+      <findQualifiers>
+        <findQualifier>approximateMatch</findQualifier>
+      </findQualifiers>
+      <name >%</name>
+    </find_business>
+  </subscriptionFilter>
+  <bindingKey xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistenerrmi</bindingKey>
+  <notificationInterval>PT5S</notificationInterval>
+  <maxEntities>1000</maxEntities>
+</subscription>

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml
new file mode 100644
index 0000000..bb87c02
--- /dev/null
+++ b/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription3RMI.xml
@@ -0,0 +1,32 @@
+<?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.
+ *
+ */
+-->
+<subscription xmlns="urn:uddi-org:sub_v3">
+  <subscriptionKey>uddi:uddi.joepublisher.com:subscriptiononermi</subscriptionKey>
+  <subscriptionFilter>
+      <find_tModel xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+      <findQualifiers>
+        <findQualifier>exactMatch</findQualifier>
+      </findQualifiers>
+      <name xml:lang="en">tModel One</name>
+    </find_tModel>
+  </subscriptionFilter>
+  <bindingKey xmlns="urn:uddi-org:api_v3">uddi:uddi.joepublisher.com:bindinglistenerrmi</bindingKey>
+  <notificationInterval>PT5S</notificationInterval>
+  <maxEntities>1000</maxEntities>
+</subscription>

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-runner/pom.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-runner/pom.xml b/uddi-tck-runner/pom.xml
index ee1c44d..a50ed1b 100644
--- a/uddi-tck-runner/pom.xml
+++ b/uddi-tck-runner/pom.xml
@@ -22,17 +22,17 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>juddi-client</artifactId>
-      <version>3.2.1-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>uddi-tck-base</artifactId>
-      <version>3.2.0-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>uddi-tck</artifactId>
-      <version>3.2.0-SNAPSHOT</version>
+      <version>${project.parent.version}</version>
     </dependency>
 			<dependency>
             <groupId>org.apache.juddi</groupId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
----------------------------------------------------------------------
diff --git a/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java b/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
index e623303..d192a2b 100644
--- a/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
+++ b/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
@@ -87,6 +87,8 @@ public class App {
                                 //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.UDDI_090_HttpExternalTest.class,
+                                org.apache.juddi.v3.tck.UDDI_090_Smtp_ExternalTest.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,
@@ -138,17 +140,37 @@ public class App {
 
                 for (int i = 0; i < result.getFailures().size(); i++) {
                         try {
-                                bw.write(result.getFailures().get(i).getTestHeader());
+                                try {
+                                        bw.write(result.getFailures().get(i).getTestHeader());
+                                } catch (Exception ex) {
+                                        bw.write(ex.getMessage());
+                                }
                                 bw.newLine();
-                                bw.write(result.getFailures().get(i).getDescription().getClassName());
+                                try {
+                                        bw.write(result.getFailures().get(i).getDescription().getClassName());
+                                }
+                                catch (Exception ex) {
+                                        bw.write(ex.getMessage());
+                                }
                                 bw.newLine();
-                                bw.write(result.getFailures().get(i).getDescription().getMethodName());
+                                try {
+                                        bw.write(result.getFailures().get(i).getDescription().getMethodName() == null ? "null method!" : result.getFailures().get(i).getDescription().getMethodName());
+                                } catch (Exception ex) {
+                                        bw.write(ex.getMessage());
+                                }
                                 bw.newLine();
-                                bw.write(result.getFailures().get(i).getMessage());
+                                try {
+                                        bw.write(result.getFailures().get(i).getMessage() == null ? "no message" : result.getFailures().get(i).getMessage());
+                                } catch (Exception ex) {
+                                        bw.write(ex.getMessage());
+                                }
                                 bw.newLine();
                                 //result.getFailures().get(i).getException().printStackTrace();
-
-                                bw.write(result.getFailures().get(i).getTrace());
+                                try {
+                                        bw.write(result.getFailures().get(i).getTrace());
+                                } catch (Exception ex) {
+                                        bw.write(ex.getMessage());
+                                }
                                 bw.newLine();
                                 bw.write("____________________________________________");
                                 bw.newLine();

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java
index 75fd720..82c8b5d 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_020_TmodelIntegrationTest.java
@@ -47,7 +47,7 @@ public class UDDI_020_TmodelIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
                 logger.debug("Getting auth tokens..");
@@ -85,7 +85,7 @@ public class UDDI_020_TmodelIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java
index 82ed78f..ef3c635 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_030_BusinessEntityIntegrationTest.java
@@ -50,7 +50,7 @@ public class UDDI_030_BusinessEntityIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -58,7 +58,7 @@ public class UDDI_030_BusinessEntityIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
                 logger.info("UDDI_030_BusinessEntityIntegrationTest");

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java
index 185c2a4..1508f73 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_040_BusinessServiceIntegrationTest.java
@@ -51,7 +51,7 @@ public class UDDI_040_BusinessServiceIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -59,7 +59,7 @@ public class UDDI_040_BusinessServiceIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java
index 3d343c2..324bf72 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_050_BindingTemplateIntegrationTest.java
@@ -46,7 +46,7 @@ public class UDDI_050_BindingTemplateIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModel.deleteCreatedTModels(authInfoJoe);
                 
                 manager.stop();
@@ -54,7 +54,7 @@ public class UDDI_050_BindingTemplateIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java
index 104962f..e5138b5 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_060_PublisherAssertionIntegrationTest.java
@@ -51,7 +51,7 @@ public class UDDI_060_PublisherAssertionIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 tckTModelMary.deleteCreatedTModels(authInfoMary);
@@ -60,7 +60,7 @@ public class UDDI_060_PublisherAssertionIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java
index 744bb4e..50a0a0a 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java
@@ -63,14 +63,14 @@ public class UDDI_070_FindEntityIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModel.deleteCreatedTModels(authInfoJoe);
                 manager.stop();
         }
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java
index c28ad8f..21e5cd6 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java
@@ -64,7 +64,7 @@ public class UDDI_110_FindBusinessIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 tckTModel.deleteCreatedTModels(authInfoJoe);
                 tckTModel01.deleteCreatedTModels(authInfoJoe);
                 tckTModel02.deleteCreatedTModels(authInfoJoe);
@@ -73,7 +73,7 @@ public class UDDI_110_FindBusinessIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
index 8a4bfce..974bdee 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
@@ -59,7 +59,7 @@ public class JUDDI_010_PublisherIntegrationTest {
         @BeforeClass
         public static void startManager() throws ConfigurationException {
                 Assume.assumeTrue(TckPublisher.isJUDDI());
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 
@@ -83,6 +83,7 @@ public class JUDDI_010_PublisherIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+                if (!TckPublisher.isEnabled()) return;
                 manager.stop();
         }
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
index 671c7fd..4e36c5f 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
@@ -59,6 +59,7 @@ public class JUDDI_091_RMISubscriptionListenerIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
+                if (!TckPublisher.isEnabled()) return;
                 manager.stop();
                 //shutting down the TCK SubscriptionListener
                 //re
@@ -67,7 +68,7 @@ public class JUDDI_091_RMISubscriptionListenerIntegrationTest {
         @BeforeClass
         public static void startManager() throws ConfigurationException {
 
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 try {
                         //bring up the RMISubscriptionListener
                         //random port

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
index fb15dde..1034943 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
@@ -52,7 +52,7 @@ public class JUDDI_100_ClientSubscriptionInfoIntegrationTest {
 
         @BeforeClass
         public static void startRegistry() throws ConfigurationException {
-Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 
@@ -81,7 +81,7 @@ Assume.assumeTrue(TckPublisher.isEnabled());
 
         @Test
         public void addClientSubscriptionInfo() throws Exception {
-Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
              Assume.assumeTrue(TckPublisher.isJUDDI());
 
                 ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo();

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
index dff155c..a33b76a 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java
@@ -70,7 +70,7 @@ public class JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest implements I
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
                 Iterator<Node> iterator = manager.getClientConfig().getUDDINodeList().iterator();
@@ -98,7 +98,7 @@ public class JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest implements I
         @Test
         public void SubscriptionCallbackTest1() throws Exception {
                 //first some setup
-                Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 reset();
 
                 TModel createKeyGenator = UDDIClerk.createKeyGenator("somebusiness", "A test key domain SubscriptionCallbackTest1", "SubscriptionCallbackTest1");

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java
index a829dff..743d78d 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java
@@ -53,6 +53,7 @@ public class JUDDI_200_GUI_IntegrationTest {
         @BeforeClass
         public static void startManager() throws ConfigurationException {
 
+                 if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 baseurl = manager.getClientConfig().getConfiguration().getString("client.nodes.node(0).juddigui");
                 if (baseurl != null) {

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
index d7a999f..2f6dee9 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
@@ -36,12 +36,16 @@ public class UDDI_010_PublisherIntegrationTest {
 
 	@BeforeClass
 	public static void startRegistry() throws ConfigurationException {
+                if (!TckPublisher.isEnabled()) return;
+                if (!TckPublisher.isJUDDI()) return;
 		manager  = new UDDIClient();
 		manager.start();
 	}
 	
 	@AfterClass
 	public static void stopRegistry() throws ConfigurationException {
+                if (!TckPublisher.isEnabled()) return;
+                if (!TckPublisher.isJUDDI()) return;
 		manager.stop();
 	}
 	

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
index bc2cc24..fb9c9c8 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
@@ -48,7 +48,7 @@ public class UDDI_020_TmodelIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-Assume.assumeTrue(TckPublisher.isEnabled());
+if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
                 logger.debug("Getting auth tokens..");
@@ -87,7 +87,7 @@ Assume.assumeTrue(TckPublisher.isEnabled());
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
index 77a8853..81f0bbe 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
@@ -51,7 +51,9 @@ public class UDDI_030_BusinessEntityIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) {
+                        return;
+                }
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -59,7 +61,7 @@ public class UDDI_030_BusinessEntityIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+                if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
                 logger.info("UDDI_030_BusinessEntityIntegrationTest");
@@ -108,7 +110,6 @@ public class UDDI_030_BusinessEntityIntegrationTest {
                         tckTModelUddi.saveUDDIPublisherTmodel(authInfoUDDI);
                         tckTModelUddi.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML);
 
-
                 } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                         Assert.fail("Could not obtain authInfo token.");
@@ -117,7 +118,7 @@ public class UDDI_030_BusinessEntityIntegrationTest {
 
         @Test
         public void testJoePublisherBusinessEntitySignature() {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+                Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusinessX509Signature(authInfoJoe);
@@ -129,8 +130,8 @@ public class UDDI_030_BusinessEntityIntegrationTest {
         }
 
         @Test
-        public void testJoePublisherBusinessEntity() throws Exception{
-             Assume.assumeTrue(TckPublisher.isEnabled());
+        public void testJoePublisherBusinessEntity() throws Exception {
+                Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
                         tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -142,8 +143,8 @@ public class UDDI_030_BusinessEntityIntegrationTest {
         }
 
         @Test
-        public void testSamSyndicatorBusiness() throws Exception{
-             Assume.assumeTrue(TckPublisher.isEnabled());
+        public void testSamSyndicatorBusiness() throws Exception {
+                Assume.assumeTrue(TckPublisher.isEnabled());
                 try {
                         tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
                         tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam);

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
index b27d055..f857441 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
@@ -34,14 +34,14 @@ public class UDDI_030_BusinessEntityLoadIntegrationTest extends UDDI_030_Busines
 
         @BeforeClass
         public static void setup() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 UDDI_030_BusinessEntityIntegrationTest.startManager();
         }
 
         @Test
         @Override
         public void testJoePublisherBusinessEntity() throws Exception {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 Assume.assumeTrue(TckPublisher.isLoadTest());
 
                 numberOfBusinesses = TckPublisher.getMaxLoadServices();

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
index 154f99a..2df607c 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
@@ -51,7 +51,7 @@ public class UDDI_040_BusinessServiceIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -59,7 +59,7 @@ public class UDDI_040_BusinessServiceIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
index 665d7fb..0d58c0c 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
@@ -47,7 +47,7 @@ public class UDDI_050_BindingTemplateIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModel.deleteCreatedTModels(authInfoJoe);
                 
                 manager.stop();
@@ -55,7 +55,7 @@ public class UDDI_050_BindingTemplateIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
index 1d28758..97ab126 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
@@ -56,7 +56,7 @@ public class UDDI_060_PublisherAssertionIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 tckTModelMary.deleteCreatedTModels(authInfoMary);
@@ -65,7 +65,7 @@ public class UDDI_060_PublisherAssertionIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
index 4edfad3..ea11f9c 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
@@ -72,14 +72,14 @@ public class UDDI_070_FindEntityIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModel.deleteCreatedTModels(authInfoJoe);
                 manager.stop();
         }
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 

http://git-wip-us.apache.org/repos/asf/juddi/blob/f0099f0d/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
index 76a51c3..6a1646f 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
@@ -87,7 +87,7 @@ public class UDDI_080_SubscriptionIntegrationTest {
 
         @AfterClass
         public static void stopManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 tckTModelJoe.deleteCreatedTModels(authInfoJoe);
                 tckTModelSam.deleteCreatedTModels(authInfoSam);
                 manager.stop();
@@ -95,7 +95,7 @@ public class UDDI_080_SubscriptionIntegrationTest {
 
         @BeforeClass
         public static void startManager() throws ConfigurationException {
-             Assume.assumeTrue(TckPublisher.isEnabled());
+             if (!TckPublisher.isEnabled()) return;
                 manager = new UDDIClient();
                 manager.start();
 


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


Mime
View raw message