Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/HTTPNotifier.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/HTTPNotifier.java?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/HTTPNotifier.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/HTTPNotifier.java Tue Oct 8 02:50:36 2013 @@ -12,9 +12,6 @@ import javax.xml.ws.Service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.juddi.api_v3.AccessPointType; -import org.apache.juddi.config.AppConfig; -import org.apache.juddi.config.Property; -import org.apache.juddi.cryptor.CryptorFactory; import org.apache.juddi.model.BindingTemplate; import org.apache.juddi.v3.client.UDDIService; import org.uddi.api_v3.DispositionReport;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java Tue Oct 8 02:50:36 2013 @@ -89,7 +89,7 @@ public class SMTPNotifier implements Not return properties; } - public SMTPNotifier(BindingTemplate bindingTemplate) throws URISyntaxException, ConfigurationException { + public SMTPNotifier(BindingTemplate bindingTemplate) throws URISyntaxException, Exception { super(); if (!AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())) { log.error("smtp enpoints only support AccessPointType " + AccessPointType.END_POINT); Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java (original) +++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CryptedXMLDocAuthenticator.java Tue Oct 8 02:50:36 2013 @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.juddi.config.AppConfig; import org.apache.juddi.config.Property; -import org.apache.juddi.cryptor.Cryptor; +import org.apache.juddi.v3.client.cryptor.Cryptor; import org.apache.juddi.cryptor.CryptorFactory; import org.apache.juddi.v3.error.AuthenticationException; import org.apache.juddi.v3.error.ErrorMessage; @@ -104,6 +104,10 @@ public class CryptedXMLDocAuthenticator logger.error("Bad Padding Exception in crypting the password", e); throw new FatalErrorException(new ErrorMessage( "errors.auth.cryptor.BadPadding", e.getMessage())); + } catch (Exception e) { + logger.error(e.getMessage(), e); + throw new FatalErrorException(new ErrorMessage( + "errors.auth.cryptor.BlockSize", e.getMessage())); } } /** Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java (original) +++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java Tue Oct 8 02:50:36 2013 @@ -30,12 +30,12 @@ import org.apache.commons.logging.LogFac import org.apache.juddi.api.impl.API_010_PublisherTest; import org.apache.juddi.config.AppConfig; import org.apache.juddi.config.Property; -import org.apache.juddi.cryptor.AES128Cryptor; -import org.apache.juddi.cryptor.AES256Cryptor; -import org.apache.juddi.cryptor.Cryptor; +import org.apache.juddi.v3.client.cryptor.AES128Cryptor; +import org.apache.juddi.v3.client.cryptor.AES256Cryptor; +import org.apache.juddi.v3.client.cryptor.Cryptor; import org.apache.juddi.cryptor.CryptorFactory; -import org.apache.juddi.cryptor.DefaultCryptor; -import org.apache.juddi.cryptor.TripleDESCrytor; +import org.apache.juddi.v3.client.cryptor.DefaultCryptor; +import org.apache.juddi.v3.client.cryptor.TripleDESCrytor; import org.apache.juddi.v3.auth.Authenticator; import org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator; import org.apache.juddi.v3.auth.JUDDIAuthenticator; @@ -188,7 +188,7 @@ public class AuthenticatorTest { System.out.println("testBadCryptedXMLDocAuthenticator"); - Authenticator auth = new CryptedXMLDocAuthenticator(); + Authenticator auth = new CryptedXMLDocAuthenticator(); auth.authenticate("anou_mana","badpass"); } Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml (original) +++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml Tue Oct 8 02:50:36 2013 @@ -88,7 +88,7 @@ <uuidgen>org.apache.juddi.uuidgen.DefaultUUIDGen</uuidgen> <!-- jUDDI Cryptor implementation to use--> - <cryptor>org.apache.juddi.cryptor.DefaultCryptor</cryptor> + <cryptor>org.apache.juddi.v3.client.cryptor.DefaultCryptor</cryptor> <!-- jUDDI Key Generator to use--> <keygenerator>org.apache.juddi.keygen.DefaultKeyGenerator</keygenerator> Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml (original) +++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml Tue Oct 8 02:50:36 2013 @@ -83,7 +83,7 @@ <uuidgen>org.apache.juddi.uuidgen.DefaultUUIDGen</uuidgen> <!-- jUDDI Cryptor implementation to use--> - <cryptor>org.apache.juddi.cryptor.DefaultCryptor</cryptor> + <cryptor>org.apache.juddi.v3.client.cryptor.DefaultCryptor</cryptor> <!-- jUDDI Key Generator to use--> <keygenerator>org.apache.juddi.keygen.DefaultKeyGenerator</keygenerator> Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml (original) +++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml Tue Oct 8 02:50:36 2013 @@ -88,7 +88,7 @@ <uuidgen>org.apache.juddi.uuidgen.DefaultUUIDGen</uuidgen> <!-- jUDDI Cryptor implementation to use--> - <cryptor>org.apache.juddi.cryptor.DefaultCryptor</cryptor> + <cryptor>org.apache.juddi.v3.client.cryptor.DefaultCryptor</cryptor> <!-- jUDDI Key Generator to use--> <keygenerator>org.apache.juddi.keygen.DefaultKeyGenerator</keygenerator> Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml (original) +++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml Tue Oct 8 02:50:36 2013 @@ -87,7 +87,7 @@ <uuidgen>org.apache.juddi.uuidgen.DefaultUUIDGen</uuidgen> <!-- jUDDI Cryptor implementation to use--> - <cryptor>org.apache.juddi.cryptor.DefaultCryptor</cryptor> + <cryptor>org.apache.juddi.v3.client.cryptor.DefaultCryptor</cryptor> <!-- jUDDI Key Generator to use--> <keygenerator>org.apache.juddi.keygen.DefaultKeyGenerator</keygenerator> Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3.xml URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3.xml?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-core/src/test/resources/juddiv3.xml (original) +++ juddi/trunk/juddi-core/src/test/resources/juddiv3.xml Tue Oct 8 02:50:36 2013 @@ -88,7 +88,7 @@ <uuidgen>org.apache.juddi.uuidgen.DefaultUUIDGen</uuidgen> <!-- jUDDI Cryptor implementation to use--> - <cryptor>org.apache.juddi.cryptor.DefaultCryptor</cryptor> + <cryptor>org.apache.juddi.v3.client.cryptor.DefaultCryptor</cryptor> <!-- jUDDI Key Generator to use--> <keygenerator>org.apache.juddi.keygen.DefaultKeyGenerator</keygenerator> Modified: juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java (original) +++ juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java Tue Oct 8 02:50:36 2013 @@ -36,6 +36,7 @@ import java.util.List; import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.JOptionPane; import javax.xml.bind.JAXB; import javax.xml.crypto.dsig.CanonicalizationMethod; @@ -55,8 +56,10 @@ import javax.xml.crypto.dsig.spec.Transf import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + import netscape.javascript.JSObject; -import org.apache.juddi.v3.client.crypto.DigSigUtil; + +import org.apache.juddi.v3.client.cryptor.DigSigUtil; import org.uddi.api_v3.BindingTemplate; import org.uddi.api_v3.BusinessEntity; import org.uddi.api_v3.BusinessService; @@ -351,7 +354,7 @@ public class XmlSignatureApplet extends if (j != null) { try { //sign it - org.apache.juddi.v3.client.crypto.DigSigUtil ds = new DigSigUtil(); + org.apache.juddi.v3.client.cryptor.DigSigUtil ds = new DigSigUtil(); ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t"); PrivateKey key = (PrivateKey) keyStore.getKey((String) jList1.getSelectedValue(), null); Propchange: juddi/trunk/juddi-rest-cxf/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Oct 8 02:50:36 2013 @@ -1 +1,4 @@ target +.settings +.classpath +.project Modified: juddi/trunk/juddi-tomcat/juddi-cryptor.bat URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/juddi-cryptor.bat?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-tomcat/juddi-cryptor.bat (original) +++ juddi/trunk/juddi-tomcat/juddi-cryptor.bat Tue Oct 8 02:50:36 2013 @@ -1 +1 @@ -java -cp ..\webapps\juddiv3\WEB-INF\lib;..\webapps\juddiv3\WEB-INF\lib\* org.apache.juddi.v3.auth.CrytorUtil %* \ No newline at end of file +java -cp ..\webapps\juddiv3\WEB-INF\lib;..\webapps\juddiv3\WEB-INF\lib\* org.apache.juddi.v3.auth.CryptorUtil %* Modified: juddi/trunk/juddi-tomcat/juddi-cryptor.sh URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/juddi-cryptor.sh?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-tomcat/juddi-cryptor.sh (original) +++ juddi/trunk/juddi-tomcat/juddi-cryptor.sh Tue Oct 8 02:50:36 2013 @@ -1,2 +1,2 @@ -#!/bin/bash -java -cp ../webapps/juddiv3/WEB-INF/lib:../webapps/juddiv3/WEB-INF/lib/* org.apache.juddi.v3.auth.CrytorUtil $* +#!/bin/bash +java -cp ../webapps/juddiv3/WEB-INF/lib:../webapps/juddiv3/WEB-INF/lib/* org.apache.juddi.v3.auth.CryptorUtil $* Modified: juddi/trunk/juddi-tomcat/juddi-md5.sh URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/juddi-md5.sh?rev=1530138&r1=1530137&r2=1530138&view=diff ============================================================================== --- juddi/trunk/juddi-tomcat/juddi-md5.sh (original) +++ juddi/trunk/juddi-tomcat/juddi-md5.sh Tue Oct 8 02:50:36 2013 @@ -1,2 +1,2 @@ -#!/bin/bash +#!/bin/bash java -cp ../webapps/juddiv3/WEB-INF/lib:../webapps/juddiv3/WEB-INF/lib/* org.apache.juddi.v3.auth.MD5XMLDocAuthenticator \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
