juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1518882 [1/2] - in /juddi/trunk: ./ juddi-client.net/juddi-client.net/Properties/ juddi-client/src/main/java/org/apache/juddi/v3/client/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-core-openjpa/src/test/resources/ j...
Date Fri, 30 Aug 2013 02:23:12 GMT
Author: alexoree
Date: Fri Aug 30 02:23:11 2013
New Revision: 1518882

URL: http://svn.apache.org/r1518882
Log:
JUDDI-640 resolved
JUDDI-242 additional tests added
JUDDI-597 fixed
JUDDI-627 added additional in line documentation for the server config file

Modified:
    juddi/trunk/juddi-client.net/juddi-client.net/Properties/AssemblyInfo.cs
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
    juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
    juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml
    juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
    juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
    juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
    juddi/trunk/readme.txt
    juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml
    juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
    juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java

Modified: juddi/trunk/juddi-client.net/juddi-client.net/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/Properties/AssemblyInfo.cs?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/Properties/AssemblyInfo.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/Properties/AssemblyInfo.cs Fri Aug 30 02:23:11 2013
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.2.*")]
-[assembly: AssemblyFileVersion("3.2.*")]
+[assembly: AssemblyFileVersion("3.2.*.*")]

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/Release.java Fri Aug 30 02:23:11 2013
@@ -23,17 +23,31 @@ import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
 /**
- * The release class is a utility for obtaining the 
+ * The release class is a utility for obtaining the version number
  */
 public class Release {
 	
 	private static final String UDDI_VERSION = "3.0";
 	private static final String JAR_NAME = "juddi-client";
 	private static String registryVersion = null;
-   
+        public static final String UNKNOWN = "unknown";
 	private Release () {
 	}
 
+        /**
+         * Returns the version of this jUDDI-Client jar as defined in the manifest.
+         * Calls getRegistryVersion()
+         * @return 
+         * @since 3.2
+         */
+        public static String getjUDDIClientVersion() {
+            return getRegistryVersion();
+        }
+        /**
+         * Returns the version of this jUDDI-Client jar as defined in the manifest.
+         * This function is poorly named, but left in place for backward compatibility
+         * @return 
+         */
 	public static String getRegistryVersion() {
 		if (registryVersion == null) {
 			registryVersion = getVersionFromManifest(JAR_NAME);
@@ -71,6 +85,6 @@ public class Release {
          } catch (IOException e1) {
             // Silently ignore wrong manifests on classpath?
          }
-         return "unknown";
+         return UNKNOWN;
 	}
 }

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java Fri Aug 30 02:23:11 2013
@@ -31,6 +31,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.juddi.v3.annotations.AnnotationProcessor;
 import org.apache.juddi.v3.client.ClassUtil;
+import org.apache.juddi.v3.client.Release;
 import org.apache.juddi.v3.client.embed.EmbeddedRegistry;
 import org.apache.juddi.v3.client.mapping.ServiceLocator;
 import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
@@ -41,339 +42,368 @@ import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.BusinessService;
 
 public class UDDIClient {
-	
-	private static Log log = LogFactory.getLog(UDDIClient.class);
+
+    private static Log log = LogFactory.getLog(UDDIClient.class);
     private ClientConfig clientConfig = null;
     private String CONFIG_FILE = "META-INF/uddi.xml";
     private Properties properties = null;
-    private static Map<String,ServiceLocator> serviceLocators = new HashMap<String,ServiceLocator>();
-	
+    private static Map<String, ServiceLocator> serviceLocators = new HashMap<String, ServiceLocator>();
+
+    /**
+     * Default constructor, loads from the default config, META-INF/uddi.xml
+     *
+     * @throws ConfigurationException
+     */
     public UDDIClient() throws ConfigurationException {
-    	super();
-		clientConfig = new ClientConfig(CONFIG_FILE, properties);
-		UDDIClientContainer.addClient(this);
+        super();
+        log.info("jUDDI Client version - " + Release.getjUDDIClientVersion());
+        clientConfig = new ClientConfig(CONFIG_FILE, properties);
+        UDDIClientContainer.addClient(this);
+    }
+
+    /**
+     * Manages the clerks. Initiates reading the client configuration from the
+     * uddi.xml.
+     *
+     * @throws ConfigurationException
+     */
+    public UDDIClient(String configurationFile) throws ConfigurationException {
+        super();
+        log.info("jUDDI Client version - " + Release.getjUDDIClientVersion());
+        clientConfig = new ClientConfig(configurationFile);
+        UDDIClientContainer.addClient(this);
+    }
+
+    /**
+     * Manages the clerks. Initiates reading the client configuration from the
+     * uddi.xml.
+     *
+     * @throws ConfigurationException
+     */
+    public UDDIClient(String configurationFile, Properties properties) throws ConfigurationException {
+        super();
+        log.info("jUDDI Client version - " + Release.getjUDDIClientVersion());
+        clientConfig = new ClientConfig(configurationFile, properties);
+        UDDIClientContainer.addClient(this);
     }
-    
+
     /**
      * Uses the client config, and looks for a clerk called "default"
+     *
      * @return
      * @throws ConfigurationException
      */
     public synchronized ServiceLocator getServiceLocator() throws ConfigurationException {
-    	return getServiceLocator(null);
+        return getServiceLocator(null);
     }
+
     /**
      * @param clerkName - if null defaults to "default"
      * @return
      * @throws ConfigurationException
      */
-    public synchronized ServiceLocator getServiceLocator(String clerkName) throws ConfigurationException 
-    {
-    	UDDIClerk clerk = getClerk(clerkName);
-    	if (! serviceLocators.containsKey(clerk.getName())) {
-    		ServiceLocator serviceLocator = new ServiceLocator(clerk, new URLLocalizerDefaultImpl(), properties);
-    	    serviceLocators.put(clerk.getName(), serviceLocator);
-    	}
-    	return serviceLocators.get(clerk.getName());
-    }
-	/**
-	 * Manages the clerks. Initiates reading the client configuration from the uddi.xml.
-	 * @throws ConfigurationException 
-	 */
-	public UDDIClient(String configurationFile) throws ConfigurationException {
-		super();
-		clientConfig = new ClientConfig(configurationFile);
-		UDDIClientContainer.addClient(this);
-	}
-	/**
-	 * Manages the clerks. Initiates reading the client configuration from the uddi.xml.
-	 * @throws ConfigurationException 
-	 */
-	public UDDIClient(String configurationFile, Properties properties) throws ConfigurationException {
-		super();
-		clientConfig = new ClientConfig(configurationFile, properties);
-		UDDIClientContainer.addClient(this);
-	}
-	/**
-	 * Stops the clerks.
-	 * @throws ConfigurationException 
-	 */
-	public void stop() throws ConfigurationException {
-		log.info("Stopping UDDI Client " + clientConfig.getClientName());
-		releaseResources();
-		UDDIClientContainer.removeClerkManager(getName());
-		
-		//If running in embedded mode
-		if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
-			log.info("Shutting down embedded Server");
-			stopEmbeddedServer();
-		}
-		log.info("UDDI Clerks shutdown completed for manager " + clientConfig.getClientName());
-	}
-	
-	private void releaseResources() {
-		if (this.clientConfig.isRegisterOnStartup()) {
-			unRegisterWSDLs();
-			unRegisterBindingsOfAnnotatedServices(true);
-		}
-	}
- 	/**
-	 * Initializes the UDDI Clerk.
-	 * @throws ConfigurationException  
-	 */
-	public void start() throws ConfigurationException {
-		
-		if (UDDIClientContainer.addClient(this)) {
-			//If running in embedded mode
-			if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
-				log.info("Starting embedded Server");
-				startEmbeddedServer();
-			}
-			if (this.clientConfig.isRegisterOnStartup()) {
-				Runnable runnable = new BackGroundRegistration(this);
-				Thread thread = new Thread(runnable);
-				thread.start();
-			}
-		}
- 	}
-	
-	protected void startEmbeddedServer() throws ConfigurationException {
-
-		try {
-			String embeddedServerClass = getClientConfig().getHomeNode().getProperties().getProperty("embeddedServer","org.apache.juddi.v3.client.embed.JUDDIRegistry");
-			Class<?> clazz =  ClassUtil.forName(embeddedServerClass, this.getClass());
-			EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
-			embeddedRegistry.start();
-		} catch (Exception e) {
-			throw new ConfigurationException(e.getMessage(),e);
-		}
-	}
-	
-	protected void stopEmbeddedServer() throws ConfigurationException {
-
-		try {
-			String embeddedServerClass = getClientConfig().getHomeNode().getProperties().getProperty("embeddedServer","org.apache.juddi.v3.client.embed.JUDDIRegistry");
-			Class<?> clazz =  ClassUtil.forName(embeddedServerClass, this.getClass());
-			EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
-			embeddedRegistry.stop();
-		} catch (Exception e) {
-			throw new ConfigurationException(e.getMessage(),e);
-		}
-	}
-	
-	public void restart() throws ConfigurationException {
-		stop();
-		start();
-	}
-	
-	/**
-	 * Saves the clerk and node info from the uddi.xml to the home jUDDI registry.
-	 * This info is needed if you want to JUDDI Server to do XRegistration/"replication".
-	 */
-	public void saveClerkAndNodeInfo() {
-		
-		Map<String,UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
-		
-		if (uddiClerks.size() > 0) {
-			
-			//obtaining a clerk that can write to the home registry
-			UDDIClerk homeClerk=null;
-			for (UDDIClerk clerk : uddiClerks.values()) {
-				if (clerk.getUDDINode().isHomeJUDDI()) {
-					homeClerk = clerk;
-				}	
-			}
-			//registering nodes and clerks
-			if (homeClerk!=null) {
-				int numberOfHomeJUDDIs=0;
-				for (UDDINode uddiNode : clientConfig.getUDDINodes().values()) {
-					if (uddiNode.isHomeJUDDI()) numberOfHomeJUDDIs++;
-					homeClerk.saveNode(uddiNode.getApiNode());
-				}
-				if (numberOfHomeJUDDIs==1) {
-					for (UDDIClerk clerk : clientConfig.getUDDIClerks().values()) {
-						homeClerk.saveClerk(clerk);
-					}
-				} else {
-					log.error("The client config needs to have one homeJUDDI node and found " + numberOfHomeJUDDIs);
-				}
-			} else {
-				log.debug("No home clerk found.");
-			}
-		}	
-	}
-	
-	/**
-	 * X-Register services listed in the uddi.xml
-	 */
-	public void xRegister() {
-		log.debug("Starting cross registration...");
-		//XRegistration of listed businesses
-		Set<XRegistration> xBusinessRegistrations = clientConfig.getXBusinessRegistrations();
-		for (XRegistration xRegistration : xBusinessRegistrations) {
-			xRegistration.xRegisterBusiness();
-		}
-		//XRegistration of listed serviceBindings
-		Set<XRegistration> xServiceBindingRegistrations = clientConfig.getXServiceBindingRegistrations();
-		for (XRegistration xRegistration : xServiceBindingRegistrations) {
-			xRegistration.xRegisterServiceBinding();
-		}
-		log.debug("Cross registration completed");
-	}
-	/**
-	 * Registers services to UDDI using a clerk, and the uddi.xml
-	 * configuration.
-	 */
-	public void registerAnnotatedServices() {
-		Map<String,UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
-		if (uddiClerks.size() > 0) {
-			AnnotationProcessor ap = new AnnotationProcessor();
-			for (UDDIClerk uddiClerk : uddiClerks.values()) {
-				Collection<BusinessService> services = ap.readServiceAnnotations(
-						uddiClerk.getClassWithAnnotations(),uddiClerk.getUDDINode().getProperties());
-				for (BusinessService businessService : services) {
-					log.info("Node=" + uddiClerk.getUDDINode().getApiNode().getName());
-					uddiClerk.register(businessService, uddiClerk.getUDDINode().getApiNode());
-				}
-			}
-		}
-	}
-	/**
-	 * Removes the service and all of its bindingTemplates of the annotated classes.
-	 * @throws TransportException 
-	 * @throws RemoteException 
-	 */
-	public void unRegisterAnnotatedServices() {
-		Map<String,UDDIClerk> clerks = clientConfig.getUDDIClerks();
-		if (clerks.size() > 0) {
-			AnnotationProcessor ap = new AnnotationProcessor();
-			for (UDDIClerk clerk : clerks.values()) {
-				Collection<BusinessService> services = ap.readServiceAnnotations(
-						clerk.getClassWithAnnotations(),clerk.getUDDINode().getProperties());
-				for (BusinessService businessService : services) {
-					clerk.unRegisterService(businessService.getServiceKey(),clerk.getUDDINode().getApiNode());
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Removes the bindings of the services in the annotated classes. Multiple nodes may register
-	 * the same service using different BindingTempates. If the last BindingTemplate is removed
-	 * the service can be removed as well.
-	 * 
-	 * @param removeServiceWithNoBindingTemplates - if set to true it will remove the service if there
-	 * are no other BindingTemplates.
-	 */
-	public void unRegisterBindingsOfAnnotatedServices(boolean removeServiceWithNoBindingTemplates) {
-		
-			Map<String,UDDIClerk> clerks = clientConfig.getUDDIClerks();
-			if (clerks.size() > 0) {
-				AnnotationProcessor ap = new AnnotationProcessor();
-				for (UDDIClerk clerk : clerks.values()) {
-					Collection<BusinessService> services = ap.readServiceAnnotations(
-							clerk.getClassWithAnnotations(),clerk.getUDDINode().getProperties());
-					for (BusinessService businessService : services) {
-						if (businessService.getBindingTemplates() != null) {
-							List<BindingTemplate> bindingTemplates = businessService.getBindingTemplates().getBindingTemplate();
-							for (BindingTemplate bindingTemplate : bindingTemplates) {
-								clerk.unRegisterBinding(bindingTemplate.getBindingKey(), clerk.getUDDINode().getApiNode());
-							}
-						}
-						if (removeServiceWithNoBindingTemplates) {
-							try {
-								BusinessService existingService = clerk.findService(businessService.getServiceKey(), clerk.getUDDINode().getApiNode());
-								if (existingService.getBindingTemplates()==null || existingService.getBindingTemplates().getBindingTemplate().size()==0) {
-									clerk.unRegisterService(businessService.getServiceKey(),clerk.getUDDINode().getApiNode());
-								}
-							} catch (Exception e) {
-								log.error(e.getMessage(),e);
-							}
-						}
-					}
-				}
-			}
-		
-	}
-	
-	public ClientConfig getClientConfig() {
-		return clientConfig;
-	}
-	
-	public String getName() {
-		return clientConfig.getClientName();
-	}
-	/**
-	 * @deprecated, use the getTransport(String nodeName) instead.
-	 * Returns the "default" jUDDI nodes Transport.
-	 * 
-	 * @return
-	 * @throws ConfigurationException
-	 */
-	public Transport getTransport() throws ConfigurationException {
-		return getTransport("default");
-	}
-	/**
-	 * Returns the transport defined for the node with the given nodeName.
-	 * @param nodeName
-	 * @return
-	 * @throws ConfigurationException
-	 */
-	public Transport getTransport(String nodeName) throws ConfigurationException {
-		try {
-			String clazz = clientConfig.getHomeNode().getProxyTransport();
-			String managerName = clientConfig.getClientName();
-			Class<?> transportClass = ClassUtil.forName(clazz, UDDIClient.class);
-			if (transportClass!=null) {
-				Transport transport = (Transport) 
-						transportClass.getConstructor(String.class,String.class).newInstance(managerName,nodeName);
-				return transport;
-			} else {
-				throw new ConfigurationException ("ProxyTransport was not defined in the " + clientConfig.getConfigurationFile());
-			}
-		} catch (Exception e) {
-			throw new ConfigurationException (e.getMessage(),e);
-		}
-	}
-	
-        /**
-         * Gets the UDDI Clerk, the entry point into many functions of the juddi client
-         * @param clerkName - This references the uddi/client/clern@name of the juddi client config file.
-         * it stores credentials if necessary and associates it with a particular UDDI node (server/cluster)
-         * If not specificed, the value of "default" will be used.
-         * @return 
-         */
-	public UDDIClerk getClerk(String clerkName) {
-            if (clerkName==null || clerkName.length()==0)
-                return getClientConfig().getUDDIClerks().get("default");
-            return getClientConfig().getUDDIClerks().get(clerkName);
-	}
-	
-	/**
-	 * Registers services to UDDI using a clerk, and the uddi.xml
-	 * configuration.
-	 * @throws WSDLException 
-	 * @throws TransportException 
-	 * @throws ConfigurationException 
-	 * @throws RemoteException 
-	 */
-	public void registerWSDLs() {
-		Map<String,UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
-		if (uddiClerks.size() > 0) {
-			for (UDDIClerk uddiClerk : uddiClerks.values()) {
-				uddiClerk.registerWsdls();
-			}
-		}
-	}
-	
-	public void unRegisterWSDLs() {
-		Map<String,UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
-		if (uddiClerks.size() > 0) {
-			for (UDDIClerk uddiClerk : uddiClerks.values()) {
-				uddiClerk.unRegisterWsdls();
-			}
-		}
-	}
-	
-}
+    public synchronized ServiceLocator getServiceLocator(String clerkName) throws ConfigurationException {
+        UDDIClerk clerk = getClerk(clerkName);
+        if (!serviceLocators.containsKey(clerk.getName())) {
+            ServiceLocator serviceLocator = new ServiceLocator(clerk, new URLLocalizerDefaultImpl(), properties);
+            serviceLocators.put(clerk.getName(), serviceLocator);
+        }
+        return serviceLocators.get(clerk.getName());
+    }
+
+    /**
+     * Stops the clerks.
+     *
+     * @throws ConfigurationException
+     */
+    public void stop() throws ConfigurationException {
+        log.info("Stopping UDDI Client " + clientConfig.getClientName());
+        releaseResources();
+        UDDIClientContainer.removeClerkManager(getName());
+
+        //If running in embedded mode
+        if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
+            log.info("Shutting down embedded Server");
+            stopEmbeddedServer();
+        }
+        log.info("UDDI Clerks shutdown completed for manager " + clientConfig.getClientName());
+    }
+
+    private void releaseResources() {
+        if (this.clientConfig.isRegisterOnStartup()) {
+            unRegisterWSDLs();
+            unRegisterBindingsOfAnnotatedServices(true);
+        }
+    }
+
+    /**
+     * Initializes the UDDI Clerk.
+     *
+     * @throws ConfigurationException
+     */
+    public void start() throws ConfigurationException {
+
+        if (UDDIClientContainer.addClient(this)) {
+            //If running in embedded mode
+            if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
+                log.info("Starting embedded Server");
+                startEmbeddedServer();
+            }
+            if (this.clientConfig.isRegisterOnStartup()) {
+                Runnable runnable = new BackGroundRegistration(this);
+                Thread thread = new Thread(runnable);
+                thread.start();
+            }
+        }
+    }
+
+    protected void startEmbeddedServer() throws ConfigurationException {
+
+        try {
+            String embeddedServerClass = getClientConfig().getHomeNode().getProperties().getProperty("embeddedServer", "org.apache.juddi.v3.client.embed.JUDDIRegistry");
+            Class<?> clazz = ClassUtil.forName(embeddedServerClass, this.getClass());
+            EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
+            embeddedRegistry.start();
+        } catch (Exception e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
+    }
+
+    protected void stopEmbeddedServer() throws ConfigurationException {
+
+        try {
+            String embeddedServerClass = getClientConfig().getHomeNode().getProperties().getProperty("embeddedServer", "org.apache.juddi.v3.client.embed.JUDDIRegistry");
+            Class<?> clazz = ClassUtil.forName(embeddedServerClass, this.getClass());
+            EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
+            embeddedRegistry.stop();
+        } catch (Exception e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
+    }
+
+    public void restart() throws ConfigurationException {
+        stop();
+        start();
+    }
+
+    /**
+     * Saves the clerk and node info from the uddi.xml to the home jUDDI
+     * registry. This info is needed if you want to JUDDI Server to do
+     * XRegistration/"replication".
+     */
+    public void saveClerkAndNodeInfo() {
+
+        Map<String, UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
+
+        if (uddiClerks.size() > 0) {
+
+            //obtaining a clerk that can write to the home registry
+            UDDIClerk homeClerk = null;
+            for (UDDIClerk clerk : uddiClerks.values()) {
+                if (clerk.getUDDINode().isHomeJUDDI()) {
+                    homeClerk = clerk;
+                }
+            }
+            //registering nodes and clerks
+            if (homeClerk != null) {
+                int numberOfHomeJUDDIs = 0;
+                for (UDDINode uddiNode : clientConfig.getUDDINodes().values()) {
+                    if (uddiNode.isHomeJUDDI()) {
+                        numberOfHomeJUDDIs++;
+                    }
+                    homeClerk.saveNode(uddiNode.getApiNode());
+                }
+                if (numberOfHomeJUDDIs == 1) {
+                    for (UDDIClerk clerk : clientConfig.getUDDIClerks().values()) {
+                        homeClerk.saveClerk(clerk);
+                    }
+                } else {
+                    log.error("The client config needs to have one homeJUDDI node and found " + numberOfHomeJUDDIs);
+                }
+            } else {
+                log.debug("No home clerk found.");
+            }
+        }
+    }
+
+    /**
+     * X-Register services listed in the uddi.xml
+     */
+    public void xRegister() {
+        log.debug("Starting cross registration...");
+        //XRegistration of listed businesses
+        Set<XRegistration> xBusinessRegistrations = clientConfig.getXBusinessRegistrations();
+        for (XRegistration xRegistration : xBusinessRegistrations) {
+            xRegistration.xRegisterBusiness();
+        }
+        //XRegistration of listed serviceBindings
+        Set<XRegistration> xServiceBindingRegistrations = clientConfig.getXServiceBindingRegistrations();
+        for (XRegistration xRegistration : xServiceBindingRegistrations) {
+            xRegistration.xRegisterServiceBinding();
+        }
+        log.debug("Cross registration completed");
+    }
+
+    /**
+     * Registers services to UDDI using a clerk, and the uddi.xml configuration.
+     */
+    public void registerAnnotatedServices() {
+        Map<String, UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
+        if (uddiClerks.size() > 0) {
+            AnnotationProcessor ap = new AnnotationProcessor();
+            for (UDDIClerk uddiClerk : uddiClerks.values()) {
+                Collection<BusinessService> services = ap.readServiceAnnotations(
+                        uddiClerk.getClassWithAnnotations(), uddiClerk.getUDDINode().getProperties());
+                for (BusinessService businessService : services) {
+                    log.info("Node=" + uddiClerk.getUDDINode().getApiNode().getName());
+                    uddiClerk.register(businessService, uddiClerk.getUDDINode().getApiNode());
+                }
+            }
+        }
+    }
+
+    /**
+     * Removes the service and all of its bindingTemplates of the annotated
+     * classes.
+     *
+     * @throws TransportException
+     * @throws RemoteException
+     */
+    public void unRegisterAnnotatedServices() {
+        Map<String, UDDIClerk> clerks = clientConfig.getUDDIClerks();
+        if (clerks.size() > 0) {
+            AnnotationProcessor ap = new AnnotationProcessor();
+            for (UDDIClerk clerk : clerks.values()) {
+                Collection<BusinessService> services = ap.readServiceAnnotations(
+                        clerk.getClassWithAnnotations(), clerk.getUDDINode().getProperties());
+                for (BusinessService businessService : services) {
+                    clerk.unRegisterService(businessService.getServiceKey(), clerk.getUDDINode().getApiNode());
+                }
+            }
+        }
+    }
+
+    /**
+     * Removes the bindings of the services in the annotated classes. Multiple
+     * nodes may register the same service using different BindingTempates. If
+     * the last BindingTemplate is removed the service can be removed as well.
+     *
+     * @param removeServiceWithNoBindingTemplates - if set to true it will
+     * remove the service if there are no other BindingTemplates.
+     */
+    public void unRegisterBindingsOfAnnotatedServices(boolean removeServiceWithNoBindingTemplates) {
+
+        Map<String, UDDIClerk> clerks = clientConfig.getUDDIClerks();
+        if (clerks.size() > 0) {
+            AnnotationProcessor ap = new AnnotationProcessor();
+            for (UDDIClerk clerk : clerks.values()) {
+                Collection<BusinessService> services = ap.readServiceAnnotations(
+                        clerk.getClassWithAnnotations(), clerk.getUDDINode().getProperties());
+                for (BusinessService businessService : services) {
+                    if (businessService.getBindingTemplates() != null) {
+                        List<BindingTemplate> bindingTemplates = businessService.getBindingTemplates().getBindingTemplate();
+                        for (BindingTemplate bindingTemplate : bindingTemplates) {
+                            clerk.unRegisterBinding(bindingTemplate.getBindingKey(), clerk.getUDDINode().getApiNode());
+                        }
+                    }
+                    if (removeServiceWithNoBindingTemplates) {
+                        try {
+                            BusinessService existingService = clerk.findService(businessService.getServiceKey(), clerk.getUDDINode().getApiNode());
+                            if (existingService.getBindingTemplates() == null || existingService.getBindingTemplates().getBindingTemplate().size() == 0) {
+                                clerk.unRegisterService(businessService.getServiceKey(), clerk.getUDDINode().getApiNode());
+                            }
+                        } catch (Exception e) {
+                            log.error(e.getMessage(), e);
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+    public ClientConfig getClientConfig() {
+        return clientConfig;
+    }
 
+    public String getName() {
+        return clientConfig.getClientName();
+    }
+
+    /**
+     * @deprecated, use the getTransport(String nodeName) instead. Returns the
+     * "default" jUDDI nodes Transport.
+     *
+     * @return
+     * @throws ConfigurationException
+     */
+    public Transport getTransport() throws ConfigurationException {
+        return getTransport("default");
+    }
+
+    /**
+     * Returns the transport defined for the node with the given nodeName.
+     *
+     * @param nodeName
+     * @return
+     * @throws ConfigurationException
+     */
+    public Transport getTransport(String nodeName) throws ConfigurationException {
+        try {
+            String clazz = clientConfig.getHomeNode().getProxyTransport();
+            String managerName = clientConfig.getClientName();
+            Class<?> transportClass = ClassUtil.forName(clazz, UDDIClient.class);
+            if (transportClass != null) {
+                Transport transport = (Transport) transportClass.getConstructor(String.class, String.class).newInstance(managerName, nodeName);
+                return transport;
+            } else {
+                throw new ConfigurationException("ProxyTransport was not defined in the " + clientConfig.getConfigurationFile());
+            }
+        } catch (Exception e) {
+            throw new ConfigurationException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Gets the UDDI Clerk, the entry point into many functions of the juddi
+     * client
+     *
+     * @param clerkName - This references the uddi/client/clern@name of the
+     * juddi client config file. it stores credentials if necessary and
+     * associates it with a particular UDDI node (server/cluster) If not
+     * specificed, the value of "default" will be used.
+     * @return
+     */
+    public UDDIClerk getClerk(String clerkName) {
+        if (clerkName == null || clerkName.length() == 0) {
+            return getClientConfig().getUDDIClerks().get("default");
+        }
+        return getClientConfig().getUDDIClerks().get(clerkName);
+    }
+
+    /**
+     * Registers services to UDDI using a clerk, and the uddi.xml configuration.
+     *
+     * @throws WSDLException
+     * @throws TransportException
+     * @throws ConfigurationException
+     * @throws RemoteException
+     */
+    public void registerWSDLs() {
+        Map<String, UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
+        if (uddiClerks.size() > 0) {
+            for (UDDIClerk uddiClerk : uddiClerks.values()) {
+                uddiClerk.registerWsdls();
+            }
+        }
+    }
+
+    public void unRegisterWSDLs() {
+        Map<String, UDDIClerk> uddiClerks = clientConfig.getUDDIClerks();
+        if (uddiClerks.size() > 0) {
+            for (UDDIClerk uddiClerk : uddiClerks.values()) {
+                uddiClerk.unRegisterWsdls();
+            }
+        }
+    }
+}

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
 
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
 
+			<!-- When using file based authentication, this is the filename to use
+			<usersfile>juddi-users.xml</usersfile> -->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,21 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
 			<!-- jUDDI Authentication module to use-->
-
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,21 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
 			<!-- jUDDI Authentication module to use-->
-
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
+			
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
 			<!-- jUDDI Authentication module to use-->
-
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/Property.java Fri Aug 30 02:23:11 2013
@@ -15,6 +15,10 @@ public interface Property {
     public final static String JUDDI_LOAD_INSTALL_DATA = "juddi.load.install.data";
     public final static String JUDDI_PERSISTENCEUNIT_NAME = "juddi.persistenceunit.name";
     public final static String JUDDI_CONFIGURATION_RELOAD_DELAY = "juddi.configuration.reload.delay";
+    
+    /**
+     * This is not used in the code base
+     */
     //public final static String JUDDI_LOCALE = "juddi.locale";
     
     //public final static String JUDDI_OPERATOR_EMAIL_ADDRESS = "juddi.operatorEmailAddress";
@@ -27,8 +31,11 @@ public interface Property {
     public final static String JUDDI_MAX_TMODELS_PER_PUBLISHER = "juddi.maxTModelsPerPublisher";
     public final static String JUDDI_CRYPTOR = "juddi.cryptor";
     public final static String JUDDI_KEYGENERATOR = "juddi.keygenerator";
-    //public final static String JUDDI_SECURITY_DOMAIN = "juddi.securityDomain";
-    public final static String JUDDI_USERSFILE = "juddi.usersfile";
+    /**
+     * used by the Jboss authenticator
+     */
+    public final static String JUDDI_SECURITY_DOMAIN = "juddi.auth.securityDomain";
+    public final static String JUDDI_USERSFILE = "juddi.auth.usersfile";
     public final static String JUDDI_MAX_ROWS = "juddi.maxRows";
     public final static String JUDDI_MAX_IN_CLAUSE = "juddi.maxInClause";
     public final static String JUDDI_ROOT_PARTITION = "juddi.rootPartition";
@@ -67,7 +74,9 @@ public interface Property {
     public final static String JUDDI_SUBSCRIPTION_CHUNKEXPIRATION_MINUTES = "juddi.subscription.chunkexpiration.minutes";
     public final static String JUDDI_SUBSCRIPTION_MAXENTITIES="juddi.subscription.maxentities";
     
-    public final static String JUDDI_SUBSCRIPTION_TRUSTSTORE_TYPE="juddi.subscription.truststore.type";
+    /*
+     * These are not yet used
+    public final static Strin   g JUDDI_SUBSCRIPTION_TRUSTSTORE_TYPE="juddi.subscription.truststore.type";
     public final static String JUDDI_SUBSCRIPTION_TRUSTSTORE_FILE="juddi.subscription.truststore.filename";
     public final static String JUDDI_SUBSCRIPTION_TRUSTSTORE_PASSWORD="juddi.subscription.truststore.password";
     public final static String JUDDI_SUBSCRIPTION_TRUSTSTORE_ENCRYPTED="juddi.subscription.truststore.password[@isPasswordEncrypted]";
@@ -83,7 +92,7 @@ public interface Property {
     public final static String JUDDI_SUBSCRIPTION_KEYPASSWORD_CRYPTOPROVIDER="juddi.subscription.keypassword.password[@cryptoProvider]";
     public final static String JUDDI_SUBSCRIPTION_KEYSTORE_ENCRYPTED="juddi.subscription.keystore.password[@isPasswordEncrypted]";
     public final static String JUDDI_SUBSCRIPTION_KEYSTORE_CRYPTOPROVIDER="juddi.subscription.keystore.password[@cryptoProvider]";
-    
+    */
     
     public final static String JUDDI_NOTIFICATION_START_BUFFER = "juddi.notification.start.buffer";
     public final static String JUDDI_NOTIFICATION_INTERVAL = "juddi.notification.interval";

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/NotifierFactory.java Fri Aug 30 02:23:11 2013
@@ -38,7 +38,8 @@ public class NotifierFactory {
 			//JUDDI-496 TODO make sure the tModel is loaded
 			log.error("The bindingTemplate " + bindingTemplate.getEntityKey() + " does not contain a tModel to define its type of transport. Defaulting " 
 				  +	"to http.");
-			return null;
+                        //JUDDI-596, attempt http transport, even if a transport isn't specified
+			notifierClassName =   "org.apache.juddi.subscription.notify.HTTPNotifier";
 		}
 		if (log.isDebugEnabled()) log.debug("Going find and instantiate notifier class: " + notifierClassName);
 		

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/XMLDocAuthenticator.java Fri Aug 30 02:23:11 2013
@@ -19,6 +19,7 @@ package org.apache.juddi.v3.auth;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
@@ -96,9 +97,17 @@ public class XMLDocAuthenticator impleme
 	 */
 	public synchronized void readUserFile() throws JAXBException, IOException, ConfigurationException
 	{
+            
 		userTable = new HashMap<String, User> ();
-		String usersFileName = getFilename();
-		log.info("Reading jUDDI Users File: " + usersFileName + "...");
+                String usersFileName = getFilename();
+                if (usersFileName==null || usersFileName.length()==0)
+                    throw new ConfigurationException("usersFileName value is null!");
+		//log.info("Reading jUDDI Users File: " + usersFileName + "...");
+                URL resource = ClassUtil.getResource(usersFileName, this.getClass());
+                if (resource!=null)
+                    log.info("Reading jUDDI Users File: " + usersFileName + "...from " + resource.toExternalForm());
+                else
+                    log.info("Reading jUDDI Users File: " + usersFileName + "...");
 		InputStream stream = ClassUtil.getResource(usersFileName, this.getClass()).openStream();
 		JAXBContext jaxbContext=JAXBContext.newInstance(JuddiUsers.class);
 		Unmarshaller unMarshaller = jaxbContext.createUnmarshaller();

Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateSubscription.java Fri Aug 30 02:23:11 2013
@@ -315,7 +315,7 @@ public class ValidateSubscription extend
         }
         Object obj = em.find(org.apache.juddi.model.BindingTemplate.class, bindingKey);
         if (obj==null) {
-            throw new ValueNotAllowedException(new ErrorMessage("errors.subscription.BindingDoesntExist"));
+            throw new ValueNotAllowedException(new ErrorMessage("errors.subscription.BindingDoesntExist",bindingKey));
         }
     }
 }

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,21 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
+			<!-- When using file based authentication, this is the filename to use
+			<usersfile>juddi-users.xml</usersfile> -->
 			<!-- jUDDI Authentication module to use-->
-
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
 
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,24 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
+			
 
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
+
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
 
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3.xml Fri Aug 30 02:23:11 2013
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
 
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml Fri Aug 30 02:23:11 2013
@@ -22,7 +22,7 @@
 		</seed>
 
 		<!-- Name of the persistence unit to use (the default, "juddiDatabase" refers to the unit compiled into the juddi library)-->
-		<persistenceunit>
+-		<persistenceunit>
 			<name>juddiDatabase</name>
 		</persistenceunit>
 
@@ -97,9 +97,22 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
-			<!-- jUDDI Authentication module to use-->
 
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
+			<!-- jUDDI Authentication module to use-->
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url

Modified: juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml Fri Aug 30 02:23:11 2013
@@ -97,15 +97,29 @@
 		<auth>
 			<!-- Specifies whether the inquiry API requires authentication, all other APIs require authN-->
 			<Inquiry>false</Inquiry>
+			
+			<!-- When using file based authentication, this is the filename to use 
+			<usersfile>juddi-users.xml</usersfile>-->
 			<!-- jUDDI Authentication module to use-->
-
 			<authenticator>
+				<!-- build in Authenticators:
+				org.apache.juddi.v3.auth.JUDDIAuthenticator - no authentication
+				LDAP Based
+				org.apache.juddi.v3.auth.LdapSimpleAuthenticator - use LDAP
+				org.apache.juddi.v3.auth.LdapExpandedAuthenticator - use LDAP
+				
+				File based, see usersfile
+				org.apache.juddi.v3.auth.XMLDocAuthenticator - XML doc, clear text
+				org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator - XML doc, encrypted
+				org.apache.juddi.v3.auth.MD5XMLDocAuthenticator - XML doc, Hashed
+				-->
 				<class>org.apache.juddi.v3.auth.JUDDIAuthenticator</class>
 				<!-- other settings
 				url
 				initialcontext
 				style
 				ldapexp
+				
 				-->
 			</authenticator>
 

Modified: juddi/trunk/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/readme.txt?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/readme.txt (original)
+++ juddi/trunk/readme.txt Fri Aug 30 02:23:11 2013
@@ -2,8 +2,8 @@ Welcome to the Apache JUDDI Project!
 
 Here's some quick notes for building, testing and deploying JUDDI from source.
 
-1) Aquire a JDK5 or higher and setup the JAVA_HOME environment variable
-2) Aquire Apache Maven. Known working version: 3.0.4
+1) Acquire a JDK5 or higher and setup the JAVA_HOME environment variable
+2) Acquire Apache Maven. Known working version: 3.0.4
 3) Setup an environment variable, MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=512m
 4) Make sure the Maven/bin folder and the JDK/bin folders are in the current path
 5) execute "mvn clean install"
@@ -31,114 +31,3 @@ mvn clean install
 To start Juddi's embedded Tomcat server:
 juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.bat
 juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.sh
-
-
-
-When building on Windows, you may run into an error similar to this:
-
-SEVERE: The business service was not found for the given key:  uddi:uddi.joepublisher.com:serviceone
-org.apache.juddi.v3.error.InvalidKeyPassedException: The business service was not found for the given key:  uddi:uddi.jo
-epublisher.com:serviceone
-        at org.apache.juddi.validation.ValidatePublish.validateDeleteService(ValidatePublish.java:174)
-        at org.apache.juddi.api.impl.UDDIPublicationImpl.deleteService(UDDIPublicationImpl.java:291)
-        at org.apache.juddi.v3.tck.TckBusinessService.deleteService(TckBusinessService.java:228)
-        at org.apache.juddi.v3.tck.TckBusinessService.deleteJoePublisherService(TckBusinessService.java:85)
-        at org.apache.juddi.subscription.SubscriptionNotifierTest.teardown(SubscriptionNotifierTest.java:173)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-        at java.lang.reflect.Method.invoke(Method.java:597)
-        at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
-        at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
-        at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
-        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:37)
-        at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:252)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-        at java.lang.reflect.Method.invoke(Method.java:597)
-        at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
-        at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
-        at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
-        at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
-        at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
-Tests run: 2, Failures: 1, Errors: 1, Skipped: 0, Time elapsed: 3.661 sec <<< FAILURE!
-testGetSubscriptionResults(org.apache.juddi.subscription.SubscriptionNotifierTest)  Time elapsed: 0.005 sec  <<< ERROR!
-java.lang.NullPointerException
-        at org.apache.juddi.subscription.SubscriptionNotifierTest.testGetSubscriptionResults(SubscriptionNotifierTest.ja
-va:146)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-        at java.lang.reflect.Method.invoke(Method.java:597)
-        at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
-        at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
-        at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
-        at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
-        at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
-        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
-        at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:73)
-        at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:46)
-        at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:180)
-        at org.junit.runners.ParentRunner.access$000(ParentRunner.java:41)
-        at org.junit.runners.ParentRunner$1.evaluate(ParentRunner.java:173)
-        at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
-        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
-        at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:252)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-        at java.lang.reflect.Method.invoke(Method.java:597)
-        at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
-        at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
-        at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
-        at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
-        at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
-
-org.apache.juddi.subscription.SubscriptionNotifierTest  Time elapsed: 0.038 sec  <<< FAILURE!
-java.lang.AssertionError: No exception should be thrown.
-        at org.junit.Assert.fail(Assert.java:91)
-        at org.apache.juddi.v3.tck.TckBusinessService.deleteService(TckBusinessService.java:232)
-        at org.apache.juddi.v3.tck.TckBusinessService.deleteJoePublisherService(TckBusinessService.java:85)
-        at org.apache.juddi.subscription.SubscriptionNotifierTest.teardown(SubscriptionNotifierTest.java:173)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-        at java.lang.reflect.Method.invoke(Method.java:597)
-        at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
-        at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
-        at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
-        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:37)
-        at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:252)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:141)
-        at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:112)
-        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-        at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
-        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
-        at java.lang.reflect.Method.invoke(Method.java:597)
-        at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
-        at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
-        at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
-        at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:115)
-        at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:75)
-
-
-Results :
-
-Failed tests:   org.apache.juddi.subscription.SubscriptionNotifierTest: No exception should be thrown.
-
-Tests in error:
-  testGetSubscriptionResults(org.apache.juddi.subscription.SubscriptionNotifierTest)
-
-Tests run: 141, Failures: 1, Errors: 1, Skipped: 0
-
-Right click properties on the check out folder and uncheck the read only flag on the folder, then build again.
-
-If that doesn't work and you have SOAP UI running, close it.
\ No newline at end of file

Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2.xml Fri Aug 30 02:23:11 2013
@@ -16,7 +16,7 @@
  *
  */
 -->
-<subscription xmlns="urn:uddi-org:sub_v3" brief="false">
+<subscription xmlns="urn:uddi-org:sub_v3" brief="true">
   <subscriptionKey>uddi:uddi.joepublisher.com:subscriptionone</subscriptionKey>
   <subscriptionFilter>
     <find_business xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">

Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml?rev=1518882&r1=1518881&r2=1518882&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/subscription2SMTP.xml Fri Aug 30 02:23:11 2013
@@ -16,7 +16,7 @@
  *
  */
 -->
-<subscription xmlns="urn:uddi-org:sub_v3">
+<subscription xmlns="urn:uddi-org:sub_v3" brief="true">
   <subscriptionKey>uddi:uddi.joepublisher.com:subscriptiononesmtp</subscriptionKey>
   <subscriptionFilter>
     <find_business xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">



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


Mime
View raw message