Added: juddi/trunk/juddi-examples/more-uddi-samples/keystore.jks
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/keystore.jks?rev=1543402&view=auto
==============================================================================
Binary file - no diff available.

Propchange: juddi/trunk/juddi-examples/more-uddi-samples/keystore.jks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
 (original)
+++ 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
 Tue Nov 19 12:30:09 2013
@@ -81,12 +81,19 @@ public class UddiDigitalSignatureBusines
             ds = new DigSigUtil();
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE, "keystore.jks");
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILETYPE, "JKS");
-            ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD, "password");
-            ds.put(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, "selfsigned");
-            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t");
+            ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD, "Test");
+            ds.put(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, "Test");
+            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "true");
+            //this flag will cause juddi to crash until JUDDI-716 is fixed
+            //TODO JUDDI-716
+            //ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SERIAL, 
"true");
+            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SUBJECTDN, 
"true");
+            ds.put(DigSigUtil.TRUSTSTORE_FILE, "truststore.jks");
+            ds.put(DigSigUtil.TRUSTSTORE_FILETYPE, "JKS");
+            ds.put(DigSigUtil.TRUSTSTORE_FILE_PASSWORD, "Test");
 
             //option 2), load it from the juddi config file
-            ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
+            //ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
 
             //login
             String token = null;

Modified: 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
 (original)
+++ 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureService.java
 Tue Nov 19 12:30:09 2013
@@ -82,10 +82,10 @@ public class UddiDigitalSignatureService
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILETYPE, "JKS");
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD, "password");
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, "selfsigned");
-            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t");
+            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "true");
 
             //option 2), load it from the juddi config file
-            ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
+            //ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
 
             //login
             String token = null;

Modified: 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
 (original)
+++ 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
 Tue Nov 19 12:30:09 2013
@@ -80,10 +80,10 @@ public class UddiDigitalSignatureTmodel 
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILETYPE, "JKS");
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD, "password");
             ds.put(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, "selfsigned");
-            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t");
+            ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "true");
 
             //option 2), load it from the juddi config file
-            ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
+            //ds = new 
DigSigUtil(clerkManager.getClientConfig().getDigitalSignatureConfiguration());
 
             //login
             String token = null;

Modified: 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
 (original)
+++ 
juddi/trunk/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
 Tue Nov 19 12:30:09 2013
@@ -3,30 +3,33 @@
 <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> 
+        <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)" />-->
+                    <!-- 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>
-                       
<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>
+                <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>
+                
<publishUrl>http://localhost:8888/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=""/>
+        </clerks>
+    </client>
 </uddi>

Added: juddi/trunk/juddi-examples/more-uddi-samples/truststore.jks
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/truststore.jks?rev=1543402&view=auto
==============================================================================
Binary file - no diff available.

Propchange: juddi/trunk/juddi-examples/more-uddi-samples/truststore.jks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: 
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: 
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1543402&r1=1543401&r2=1543402&view=diff
==============================================================================
--- 
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
 (original)
+++ 
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
 Tue Nov 19 12:30:09 2013
@@ -1967,7 +1967,7 @@ public class UddiHub implements Serializ
             sb.setAuthInfo(GetToken());
 
             sb.getTModel().add(be);
-            JAXB.marshal(be, System.out);
+            //JAXB.marshal(be, System.out);
             try {
                 publish.saveTModel(sb);
             } catch (Exception ex) {



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

Reply via email to