Return-Path: X-Original-To: apmail-juddi-commits-archive@www.apache.org Delivered-To: apmail-juddi-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 937D010502 for ; Tue, 12 Nov 2013 02:56:35 +0000 (UTC) Received: (qmail 41918 invoked by uid 500); 12 Nov 2013 02:56:35 -0000 Delivered-To: apmail-juddi-commits-archive@juddi.apache.org Received: (qmail 41883 invoked by uid 500); 12 Nov 2013 02:56:35 -0000 Mailing-List: contact commits-help@juddi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@juddi.apache.org Received: (qmail 41876 invoked by uid 99); 12 Nov 2013 02:56:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 02:56:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 02:56:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4DD022388999; Tue, 12 Nov 2013 02:56:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1540929 [2/2] - in /juddi/trunk: juddi-client.net/juddi-client.net-sample/ juddi-client.net/juddi-client.net/ juddi-client.net/juddi-client.net/org.apache.juddi.jaxb/ juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/ jud... Date: Tue, 12 Nov 2013 02:56:10 -0000 To: commits@juddi.apache.org From: alexoree@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131112025612.4DD022388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd (original) +++ juddi/trunk/juddi-client/src/main/resources/xsd/uddi-client.xsd Tue Nov 12 02:56:09 2013 @@ -164,7 +164,7 @@ - + default is RSA_SHA1 @@ -187,6 +187,11 @@ + + + + + Modified: juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/DigSigUtilTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/DigSigUtilTest.java?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/DigSigUtilTest.java (original) +++ juddi/trunk/juddi-client/src/test/java/org/apache/juddi/v3/client/DigSigUtilTest.java Tue Nov 12 02:56:09 2013 @@ -47,23 +47,31 @@ public class DigSigUtilTest { Default(); } - void Default() throws CertificateException { - ds = new DigSigUtil(); - SetCertStoreSettigns(); - ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t"); - } - void SetCertStoreSettigns(){ + void SetCertStoreSettigns() { ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE, "./src/test/resources/keystore.jks"); ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILETYPE, "JKS"); ds.put(DigSigUtil.SIGNATURE_KEYSTORE_FILE_PASSWORD, "Test"); ds.put(DigSigUtil.SIGNATURE_KEYSTORE_KEY_ALIAS, "Test"); - ds.put(DigSigUtil.TRUSTSTORE_FILE, "./src/test/resources/truststore.jks"); ds.put(DigSigUtil.TRUSTSTORE_FILETYPE, "JKS"); ds.put(DigSigUtil.TRUSTSTORE_FILE_PASSWORD, "Test"); - - + + + } + + void Default() throws CertificateException { + ds = new DigSigUtil(); + SetCertStoreSettigns(); + ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t"); + } + + void Everything() throws CertificateException { + ds = new DigSigUtil(); + SetCertStoreSettigns(); + ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t"); + ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SUBJECTDN, "t"); + ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_SERIAL, "t"); } void SubjectDNOnly() throws CertificateException { @@ -80,7 +88,7 @@ public class DigSigUtilTest { @Test public void testSignBusinessSubjectDNOnly() throws CertificateException { - + SubjectDNOnly(); System.out.println("testSignBusinessSubjectDNOnly signing"); BusinessEntity be = new BusinessEntity(); @@ -109,7 +117,34 @@ public class DigSigUtilTest { public void testSignBusinessSerialAndIssuerOnly() throws CertificateException { System.out.println("testSignBusinessSerialAndIssuerOnly signing"); SerialAndIssuerOnly(); - + + BusinessEntity be = new BusinessEntity(); + be.setBusinessKey("uddi:juddi.apache.org:testkey"); + be.setDiscoveryURLs(new DiscoveryURLs()); + be.getDiscoveryURLs().getDiscoveryURL().add(new DiscoveryURL("website", "http://localhost")); + be.getDescription().add(new Description("a description", "en")); + be.getName().add(new Name("My biz", "en")); + + BusinessEntity signUDDI_JAXBObject = ds.signUddiEntity(be); + DigSigUtil.JAXB_ToStdOut(signUDDI_JAXBObject); + Assert.assertNotSame("items are the same", be, signUDDI_JAXBObject); + //System.out.println("verifing"); + AtomicReference msg = new AtomicReference(); + boolean verifySigned_UDDI_JAXB_Object = ds.verifySignedUddiEntity(signUDDI_JAXBObject, msg); + if (verifySigned_UDDI_JAXB_Object) { + //System.out.println("signature validation passed (expected)"); + } else { + System.out.println("signature validation failed (not expected)"); + Assert.fail(msg.get()); + } + validAllSignatureElementsArePresent(signUDDI_JAXBObject.getSignature()); + } + + @Test + public void testSignBusinessEverything() throws CertificateException { + System.out.println("testSignBusinessEverything signing"); + Everything(); + BusinessEntity be = new BusinessEntity(); be.setBusinessKey("uddi:juddi.apache.org:testkey"); be.setDiscoveryURLs(new DiscoveryURLs()); Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/subscription.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/subscription.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/resources/META-INF/subscription.xml (original) +++ juddi/trunk/juddi-client/src/test/resources/META-INF/subscription.xml Tue Nov 12 02:56:09 2013 @@ -65,7 +65,7 @@ - + keystore.jks JKS @@ -76,10 +76,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:org.apache.juddi:test Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml (original) +++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback1.xml Tue Nov 12 02:56:09 2013 @@ -27,30 +27,38 @@ - - keystore.jks - JKS - password - password - my special key - http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 - http://www.w3.org/2000/09/xmldsig# - - truststore.jks - JKS - password + + keystore.jks + JKS + password + password + my special key + + http://www.w3.org/2001/10/xml-exc-c14n# + http://www.w3.org/2000/09/xmldsig#rsa-sha1 + http://www.w3.org/2000/09/xmldsig# + + + + truststore.jks + JKS + password - true - true - true - + true + true + true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 + uddi:somebusiness http://localhost:4444/callback Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml (original) +++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback2.xml Tue Nov 12 02:56:09 2013 @@ -27,30 +27,38 @@ - - keystore.jks - JKS - password - password - my special key - http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 - http://www.w3.org/2000/09/xmldsig# - - truststore.jks - JKS - password + + keystore.jks + JKS + password + password + my special key + + http://www.w3.org/2001/10/xml-exc-c14n# + http://www.w3.org/2000/09/xmldsig#rsa-sha1 + http://www.w3.org/2000/09/xmldsig# + + + + truststore.jks + JKS + password - true - true - true - + true + true + true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 + uddi:somebusiness Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback3.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback3.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback3.xml (original) +++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi-subcallback3.xml Tue Nov 12 02:56:09 2013 @@ -27,30 +27,38 @@ - - keystore.jks - JKS - password - password - my special key - http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 - http://www.w3.org/2000/09/xmldsig# - - truststore.jks - JKS - password + + keystore.jks + JKS + password + password + my special key + + http://www.w3.org/2001/10/xml-exc-c14n# + http://www.w3.org/2000/09/xmldsig#rsa-sha1 + http://www.w3.org/2000/09/xmldsig# + + + + truststore.jks + JKS + password - true - true - true - + true + true + true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 + uddi:somebusiness asdasd://somebackprotocol:123122221/something 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=1540929&r1=1540928&r2=1540929&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 Tue Nov 12 02:56:09 2013 @@ -71,30 +71,38 @@ - - keystore.jks - JKS - password - password - my special key - http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 - http://www.w3.org/2000/09/xmldsig# - - truststore.jks - JKS - password + + keystore.jks + JKS + password + password + my special key + + http://www.w3.org/2001/10/xml-exc-c14n# + http://www.w3.org/2000/09/xmldsig#rsa-sha1 + http://www.w3.org/2000/09/xmldsig# + + + + truststore.jks + JKS + password - true - true - true - + true + true + true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 + uddi:somebusiness http://MyHostname:4444/callback Modified: juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml (original) +++ juddi/trunk/juddi-client/src/test/resources/META-INF/uddi2.xml Tue Nov 12 02:56:09 2013 @@ -59,10 +59,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness 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=1540929&r1=1540928&r2=1540929&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 Nov 12 02:56:09 2013 @@ -64,19 +64,27 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS password - true + true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness Modified: juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml (original) +++ juddi/trunk/juddi-examples/hello-world/src/main/resources/META-INF/hello-world-uddi.xml Tue Nov 12 02:56:09 2013 @@ -38,10 +38,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness Modified: juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml (original) +++ juddi/trunk/juddi-examples/simple-browse/src/main/resources/META-INF/simple-browse-uddi.xml Tue Nov 12 02:56:09 2013 @@ -38,10 +38,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml (original) +++ juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml Tue Nov 12 02:56:09 2013 @@ -44,10 +44,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml (original) +++ juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml Tue Nov 12 02:56:09 2013 @@ -43,10 +43,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness Modified: juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml (original) +++ juddi/trunk/juddi-gui/src/main/resources/META-INF/uddi.xml Tue Nov 12 02:56:09 2013 @@ -34,7 +34,7 @@ - + keystore.jks JKS my special key http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original) +++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Tue Nov 12 02:56:09 2013 @@ -3,7 +3,8 @@ jUDDI Graphical User Interface (juddi-gui) This is an end user web application for an implementation of OASIS's UDDI v3 specification - + Modified: juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1540929&r1=1540928&r2=1540929&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (original) +++ juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Tue Nov 12 02:56:09 2013 @@ -110,10 +110,14 @@ isPasswordEncrypted="false" cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">password my special key + http://www.w3.org/2001/10/xml-exc-c14n# - RSA_SHA1 + http://www.w3.org/2000/09/xmldsig#rsa-sha1 http://www.w3.org/2000/09/xmldsig# - + + + truststore.jks JKS true true true + false + false + true + http://www.w3.org/2000/09/xmldsig#sha1 uddi:somebusiness --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org For additional commands, e-mail: commits-help@juddi.apache.org