Author: alexoree
Date: Tue Jan 14 23:35:48 2014
New Revision: 1558242

URL: http://svn.apache.org/r1558242
Log:
JUDDI-717 updating simple publish clerk, test works now. adding documentation 
to uddiclient

Modified:
    
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
    juddi/trunk/juddi-client/src/test/resources/META-INF/uddi3-enc-aes128.xml
    
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/java/org/apache/juddi/example/publish/SimplePublishClerk.java
    
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/resources/META-INF/uddi.xml
    
juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java

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=1558242&r1=1558241&r2=1558242&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
 Tue Jan 14 23:35:48 2014
@@ -401,8 +401,8 @@ public class UDDIClient {
      * @param clerkName - This references the uddi/client/clerk@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
+     * specified, the value of "default" will be used.
+     * @return A clerk instance if the clerk is defined in the config file or 
NULL if not found
      */
     public UDDIClerk getClerk(String clerkName) {
         if (clerkName == null || clerkName.length() == 0) {

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=1558242&r1=1558241&r2=1558242&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 
Tue Jan 14 23:35:48 2014
@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <uddi xmlns="urn:juddi-apache-org:v3_client" 
xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
-    <reloadDelay>5000</reloadDelay>
-    <client name="second-client">
-        <nodes>
-            <node isHomeJUDDI="true">
-                <name>default</name> 
-                <description>Local 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>
-                               
<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
-                
<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>
-            <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>
+        <reloadDelay>5000</reloadDelay>
+        <client name="second-client">
+                <nodes>
+                        <node isHomeJUDDI="true">
+                                <name>default</name> 
+                                <description>Local 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>
+                                
<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+                                
<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>
+                        <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">
-            <!-- root -->
-            <clerk name="default" node="default" publisher="root" 
password="7d3e79ca453f4ebfd36e22afe029c3a2"
-                          isPasswordEncrypted="true" 
cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor"
-            />
-            <!-- password -->
-            <clerk name="medroot" node="med"     publisher="root" 
password="18604180541d172f9827e08c998db568"
-                      isPasswordEncrypted="true" 
cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor"
-            /> 
-            <xregister>
-                <service 
bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" 
+                <clerks registerOnStartup="false">
+                        <!-- root -->
+                        <clerk name="default" node="default" publisher="root" 
password="7d3e79ca453f4ebfd36e22afe029c3a2"
+                   isPasswordEncrypted="true" 
cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor"
+                        />
+                        <!-- password -->
+                        <clerk name="medroot" node="med"     publisher="root" 
password="18604180541d172f9827e08c998db568"
+                   isPasswordEncrypted="true" 
cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor"
+                        /> 
+                        <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>
+                        </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>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
-                       
<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
+                        
<canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod>
+                        
<signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod>
+                        
<XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS>
 
-                       <!-- validation stuff 
-                       Used whenever someone views an entity that is signed 
and validation is required -->
-                       <!-- if this doesn't exist or is incorrect, the client 
will atempt to load the standard jdk trust store-->
-                       <trustStorePath>truststore.jks</trustStorePath>
-                       <trustStoreType>JKS</trustStoreType>
-                       <trustStorePassword
-                               isPasswordEncrypted="false" 
-                               
cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
+                        <!-- validation stuff 
+                        Used whenever someone views an entity that is signed 
and validation is required        -->
+                        <!-- if this doesn't exist or is incorrect, the client 
will atempt to load the standard jdk trust store-->
+                        <trustStorePath>truststore.jks</trustStorePath>
+                        <trustStoreType>JKS</trustStoreType>
+                        <trustStorePassword
+                                isPasswordEncrypted="false" 
+                                
cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password</trustStorePassword>
                        
-                       <checkTimestamps>true</checkTimestamps>
-                       <checkTrust>true</checkTrust>
-                       <checkRevocationCRL>true</checkRevocationCRL>
-                       
<keyInfoInclusionSubjectDN>false</keyInfoInclusionSubjectDN>
-                       <keyInfoInclusionSerial>false</keyInfoInclusionSerial>
-                       
<keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
-                       
<digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
-               </signature>
-               <subscriptionCallbacks>
-                       <keyDomain>uddi:somebusiness</keyDomain>
-                       <listenUrl>http://MyHostname:4444/callback</listenUrl>
-                       
<autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
-                       
<autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
-                       <signatureBehavior>DoNothing</signatureBehavior>
-                       <!--valid values are 
AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
-               </subscriptionCallbacks>
-               <XtoWsdl>
-                       <IgnoreSSLErrors>false</IgnoreSSLErrors>
-               </XtoWsdl>
-    </client>
+                        <checkTimestamps>true</checkTimestamps>
+                        <checkTrust>true</checkTrust>
+                        <checkRevocationCRL>true</checkRevocationCRL>
+                        
<keyInfoInclusionSubjectDN>false</keyInfoInclusionSubjectDN>
+                        <keyInfoInclusionSerial>false</keyInfoInclusionSerial>
+                        
<keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey>
+                        
<digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod>
+                </signature>
+                <subscriptionCallbacks>
+                        <keyDomain>uddi:somebusiness</keyDomain>
+                        <listenUrl>http://MyHostname:4444/callback</listenUrl>
+                        
<autoRegisterBindingTemplate>false</autoRegisterBindingTemplate>
+                        
<autoRegisterBusinessServiceKey>uddi:somebusiness:someservicekey</autoRegisterBusinessServiceKey>
+                        <signatureBehavior>DoNothing</signatureBehavior>
+                        <!--valid values are 
AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing-->
+                </subscriptionCallbacks>
+                <XtoWsdl>
+                        <IgnoreSSLErrors>false</IgnoreSSLErrors>
+                </XtoWsdl>
+        </client>
 </uddi>
\ No newline at end of file

Modified: 
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/java/org/apache/juddi/example/publish/SimplePublishClerk.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish-clerk/src/main/java/org/apache/juddi/example/publish/SimplePublishClerk.java?rev=1558242&r1=1558241&r2=1558242&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/java/org/apache/juddi/example/publish/SimplePublishClerk.java
 (original)
+++ 
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/java/org/apache/juddi/example/publish/SimplePublishClerk.java
 Tue Jan 14 23:35:48 2014
@@ -112,6 +112,7 @@ public class SimplePublishClerk {
                         clerk.discardAuthToken();
                         // Now you have a business and service via 
                         // the jUDDI API!
+                        System.out.println("Success!");
 
                 } catch (Exception e) {
                         e.printStackTrace();

Modified: 
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/resources/META-INF/uddi.xml
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish-clerk/src/main/resources/META-INF/uddi.xml?rev=1558242&r1=1558241&r2=1558242&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/resources/META-INF/uddi.xml
 (original)
+++ 
juddi/trunk/juddi-examples/simple-publish-clerk/src/main/resources/META-INF/uddi.xml
 Tue Jan 14 23:35:48 2014
@@ -1,33 +1,38 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <uddi xmlns="urn:juddi-apache-org:v3_client" 
xsi:schemaLocation="classpath:/xsd/uddi-client.xsd">
-    <reloadDelay>5000</reloadDelay>
-    <client name="example-client">
-               <nodes>
-                       <node>
-                           <!-- required 'default' node -->
-                               <name>default</name> 
-                <properties>
-                    <property name="serverName" value="localhost"/>
-                    <property name="serverPort" value="8080"/>
-                                       <!-- for UDDI nodes that use HTTP u/p, 
using the following 
-                                       <property name="basicAuthUsername" 
value="root" />
-                                       <property name="basicAuthPassword" 
value="password" />
-                                       <property 
name="basicAuthPasswordIsEncrypted" value="false" />
-                                       <property 
name="basicAuthPasswordCryptoProvider" 
value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
-                </properties>
-                               <description>Main jUDDI node</description>
-                               <!-- JAX-WS Transport -->
-                               
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
-                               
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
-                               
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
-                               
<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
-                       
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
-                       
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
-                               
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
-                               
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
-                               
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
-                       </node>
-               </nodes>
-       </client>
+        <reloadDelay>5000</reloadDelay>
+        <client name="example-client">
+                <nodes>
+                        <node>
+                                <!-- required 'default' node -->
+                                <name>default</name> 
+                                <properties>
+                                        <property name="serverName" 
value="localhost"/>
+                                        <property name="serverPort" 
value="8080"/>
+                                        <!-- for UDDI nodes that use HTTP u/p, 
using the following 
+                                        <property name="basicAuthUsername" 
value="root" />
+                                        <property name="basicAuthPassword" 
value="password" />
+                                        <property 
name="basicAuthPasswordIsEncrypted" value="false" />
+                                        <property 
name="basicAuthPasswordCryptoProvider" 
value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+                                </properties>
+                                <description>Main jUDDI node</description>
+                                <!-- JAX-WS Transport -->
+                                
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+                                
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+                                
<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+                                
<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+                                
<publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+                                
<securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+                                
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
+                                
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
+                                
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
+                        </node>
+                </nodes>
+                <clerks registerOnStartup="false" >
+                        <clerk name="default" node="default" publisher="uddi" 
password="uddi"
+                               isPasswordEncrypted="false" 
cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor"/>
+                </clerks>
+
+        </client>
 </uddi>

Modified: 
juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java?rev=1558242&r1=1558241&r2=1558242&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
 (original)
+++ 
juddi/trunk/juddi-examples/simple-publish-portable/src/main/java/org/apache/juddi/example/publish/SimplePublishPortable.java
 Tue Jan 14 23:35:48 2014
@@ -116,6 +116,7 @@ public class SimplePublishPortable {
                         security.discardAuthToken(new 
DiscardAuthToken(myPubAuthToken.getAuthInfo()));
                         // Now you have published a business and service via 
                         // the jUDDI API!
+                        System.out.println("Success!");
 
                 } catch (Exception e) {
                         e.printStackTrace();



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to