juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1536322 - in /juddi/trunk/juddi-client/src: main/java/org/apache/juddi/v3/client/subscription/ test/java/org/apache/juddi/v3/client/mapping/ test/java/org/apache/juddi/v3/client/subscription/ test/resources/META-INF/ test/resources/wadl/
Date Mon, 28 Oct 2013 12:11:51 GMT
Author: alexoree
Date: Mon Oct 28 12:11:50 2013
New Revision: 1536322

URL: http://svn.apache.org/r1536322
Log:
JUDDI-673 added unit tests
JUDDI-674 added unit tests
JUDDI-246 reformating some of the sample xml files for easier readability, additional source documentation added

Added:
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/
    juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml
      - copied, changed from r1534826, juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml
      - copied, changed from r1534826, juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
    juddi/trunk/juddi-client/src/test/resources/wadl/
    juddi/trunk/juddi-client/src/test/resources/wadl/cxf.wadl
Modified:
    juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml

Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java?rev=1536322&r1=1536321&r2=1536322&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java Mon Oct 28 12:11:50 2013
@@ -90,7 +90,14 @@ import org.uddi.v3_service.UDDIPublicati
 })
 public class SubscriptionCallbackListener implements org.uddi.v3_service.UDDISubscriptionListenerPortType {
 
- 
+    /**
+     * used for unit tests, may return null if the endpoint isn't started yet
+     * @return 
+     */
+    protected static SubscriptionCallbackListener getInstance()
+    {
+        return instance;
+    }
     private static final Log log = LogFactory.getLog(SubscriptionCallbackListener.class);
     private static List<ISubscriptionCallback> callbacks = new ArrayList<ISubscriptionCallback>();
     private static SubscriptionCallbackListener instance = null;

Added: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java?rev=1536322&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java (added)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/WADL2UDDITest.java Mon Oct 28 12:11:50 2013
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2013 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.client.mapping;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import javax.xml.namespace.QName;
+import org.apache.juddi.jaxb.PrintUDDI;
+import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.juddi.v3.client.mappings.wadl.Application;
+import org.junit.Assert;
+import org.junit.Test;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.SaveTModel;
+import org.uddi.api_v3.TModel;
+
+/**
+ *
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ */
+public class WADL2UDDITest {
+
+    static PrintUDDI<TModel> pTModel = new PrintUDDI<TModel>();
+    static Properties properties = new Properties();
+    
+  
+    /**
+     * tests loading a wadl from a file
+     * @throws Exception 
+     */
+    @Test
+    public void Test1() throws Exception {
+        
+        
+        Application app = WADL2UDDI.ParseWadl(new File("src/test/resources/wadl/cxf.wadl"));
+        Assert.assertNotNull(app);
+        Assert.assertNotNull(app);
+        List<URL> urls = WADL2UDDI.GetBaseAddresses(app);
+        URL url = urls.get(0);
+        String domain = url.getHost();
+        PrintUDDI<TModel> tmodelPrinter = new PrintUDDI<TModel>();
+        TModel keygen = UDDIClerk.createKeyGenator("uddi:" + domain + ":keygenerator", domain, "en");
+        //save the keygen
+        SaveTModel stm = new SaveTModel();
+        stm.getTModel().add(keygen);
+        System.out.println(tmodelPrinter.print(keygen));
+
+        properties.put("keyDomain", domain);
+        properties.put("businessName", domain);
+        properties.put("serverName", url.getHost());
+        properties.put("serverPort", url.getPort());
+        //wsdlURL = wsdlDefinition.getDocumentBaseURI();
+        WADL2UDDI wadl2UDDI = new WADL2UDDI(null, new URLLocalizerDefaultImpl(), properties);
+
+        Assert.assertNotNull(wadl2UDDI);
+        
+        BusinessService businessServices = wadl2UDDI.createBusinessService(new QName("CXF.Sample.WADL.namespace", "Servicename"), app);
+
+        Assert.assertNotNull(businessServices);
+        Assert.assertNotNull(businessServices.getBindingTemplates());
+        Assert.assertNotNull(businessServices.getName().get(0));
+        Assert.assertNotNull(businessServices.getBindingTemplates().getBindingTemplate().get(0));
+        Assert.assertNotNull(businessServices.getBindingTemplates().getBindingTemplate().get(0).getAccessPoint());
+        Assert.assertNotNull(businessServices.getBindingTemplates().getBindingTemplate().get(0).getAccessPoint().getValue());
+        
+        
+        
+
+        PrintUDDI<BusinessService> servicePrinter = new PrintUDDI<BusinessService>();
+
+        System.out.println(servicePrinter.print(businessServices));
+
+
+
+    }
+}

Added: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java?rev=1536322&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java (added)
+++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackTest.java Mon Oct 28 12:11:50 2013
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2013 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.client.subscription;
+
+import java.util.logging.Logger;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.v3.client.config.UDDIClerk;
+import org.apache.juddi.v3.client.config.UDDIClient;
+import org.apache.juddi.v3.client.transport.TransportException;
+import org.junit.Assert;
+import org.junit.Test;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.TModel;
+import org.uddi.sub_v3.SubscriptionResultsList;
+import org.uddi.subr_v3.NotifySubscriptionListener;
+
+/**
+ * a basic test client for the subscription callback
+ *
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ */
+public class SubscriptionCallbackTest implements ISubscriptionCallback {
+
+    static final Logger log = Logger.getLogger(SubscriptionCallbackTest.class.getCanonicalName());
+
+    @Test
+    public void Test1_NoAutoRegister() throws Exception {
+        log.info("Test1_NoAutoRegister");
+
+        UDDIClient c = new UDDIClient("META-INF/uddi-subcallback1.xml");
+        c.start();
+        UDDIClerk clerk = c.getClerk("default");
+        // TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi:org.apache.juddi:test:keygenerator", "Test domain", "en");
+        //clerk.register(createKeyGenator);
+        BindingTemplate start = SubscriptionCallbackListener.start(c, "default");
+        Assert.assertNotNull(start);
+        Assert.assertNotNull(start);
+        //Assert.assertNotNull(start.getBindingKey());
+        SubscriptionCallbackListener.stop(c, "default", start.getBindingKey());
+        c.stop();
+
+    }
+    boolean Test2_NoAutoRegisterAndShortCircuitReceive_ = false;
+
+    @Test
+    public void Test2_NoAutoRegisterAndShortCircuitReceive() throws Exception {
+        log.info("Test2_NoAutoRegisterAndShortCircuitReceive");
+        Test2_NoAutoRegisterAndShortCircuitReceive_ = false;
+        UDDIClient c = new UDDIClient("META-INF/uddi-subcallback1.xml");
+        c.start();
+        UDDIClerk clerk = c.getClerk("default");
+        // TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi:org.apache.juddi:test:keygenerator", "Test domain", "en");
+        //clerk.register(createKeyGenator);
+        BindingTemplate start = SubscriptionCallbackListener.start(c, "default");
+        Assert.assertNotNull(start);
+        //Assert.assertNotNull(start.getBindingKey());
+        SubscriptionCallbackListener.registerCallback(this);
+        Assert.assertNotNull(SubscriptionCallbackListener.getInstance());
+        SubscriptionCallbackListener.getInstance().notifySubscriptionListener(new NotifySubscriptionListener());
+
+        SubscriptionCallbackListener.stop(c, "default", start.getBindingKey());
+        c.stop();
+        Assert.assertTrue(Test2_NoAutoRegisterAndShortCircuitReceive_);
+    }
+
+    @Test(expected = ServiceAlreadyStartedException.class)
+    public void Test3_StartWhenAlreadyStarted() throws Exception {
+        log.info("Test3_StartWhenAlreadyStarted");
+        UDDIClient c = new UDDIClient("META-INF/uddi-subcallback1.xml");
+        c.start();
+        UDDIClerk clerk = c.getClerk("default");
+        // TModel createKeyGenator = UDDIClerk.createKeyGenator("uddi:org.apache.juddi:test:keygenerator", "Test domain", "en");
+        //clerk.register(createKeyGenator);
+        BindingTemplate start = SubscriptionCallbackListener.start(c, "default");
+        try {
+            BindingTemplate start1 = SubscriptionCallbackListener.start(c, "default");
+        } catch (ServiceAlreadyStartedException x) {
+            SubscriptionCallbackListener.stop(c, "default", null);
+            throw x;
+        }
+
+
+    }
+    private boolean Test4_NotifyEndpointStopped_ = false;
+
+    @Test
+    public void Test4_NotifyEndpointStopped() throws Exception {
+        log.info("Test4_NotifyEndpointStopped");
+        //reset
+        Test4_NotifyEndpointStopped_ = false;
+        UDDIClient c = new UDDIClient("META-INF/uddi-subcallback1.xml");
+        c.start();
+        UDDIClerk clerk = c.getClerk("default");
+
+        BindingTemplate start = SubscriptionCallbackListener.start(c, "default");
+        SubscriptionCallbackListener.registerCallback(this);
+
+        SubscriptionCallbackListener.stop(c, "default", null);
+        Assert.assertTrue(Test4_NotifyEndpointStopped_);
+
+
+    }
+
+    @Override
+    public void HandleCallback(SubscriptionResultsList body) {
+        log.info("HandleCallback received");
+        Test2_NoAutoRegisterAndShortCircuitReceive_ = true;
+    }
+
+    @Override
+    public void NotifyEndpointStopped() {
+        log.info("NotifyEndpointStopped received");
+        Test4_NotifyEndpointStopped_ = true;
+    }
+}

Copied: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml (from r1534826, juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml?p2=juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml&p1=juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml&r1=1534826&r2=1536322&rev=1536322&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml Mon Oct 28 12:11:50 2013
@@ -2,109 +2,65 @@
 <uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
     <reloadDelay>5000</reloadDelay>
     <client name="test-client">
-		<nodes>
-			<node isHomeJUDDI="true" >
-			    <!-- required 'default' node -->
-				<name>default</name> 
-				<description>Main jUDDI node</description>
-				<properties>
-					<property name="serverName" value="localhost" />
-					<property name="serverPort" value="8880" />
-					<!-- for UDDI nodes that use HTTP u/p, using the following 
-					<property name="basicAuthUsername" value="root" />
-					<property name="basicAuthPassword" value="password" />
-					<property name="basicAuthPasswordIsEncrypted" value="false" />
-					<property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
-				</properties>
-				<!-- JAX-WS Transport -->
-				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-				<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-				<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
-		        <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
-		        <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
-				<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
-				<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
-				<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
-				<!-- In VM Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
-				<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
-				<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
-		        <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
-		        <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
-				<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
-				<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
-				<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
-				-->
-				<!-- RMI Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
-				<custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-				<inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
-		        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
-		        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
-				<subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
-				<subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-				<juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
-				<javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
-				<javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
-				<javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
-				-->
-			</node>
-			<node>
-				<name>med</name>
-				<description>jUDDI node in other Department</description>
-				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-				<custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-				<inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
-		        <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
-		        <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
-				<subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
-				<subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
-				<juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
-			</node>
-		</nodes>
+        <nodes>
+            <node isHomeJUDDI="true" >
+                <!-- required 'default' node -->
+                <name>default</name> 
+                <description>Main jUDDI node</description>
+                <properties>
+                    <property name="serverName" value="localhost" />
+                    <property name="serverPort" value="8880" />
+                </properties>
+                <!-- JAX-WS Transport -->
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+            </node>
+        </nodes>
 		
-		<clerks registerOnStartup="false" >
-		   <clerk name="default" node="default" publisher="root" password="root"/>
-	       <clerk name="medroot" node="med"     publisher="root" password="root"/> 
-	       <xregister>
-		       <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
-		   </xregister>
-	   </clerks>
-	    <signature>
-			<!-- signing stuff -->
-			<signingKeyStorePath>keystore.jks</signingKeyStorePath>
-			<signingKeyStoreType>JKS</signingKeyStoreType>
-			<signingKeyStoreFilePassword 
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
-			<signingKeyPassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
-			<signingKeyAlias>my special key</signingKeyAlias>
-			<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
-			<signatureMethod>RSA_SHA1</signatureMethod>
-			<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
-			<!-- validation stuff -->
-			<trustStorePath>truststore.jks</trustStorePath>
-			<trustStoreType>JKS</trustStoreType>
-			<trustStorePassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+        <clerks registerOnStartup="false" >
+            <clerk name="default" node="default" publisher="root" password="root"/>
+        </clerks>
+        <signature>
+            <!-- signing stuff -->
+            <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+            <signingKeyStoreType>JKS</signingKeyStoreType>
+            <signingKeyStoreFilePassword 
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+            <signingKeyPassword
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+            <signingKeyAlias>my special key</signingKeyAlias>
+            <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+            <signatureMethod>RSA_SHA1</signatureMethod>
+            <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+            <!-- validation stuff -->
+            <trustStorePath>truststore.jks</trustStorePath>
+            <trustStoreType>JKS</trustStoreType>
+            <trustStorePassword
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
 			
-			<checkTimestamps>true</checkTimestamps>
-			<checkTrust>true</checkTrust>
-			<checkRevocationCRL>true</checkRevocationCRL>
-		</signature>
-		<subscriptionCallbacks>
-			<keyDomain>uddi:somebusiness</keyDomain>
-			<listenUrl>http://MyHostname:4444/callback</listenUrl>
-			<autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
-			<autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
-			<signatureBehavior>DoNothing</signatureBehavior>
-			<!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
-		</subscriptionCallbacks>
-		<XtoWsdl>
-			<IgnoreSSLErrors>false</IgnoreSSLErrors>
-		</XtoWsdl>
-	</client>
+            <checkTimestamps>true</checkTimestamps>
+            <checkTrust>true</checkTrust>
+            <checkRevocationCRL>true</checkRevocationCRL>
+        </signature>
+        <subscriptionCallbacks>
+            <keyDomain>uddi:somebusiness</keyDomain>
+            <listenUrl>http://localhost:4444/callback</listenUrl>
+            <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+            <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+            <signatureBehavior>DoNothing</signatureBehavior>
+            <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+        </subscriptionCallbacks>
+        <XtoWsdl>
+            <IgnoreSSLErrors>false</IgnoreSSLErrors>
+        </XtoWsdl>
+    </client>
 </uddi>
\ No newline at end of file

Copied: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml (from r1534826, juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml?p2=juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml&p1=juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml&r1=1534826&r2=1536322&rev=1536322&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml Mon Oct 28 12:11:50 2013
@@ -2,109 +2,65 @@
 <uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
     <reloadDelay>5000</reloadDelay>
     <client name="test-client">
-		<nodes>
-			<node isHomeJUDDI="true" >
-			    <!-- required 'default' node -->
-				<name>default</name> 
-				<description>Main jUDDI node</description>
-				<properties>
-					<property name="serverName" value="localhost" />
-					<property name="serverPort" value="8880" />
-					<!-- for UDDI nodes that use HTTP u/p, using the following 
-					<property name="basicAuthUsername" value="root" />
-					<property name="basicAuthPassword" value="password" />
-					<property name="basicAuthPasswordIsEncrypted" value="false" />
-					<property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
-				</properties>
-				<!-- JAX-WS Transport -->
-				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-				<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-				<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
-		        <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
-		        <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
-				<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
-				<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
-				<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
-				<!-- In VM Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
-				<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
-				<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
-		        <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
-		        <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
-				<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
-				<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
-				<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
-				-->
-				<!-- RMI Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
-				<custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-				<inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
-		        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
-		        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
-				<subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
-				<subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-				<juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
-				<javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
-				<javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
-				<javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
-				-->
-			</node>
-			<node>
-				<name>med</name>
-				<description>jUDDI node in other Department</description>
-				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-				<custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-				<inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
-		        <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
-		        <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
-				<subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
-				<subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
-				<juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
-			</node>
-		</nodes>
+        <nodes>
+            <node isHomeJUDDI="true" >
+                <!-- required 'default' node -->
+                <name>default</name> 
+                <description>Main jUDDI node</description>
+                <properties>
+                    <property name="serverName" value="localhost" />
+                    <property name="serverPort" value="8880" />
+                </properties>
+                <!-- JAX-WS Transport -->
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+            </node>
+        </nodes>
 		
-		<clerks registerOnStartup="false" >
-		   <clerk name="default" node="default" publisher="root" password="root"/>
-	       <clerk name="medroot" node="med"     publisher="root" password="root"/> 
-	       <xregister>
-		       <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
-		   </xregister>
-	   </clerks>
-	    <signature>
-			<!-- signing stuff -->
-			<signingKeyStorePath>keystore.jks</signingKeyStorePath>
-			<signingKeyStoreType>JKS</signingKeyStoreType>
-			<signingKeyStoreFilePassword 
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
-			<signingKeyPassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
-			<signingKeyAlias>my special key</signingKeyAlias>
-			<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
-			<signatureMethod>RSA_SHA1</signatureMethod>
-			<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
-			<!-- validation stuff -->
-			<trustStorePath>truststore.jks</trustStorePath>
-			<trustStoreType>JKS</trustStoreType>
-			<trustStorePassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+        <clerks registerOnStartup="false" >
+            <clerk name="default" node="default" publisher="root" password="root"/>
+        </clerks>
+        <signature>
+            <!-- signing stuff -->
+            <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+            <signingKeyStoreType>JKS</signingKeyStoreType>
+            <signingKeyStoreFilePassword 
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+            <signingKeyPassword
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+            <signingKeyAlias>my special key</signingKeyAlias>
+            <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+            <signatureMethod>RSA_SHA1</signatureMethod>
+            <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+            <!-- validation stuff -->
+            <trustStorePath>truststore.jks</trustStorePath>
+            <trustStoreType>JKS</trustStoreType>
+            <trustStorePassword
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
 			
-			<checkTimestamps>true</checkTimestamps>
-			<checkTrust>true</checkTrust>
-			<checkRevocationCRL>true</checkRevocationCRL>
-		</signature>
-		<subscriptionCallbacks>
-			<keyDomain>uddi:somebusiness</keyDomain>
-			<listenUrl>http://MyHostname:4444/callback</listenUrl>
-			<autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
-			<autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
-			<signatureBehavior>DoNothing</signatureBehavior>
-			<!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
-		</subscriptionCallbacks>
-		<XtoWsdl>
-			<IgnoreSSLErrors>false</IgnoreSSLErrors>
-		</XtoWsdl>
-	</client>
+            <checkTimestamps>true</checkTimestamps>
+            <checkTrust>true</checkTrust>
+            <checkRevocationCRL>true</checkRevocationCRL>
+        </signature>
+        <subscriptionCallbacks>
+            <keyDomain>uddi:somebusiness</keyDomain>
+            <listenUrl>http://localhost:4444/callback</listenUrl>
+            <autoRegisterBindingTemplate>true</autoRegisterBindingTemplate>
+            <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+            <signatureBehavior>DoNothing</signatureBehavior>
+            <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+        </subscriptionCallbacks>
+        <XtoWsdl>
+            <IgnoreSSLErrors>false</IgnoreSSLErrors>
+        </XtoWsdl>
+    </client>
 </uddi>
\ No newline at end of file

Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml?rev=1536322&r1=1536321&r2=1536322&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi.xml Mon Oct 28 12:11:50 2013
@@ -2,109 +2,109 @@
 <uddi xmlns="urn:juddi-apache-org:v3_client" xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
     <reloadDelay>5000</reloadDelay>
     <client name="test-client">
-		<nodes>
-			<node isHomeJUDDI="true" >
-			    <!-- required 'default' node -->
-				<name>default</name> 
-				<description>Main jUDDI node</description>
-				<properties>
-					<property name="serverName" value="localhost" />
-					<property name="serverPort" value="8880" />
-					<!-- for UDDI nodes that use HTTP u/p, using the following 
-					<property name="basicAuthUsername" value="root" />
-					<property name="basicAuthPassword" value="password" />
-					<property name="basicAuthPasswordIsEncrypted" value="false" />
-					<property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
-				</properties>
-				<!-- JAX-WS Transport -->
-				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-				<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-				<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
-		        <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
-		        <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
-				<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
-				<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
-				<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
-				<!-- In VM Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
-				<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
-				<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
-		        <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
-		        <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
-				<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
-				<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
-				<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
-				-->
-				<!-- RMI Transport Settings 
-				<proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
-				<custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
-				<inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
-		        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
-		        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
-				<subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
-				<subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
-				<juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
-				<javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
-				<javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
-				<javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
-				-->
-			</node>
-			<node>
-				<name>med</name>
-				<description>jUDDI node in other Department</description>
-				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-				<custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
-				<inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
-		        <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
-		        <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
-				<subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
-				<subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
-				<juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
-			</node>
-		</nodes>
+        <nodes>
+            <node isHomeJUDDI="true" >
+                <!-- required 'default' node -->
+                <name>default</name> 
+                <description>Main jUDDI node</description>
+                <properties>
+                    <property name="serverName" value="localhost" />
+                    <property name="serverPort" value="8880" />
+                    <!-- for UDDI nodes that use HTTP u/p, using the following 
+                    <property name="basicAuthUsername" value="root" />
+                    <property name="basicAuthPassword" value="password" />
+                    <property name="basicAuthPasswordIsEncrypted" value="false" />
+                    <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+                </properties>
+                <!-- JAX-WS Transport -->
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+                <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+                <!-- In VM Transport Settings 
+                <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+                <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+                <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+        <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+        <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+                <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+                <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+                <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+                -->
+                <!-- RMI Transport Settings 
+                <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
+                <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
+                <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
+        <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
+        <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
+                <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
+                <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
+                <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
+                <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
+                <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
+                <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
+                -->
+            </node>
+            <node>
+                <name>med</name>
+                <description>jUDDI node in other Department</description>
+                <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+                <custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+                <inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
+                <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
+                <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
+                <subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
+                <subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+                <juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+            </node>
+        </nodes>
 		
-		<clerks registerOnStartup="false" >
-		   <clerk name="default" node="default" publisher="root" password="root"/>
-	       <clerk name="medroot" node="med"     publisher="root" password="root"/> 
-	       <xregister>
-		       <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
-		   </xregister>
-	   </clerks>
-	    <signature>
-			<!-- signing stuff -->
-			<signingKeyStorePath>keystore.jks</signingKeyStorePath>
-			<signingKeyStoreType>JKS</signingKeyStoreType>
-			<signingKeyStoreFilePassword 
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
-			<signingKeyPassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
-			<signingKeyAlias>my special key</signingKeyAlias>
-			<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
-			<signatureMethod>RSA_SHA1</signatureMethod>
-			<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
-			<!-- validation stuff -->
-			<trustStorePath>truststore.jks</trustStorePath>
-			<trustStoreType>JKS</trustStoreType>
-			<trustStorePassword
-				isPasswordEncrypted="false" 
-				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+        <clerks registerOnStartup="false" >
+            <clerk name="default" node="default" publisher="root" password="root"/>
+            <clerk name="medroot" node="med"     publisher="root" password="root"/> 
+            <xregister>
+                <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
+            </xregister>
+        </clerks>
+        <signature>
+            <!-- signing stuff -->
+            <signingKeyStorePath>keystore.jks</signingKeyStorePath>
+            <signingKeyStoreType>JKS</signingKeyStoreType>
+            <signingKeyStoreFilePassword 
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyStoreFilePassword>
+            <signingKeyPassword
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</signingKeyPassword>
+            <signingKeyAlias>my special key</signingKeyAlias>
+            <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+            <signatureMethod>RSA_SHA1</signatureMethod>
+            <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+            <!-- validation stuff -->
+            <trustStorePath>truststore.jks</trustStorePath>
+            <trustStoreType>JKS</trustStoreType>
+            <trustStorePassword
+                isPasswordEncrypted="false" 
+                cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
 			
-			<checkTimestamps>true</checkTimestamps>
-			<checkTrust>true</checkTrust>
-			<checkRevocationCRL>true</checkRevocationCRL>
-		</signature>
-		<subscriptionCallbacks>
-			<keyDomain>uddi:somebusiness</keyDomain>
-			<listenUrl>http://MyHostname:4444/callback</listenUrl>
-			<autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
-			<autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
-			<signatureBehavior>DoNothing</signatureBehavior>
-			<!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
-		</subscriptionCallbacks>
-		<XtoWsdl>
-			<IgnoreSSLErrors>false</IgnoreSSLErrors>
-		</XtoWsdl>
-	</client>
+            <checkTimestamps>true</checkTimestamps>
+            <checkTrust>true</checkTrust>
+            <checkRevocationCRL>true</checkRevocationCRL>
+        </signature>
+        <subscriptionCallbacks>
+            <keyDomain>uddi:somebusiness</keyDomain>
+            <listenUrl>http://MyHostname:4444/callback</listenUrl>
+            <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+            <autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+            <signatureBehavior>DoNothing</signatureBehavior>
+            <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+        </subscriptionCallbacks>
+        <XtoWsdl>
+            <IgnoreSSLErrors>false</IgnoreSSLErrors>
+        </XtoWsdl>
+    </client>
 </uddi>
\ No newline at end of file

Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml?rev=1536322&r1=1536321&r2=1536322&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml Mon Oct 28 12:11:50 2013
@@ -49,7 +49,8 @@
                       isPasswordEncrypted="true" cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor"
             /> 
             <xregister>
-                <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
+                <service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" 
+                         fromClerk="default" toClerk="medroot"/>
             </xregister>
         </clerks>
 		<signature>
@@ -73,7 +74,7 @@
 				isPasswordEncrypted="false" 
 				cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
 			
-			<checkTimestamps>true</checkTimestamps>
+                            <checkTimestamps>true</checkTimestamps>
 			<checkTrust>true</checkTrust>
 			<checkRevocationCRL>true</checkRevocationCRL>
 		</signature>

Added: juddi/trunk/juddi-client/src/test/resources/wadl/cxf.wadl
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/wadl/cxf.wadl?rev=1536322&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/test/resources/wadl/cxf.wadl (added)
+++ juddi/trunk/juddi-client/src/test/resources/wadl/cxf.wadl Mon Oct 28 12:11:50 2013
@@ -0,0 +1,35 @@
+<application xmlns="http://wadl.dev.java.net/2009/02" xmlns:ns="http://superbooks">
+ <grammars>
+  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+        xmlns:tns="http://superbooks" attributeFormDefault="unqualified" elementFormDefault="unqualified" 
+        targetNamespace="http://superbooks">
+    <xs:element name="thebook" type="tns:book"/>
+    <xs:complexType name="book">
+        <xs:sequence>
+            <xs:element minOccurs="0" ref="tns:thechapter"/>
+            <xs:element name="id" type="xs:int"/>
+        </xs:sequence>
+    </xs:complexType>
+  </xs:schema>
+ </grammars>
+ <resources base="http://localhost:8080/">
+   <resource path="/bookstore/{id}">
+     <param name="id" style="template"/>
+     <method name="GET">
+      <response>
+       <representation mediaType="application/xml" element="ns:thebook"/>
+      </response>
+    </method>
+   </resource>
+   <resource path="/books">
+      <resource path="/bookstore/{id}">
+        <param name="id" style="template"/>
+        <method name="GET">
+          <response>
+           <representation mediaType="application/xml" element="ns:thebook"/>
+          </response>
+        </method>
+      </resource>
+   </resource>
+ </resources>  
+</application>
\ No newline at end of file



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


Mime
View raw message