JUDDI-977 findbugs
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/f9e0b9d3 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/f9e0b9d3 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/f9e0b9d3 Branch: refs/heads/master Commit: f9e0b9d3400b2dd06dabeb0ca8f3fe5b52c8b49c Parents: 39f48eb Author: Alex O'Ree <[email protected]> Authored: Sun Oct 1 21:45:37 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Sun Oct 1 21:45:37 2017 -0400 ---------------------------------------------------------------------- juddi-client-cli/pom.xml | 8 - .../juddi/v3/client/config/ClientConfig.java | 2 +- .../juddi/v3/client/config/UDDIClerk.java | 2 +- .../v3/client/config/UDDIClerkServlet.java | 2 +- .../juddi/v3/client/config/WebHelper.java | 2 +- .../juddi/v3/client/cryptor/AES128Cryptor.java | 7 +- .../juddi/v3/client/cryptor/AES256Cryptor.java | 7 +- .../v3/client/cryptor/AESCryptorAbstract.java | 11 +- .../apache/juddi/v3/client/cryptor/Cryptor.java | 9 +- .../juddi/v3/client/cryptor/DefaultCryptor.java | 13 +- .../juddi/v3/client/cryptor/DigSigUtil.java | 10 +- .../client/cryptor/TransportSecurityHelper.java | 32 +- .../v3/client/cryptor/TripleDESCrytor.java | 8 +- .../juddi/v3/client/mapping/MapUDDIv2Tov3.java | 4 +- .../v3/client/mapping/PolicyLocalFirst.java | 8 +- .../juddi/v3/client/mapping/ServiceLocator.java | 3 +- .../v3/client/mapping/UDDIServiceCache.java | 4 +- .../v3/client/transport/JAXWSTransport.java | 2 +- .../transport/JAXWSv2TranslationTransport.java | 2 +- .../client/transport/wrapper/Inquiry3to2.java | 3 + .../transport/wrapper/RequestHandler.java | 2 +- .../juddi/api/impl/AuthenticatedService.java | 10 +- .../org/apache/juddi/api/impl/JUDDIApiImpl.java | 14 +- .../juddi/api/impl/UDDICustodyTransferImpl.java | 39 ++- .../apache/juddi/api/impl/UDDIInquiryImpl.java | 4 +- .../juddi/api/impl/UDDIPublicationImpl.java | 26 +- .../juddi/api/impl/UDDIReplicationImpl.java | 115 +++--- .../juddi/api/impl/UDDIValueSetCachingImpl.java | 2 + .../api/impl/UDDIValueSetValidationImpl.java | 16 +- .../apache/juddi/api/impl/XRegisterHelper.java | 1 - .../juddi/api/util/CustodyTransferQuery.java | 10 +- .../org/apache/juddi/api/util/InquiryQuery.java | 7 + .../org/apache/juddi/api/util/JUDDIQuery.java | 6 + .../apache/juddi/api/util/PublicationQuery.java | 6 + .../org/apache/juddi/api/util/QueryStatus.java | 6 + .../apache/juddi/api/util/ReplicationQuery.java | 6 + .../apache/juddi/api/util/SecurityQuery.java | 6 + .../api/util/SubscriptionListenerQuery.java | 7 + .../juddi/api/util/SubscriptionQuery.java | 6 + .../juddi/api/util/ValueSetCachingQuery.java | 6 + .../juddi/api/util/ValueSetValidationQuery.java | 6 + .../java/org/apache/juddi/config/AppConfig.java | 2 +- .../java/org/apache/juddi/config/Install.java | 16 +- .../apache/juddi/cryptor/CryptorFactory.java | 2 +- .../apache/juddi/mapping/MappingApiToModel.java | 47 ++- .../apache/juddi/mapping/MappingModelToApi.java | 1 - .../org/apache/juddi/model/KeyDataValue.java | 3 +- .../apache/juddi/model/PublisherAssertion.java | 267 +++++++------- .../juddi/query/BindingTemplateQuery.java | 2 +- .../apache/juddi/query/BusinessEntityQuery.java | 2 +- .../juddi/query/BusinessServiceQuery.java | 2 +- ...DeletePublisherAssertionByBusinessQuery.java | 2 +- .../juddi/query/FetchBindingTemplatesQuery.java | 4 +- .../juddi/query/FetchBusinessEntitiesQuery.java | 4 +- .../juddi/query/FetchBusinessServicesQuery.java | 4 +- .../apache/juddi/query/FetchTModelsQuery.java | 4 +- .../query/FindBindingByCategoryGroupQuery.java | 2 +- .../juddi/query/FindBindingByCategoryQuery.java | 2 +- .../query/FindBindingByTModelKeyQuery.java | 2 +- .../query/FindBusinessByCategoryGroupQuery.java | 2 +- .../query/FindBusinessByCategoryQuery.java | 2 +- .../query/FindBusinessByDiscoveryURLQuery.java | 2 +- .../query/FindBusinessByIdentifierQuery.java | 2 +- .../juddi/query/FindBusinessByNameQuery.java | 2 +- .../query/FindBusinessByPublisherQuery.java | 2 +- .../query/FindBusinessByTModelKeyQuery.java | 4 +- .../query/FindEntityByCategoryGroupQuery.java | 16 +- .../juddi/query/FindEntityByCategoryQuery.java | 2 +- .../FindEntityByCombinedCategoryQuery.java | 4 +- .../query/FindEntityByIdentifierQuery.java | 20 +- .../juddi/query/FindEntityByNamesQuery.java | 14 +- .../juddi/query/FindEntityByPublisherQuery.java | 8 +- .../query/FindServiceByCategoryGroupQuery.java | 2 +- .../juddi/query/FindServiceByCategoryQuery.java | 2 +- .../FindServiceByCombinedCategoryQuery.java | 2 +- .../juddi/query/FindServiceByNameQuery.java | 2 +- .../query/FindServiceByTModelKeyQuery.java | 2 +- .../query/FindTModelByCategoryGroupQuery.java | 2 +- .../juddi/query/FindTModelByCategoryQuery.java | 2 +- .../query/FindTModelByIdentifierQuery.java | 2 +- .../juddi/query/FindTModelByPublisherQuery.java | 2 +- .../juddi/query/PublisherAssertionQuery.java | 4 +- .../apache/juddi/query/SubscriptionQuery.java | 2 +- .../org/apache/juddi/query/TModelQuery.java | 2 +- .../juddi/replication/ReplicationNotifier.java | 7 +- .../subscription/SubscriptionNotifier.java | 23 +- .../juddi/v3/auth/XMLDocAuthenticator.java | 252 +++++++------- .../validation/ValidateCustodyTransfer.java | 10 +- .../juddi/validation/ValidatePublish.java | 20 +- .../juddi/validation/ValidateReplication.java | 11 +- .../juddi/validation/ValidateUDDIKey.java | 4 +- .../ValidateValuesFromWebService.java | 13 +- .../validation/vsv/AbstractSimpleValidator.java | 6 +- .../Uddiuddiorgcategorizationderivedfrom.java | 6 +- .../vsv/Uddiuddiorgidentifierisreplacedby.java | 24 -- .../src/main/resources/messages.properties | 1 + .../examples/vsv/valuesetvalidator/App.java | 2 +- pom.xml | 5 +- uddi-client-dist/pom.xml | 346 +++++++++---------- uddi-tck/pom.xml | 5 +- .../tck/JUDDI_300_MultiNodeIntegrationTest.java | 2 +- 101 files changed, 894 insertions(+), 757 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client-cli/pom.xml ---------------------------------------------------------------------- diff --git a/juddi-client-cli/pom.xml b/juddi-client-cli/pom.xml index 9340343..b9b1b3b 100644 --- a/juddi-client-cli/pom.xml +++ b/juddi-client-cli/pom.xml @@ -57,14 +57,6 @@ </dependencies> <build> <plugins> - <!-- examples are not very useful from a maven repo, so don't put it there --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java index db8c970..f6c7999 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java @@ -238,7 +238,7 @@ public class ClientConfig { UDDIClerk.WSDL[] wsdls = new UDDIClerk.WSDL[numberOfWslds]; for (int w = 0; w < wsdls.length; w++) { - UDDIClerk.WSDL wsdl = uddiClerk.new WSDL(); + UDDIClerk.WSDL wsdl = new UDDIClerk.WSDL(); String fileName = config.getString("client.clerks.clerk(" + i + ").wsdl(" + w + ")"); wsdl.setFileName(fileName); if (!new File(fileName).exists()) { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java index f500a52..29c54b9 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java @@ -1489,7 +1489,7 @@ public class UDDIClerk implements Serializable { /** * Internal classed used for wsdl registration */ - public class WSDL { + public static class WSDL { private String businessKey; private String keyDomain; http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java index f210b49..6c973c1 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; public class UDDIClerkServlet extends HttpServlet { private static final long serialVersionUID = -91998529871296125L; - private Log logger = LogFactory.getLog(UDDIClerkServlet.class); + private static final Log logger = LogFactory.getLog(UDDIClerkServlet.class); private UDDIClient manager = null; /** http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java index 5935e05..67345ee 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java @@ -75,7 +75,7 @@ public class WebHelper { logger.info("Reading the clientName from the clientConfig file " + clientConfigFile); UDDIClient client = new UDDIClient(clientConfigFile); - if (clientConfigFile==null && client.getName()==null) { + if (client.getName()==null) { logger.warn("Deprecated, client name set to 'default', however it should be provided in the uddi.xml"); clientName = "default"; } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES128Cryptor.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES128Cryptor.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES128Cryptor.java index a622acf..a309236 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES128Cryptor.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES128Cryptor.java @@ -16,16 +16,15 @@ */ package org.apache.juddi.v3.client.cryptor; +import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.SecretKeySpec; /** * AES 128 bit encryption @@ -54,12 +53,12 @@ public class AES128Cryptor extends AESCryptorAbstract { } @Override - public String encrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + public String encrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException { return super.encrypt(str); } @Override - public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException { return super.decrypt(str); } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES256Cryptor.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES256Cryptor.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES256Cryptor.java index afec33b..fb9237f 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES256Cryptor.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AES256Cryptor.java @@ -16,16 +16,15 @@ */ package org.apache.juddi.v3.client.cryptor; +import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.SecretKeySpec; /** * AES 256 bit encryption. <h1> Requires Unlimited Strength Java Cryptographic @@ -55,12 +54,12 @@ public class AES256Cryptor extends AESCryptorAbstract { } @Override - public String encrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + public String encrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException { return super.encrypt(str); } @Override - public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException { return super.decrypt(str); } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AESCryptorAbstract.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AESCryptorAbstract.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AESCryptorAbstract.java index 7d934b5..5e2ae60 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AESCryptorAbstract.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/AESCryptorAbstract.java @@ -16,6 +16,7 @@ */ package org.apache.juddi.v3.client.cryptor; +import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -83,13 +84,14 @@ public abstract class AESCryptorAbstract implements Cryptor { InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, - BadPaddingException { + BadPaddingException, + UnsupportedEncodingException { byte[] raw = hexToBytes(getKey()); // SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); // Instantiate the cipher Cipher cipher = Cipher.getInstance("AES"); cipher.init(Cipher.ENCRYPT_MODE, skeySpec); - byte[] encrypted = cipher.doFinal(cleartext.getBytes()); + byte[] encrypted = cipher.doFinal(cleartext.getBytes("UTF-8")); return asHex(encrypted); } @@ -103,7 +105,8 @@ public abstract class AESCryptorAbstract implements Cryptor { InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, - BadPaddingException { + BadPaddingException, + UnsupportedEncodingException{ byte[] raw = hexToBytes(getKey()); // SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); // Instantiate the cipher @@ -111,7 +114,7 @@ public abstract class AESCryptorAbstract implements Cryptor { cipher.init(Cipher.DECRYPT_MODE, skeySpec); byte[] original = cipher.doFinal(hexToBytes(str)); - return new String(original); + return new String(original, "UTF-8"); } private static String asHex(byte buf[]) { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java index 0cd8312..9f8dbcd 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java @@ -16,6 +16,7 @@ */ package org.apache.juddi.v3.client.cryptor; +import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -40,6 +41,7 @@ public interface Cryptor { * @throws InvalidKeyException * @throws IllegalBlockSizeException * @throws BadPaddingException + * @throws java.io.UnsupportedEncodingException */ String encrypt(String str) throws NoSuchPaddingException, @@ -47,7 +49,8 @@ public interface Cryptor { InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, - BadPaddingException; + BadPaddingException, + UnsupportedEncodingException; /** * decrypts the string @@ -62,13 +65,15 @@ public interface Cryptor { * @throws InvalidKeyException * @throws IllegalBlockSizeException * @throws BadPaddingException + * @throws java.io.UnsupportedEncodingException */ public String decrypt(String str) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, - BadPaddingException; + BadPaddingException, + UnsupportedEncodingException; public String newKey(); } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DefaultCryptor.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DefaultCryptor.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DefaultCryptor.java index a42cd42..040ca27 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DefaultCryptor.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DefaultCryptor.java @@ -16,6 +16,7 @@ */ package org.apache.juddi.v3.client.cryptor; +import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -95,10 +96,11 @@ public class DefaultCryptor implements Cryptor { InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, - BadPaddingException { + BadPaddingException, + UnsupportedEncodingException { byte[] encs = crypt(Cipher.ENCRYPT_MODE, str.getBytes()); encs = Base64.encodeBase64(encs); - return new String(encs); + return new String(encs, "UTF-8"); } public String decrypt(String str) throws NoSuchPaddingException, @@ -106,9 +108,10 @@ public class DefaultCryptor implements Cryptor { InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, - BadPaddingException { - byte[] encs = crypt(Cipher.DECRYPT_MODE, Base64.decodeBase64(str.getBytes())); - return new String(encs); + BadPaddingException, + UnsupportedEncodingException { + byte[] encs = crypt(Cipher.DECRYPT_MODE, Base64.decodeBase64(str.getBytes("UTF-8"))); + return new String(encs, "UTF-8"); } @Override http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java index fd8628d..b773c19 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java @@ -582,7 +582,7 @@ public class DigSigUtil { TrustAnchor ta = pkixResult.getTrustAnchor(); X509Certificate cert = ta.getTrustedCert(); - logger.info("trust chain validated X509 public key " + signingcert.getSubjectDN().toString()); + logger.info("trust chain validated X509 public key " + signingcert.getSubjectDN().toString() + " issued by " + cert.getPublicKey().toString()); } catch (Exception ex) { OutErrorMessage.set("Certificate status Trust validation failed: " + ex.getMessage() + "." + OutErrorMessage.get()); } @@ -702,11 +702,12 @@ public class DigSigUtil { } if (!ksLoaded) { + FileInputStream fis=null; try { //File f = new File(map.getProperty(TRUSTSTORE_FILE)); if (f.exists()) { - FileInputStream fis = new FileInputStream(f); + fis = new FileInputStream(f); ks.load(fis, (map.getProperty(TRUSTSTORE_FILE_PASSWORD)).toCharArray()); fis.close(); ksLoaded = true; @@ -715,7 +716,10 @@ public class DigSigUtil { } catch (Exception x) { logger.warn("unable to load truststore from file "+map.getProperty(TRUSTSTORE_FILE)+" "+ x.getMessage()); logger.debug("unable to load truststore from file "+ x.getMessage(), x); - + } + finally { + if (fis!=null) + fis.close(); } } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java index d88cb7d..ed8b07e 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; /** * - * @author alex + * @author [email protected] */ public class TransportSecurityHelper { @@ -42,7 +42,7 @@ public class TransportSecurityHelper { String st = System.getProperty("javax.net.ssl.trustStore"); log.info("Attempting to initialize keystore and truststore from " + s + " " + st); if (s == null) { - log.warn("keystore isn't defined! " + s); + log.warn("keystore isn't defined!"); return false; } else if (st == null) { log.warn("truststore isn't defined! " + s); @@ -75,6 +75,7 @@ public class TransportSecurityHelper { } if (keystore.exists()) { + FileInputStream fis = null; try { log.info("Using keystore from " + keystore.getAbsolutePath() + " current dir is " + currentdir.getAbsolutePath()); @@ -86,22 +87,37 @@ public class TransportSecurityHelper { = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); - ks.load(new FileInputStream(keystore), pwd.toCharArray()); + try { + fis = new FileInputStream(keystore); + ks.load(fis, pwd.toCharArray()); + } catch (Exception ex) { + log.warn("unable to load key store " + keystore.getAbsolutePath(), ex); + } finally { + if (fis != null) { + fis.close(); + } + } kmf.init(ks, pwd.toCharArray()); String alg = TrustManagerFactory.getDefaultAlgorithm(); TrustManagerFactory tmFact = TrustManagerFactory.getInstance(alg); - FileInputStream fis = new FileInputStream(st); + fis = new FileInputStream(st); KeyStore kst = KeyStore.getInstance("jks"); - kst.load(fis, pwdt.toCharArray()); - fis.close(); + try { + kst.load(fis, pwdt.toCharArray()); + } catch (Exception ex) { + log.warn("unable to load key store " + st, ex); + } finally { + if (fis != null) { + fis.close(); + } + } tmFact.init(kst); - TrustManager[] tms = tmFact.getTrustManagers(); - + //TrustManager[] tms = tmFact.getTrustManagers(); sc.init(kmf.getKeyManagers(), null, null); HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); ((BindingProvider) webServicePort).getRequestContext().put("com.sun.xml.internal.ws.transport.https.client.SSLSocketFactory", sc.getSocketFactory()); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TripleDESCrytor.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TripleDESCrytor.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TripleDESCrytor.java index 0fe75b6..fcd90bc 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TripleDESCrytor.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TripleDESCrytor.java @@ -70,7 +70,7 @@ public class TripleDESCrytor implements Cryptor { cipher.init(Cipher.ENCRYPT_MODE, key); byte[] plainText = clear.getBytes(UNICODE_FORMAT); byte[] encryptedText = cipher.doFinal(plainText); - encryptedString = new String(Base64.encodeBase64(encryptedText)); + encryptedString = new String(Base64.encodeBase64(encryptedText), UNICODE_FORMAT); } catch (Exception e) { e.printStackTrace(); } @@ -88,7 +88,7 @@ public class TripleDESCrytor implements Cryptor { kgen.init(168); SecretKey skey = kgen.generateKey(); byte[] raw = skey.getEncoded(); - return new String(Base64.encodeBase64(raw)); + return new String(Base64.encodeBase64(raw),UNICODE_FORMAT); } catch (Exception ex) { ex.printStackTrace();; } @@ -100,9 +100,9 @@ public class TripleDESCrytor implements Cryptor { String encryptedString = str; try { cipher.init(Cipher.DECRYPT_MODE, key); - byte[] encryptedText = Base64.decodeBase64(str.getBytes()); + byte[] encryptedText = Base64.decodeBase64(str.getBytes(UNICODE_FORMAT)); byte[] plainTest = cipher.doFinal(encryptedText); - encryptedString = new String(plainTest); + encryptedString = new String(plainTest, UNICODE_FORMAT); } catch (Exception e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java index 343876b..b7c04ec 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv2Tov3.java @@ -286,7 +286,7 @@ public class MapUDDIv2Tov3 { } private static TModelInstanceDetails MapTModelInstanceDetails(org.uddi.api_v2.TModelInstanceDetails tModelInstanceDetails) { - if (tModelInstanceDetails == null | tModelInstanceDetails.getTModelInstanceInfo().isEmpty()) { + if (tModelInstanceDetails == null || tModelInstanceDetails.getTModelInstanceInfo()==null || tModelInstanceDetails.getTModelInstanceInfo().isEmpty()) { return null; } TModelInstanceDetails r = new TModelInstanceDetails(); @@ -618,7 +618,6 @@ public class MapUDDIv2Tov3 { if (next instanceof DispositionReport) { DispositionReport z = (DispositionReport) next; - Result x = new Result(); r.addAll(MapResult(z.getFaultInfo().getResult())); } @@ -1085,6 +1084,7 @@ public class MapUDDIv2Tov3 { assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getKeyName(), assertionStatusReport.getAssertionStatusItem().get(i).getKeyedReference().getKeyValue())); } + r.add(x); } return r; } http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/PolicyLocalFirst.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/PolicyLocalFirst.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/PolicyLocalFirst.java index 49afcf8..51de784 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/PolicyLocalFirst.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/PolicyLocalFirst.java @@ -33,12 +33,16 @@ public class PolicyLocalFirst extends PolicyRoundRobin { */ public PolicyLocalFirst(Properties properties) { super(properties); - if (properties!=null) { + init(properties); + } + + private static synchronized void init(Properties properties){ + if (properties!=null) { local = properties.getProperty(JUDDI_CLIENT_LOCAL, DEFAULT_CLIENT_LOCAL); } else { local = DEFAULT_CLIENT_LOCAL; } - } + } public String select(Topology topology) { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java index 7f79c98..e270761 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java @@ -76,7 +76,8 @@ public class ServiceLocator { this.clerk = clerk; this.urlLocalizer = urlLocalizer; this.properties = properties; - if (properties == null) properties = clerk.getUDDINode().getProperties(); + if (properties == null) + this.properties = clerk.getUDDINode().getProperties(); } public ServiceLocator withCache(URL baseCallbackURL) throws ConfigurationException { http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java index 18e202d..4c9baaa 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/UDDIServiceCache.java @@ -213,9 +213,7 @@ public class UDDIServiceCache implements UDDIServiceCacheMBean { public void removeAll() { log.info("Flushing the client side " + clerk.getManagerName() + " UDDIServiceCache "); - for (String key : serviceLocationMap.keySet()) { - serviceLocationMap.get(key); - } + serviceLocationMap.clear(); } /** * Adds or updates epr information for the given serviceKey. http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java index 1593e64..be36ea5 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSTransport.java @@ -102,7 +102,7 @@ public class JAXWSTransport extends Transport { } if (endpointURL != null) { if (endpointURL.toLowerCase().startsWith("http:")){ - logger.warn("You should consider use a secure protocol (https) when sending your password!"); + logger.warn("You should consider using a secure protocol (https) when sending your password!"); } Map<String, Object> requestContext = ((BindingProvider) securityService).getRequestContext(); requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java index f78f1d8..6f25000 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/JAXWSv2TranslationTransport.java @@ -154,7 +154,7 @@ public class JAXWSv2TranslationTransport extends JAXWSTransport { endpointURL = client.getClientConfig().getUDDINode(nodeName).getPublishUrl(); } if (endpointURL.toLowerCase().startsWith("http:")){ - logger.warn("You should consider use a secure protocol (https) when sending your password!"); + logger.warn("You should consider using a secure protocol (https) when sending your password!"); } Map<String, Object> requestContext = ((BindingProvider) securityv2).getRequestContext(); requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointURL); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java index 24cfad9..3557b2c 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/Inquiry3to2.java @@ -169,6 +169,7 @@ public class Inquiry3to2 implements UDDIInquiryPortType, BindingProvider { oi.setNodeID(z.getOperator()); oi.setAuthorizedName(z.getBusinessEntity().get(0).getAuthorizedName()); } catch (Exception ex) { + logger.warn(ex.getMessage(), ex); } if (oi.getAuthorizedName() != null) { continue; @@ -181,6 +182,7 @@ public class Inquiry3to2 implements UDDIInquiryPortType, BindingProvider { oi.setNodeID(z.getOperator()); oi.setAuthorizedName(z.getTModel().get(0).getAuthorizedName()); } catch (Exception ex) { + logger.warn(ex.getMessage(), ex); } if (oi.getAuthorizedName() != null) { continue; @@ -201,6 +203,7 @@ public class Inquiry3to2 implements UDDIInquiryPortType, BindingProvider { oi.setNodeID(z.getOperator()); oi.setAuthorizedName(z2.getBusinessEntity().get(0).getAuthorizedName()); } catch (Exception ex) { + logger.warn(ex.getMessage(), ex); } ret.getOperationalInfo().add(oi); ret.setTruncated(false); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java index 4d7886a..fb6384e 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/transport/wrapper/RequestHandler.java @@ -119,7 +119,7 @@ public class RequestHandler { Transformer trans = transFactory.newTransformer(); StringWriter sw = new StringWriter(); trans.transform(new DOMSource(element), new StreamResult(sw)); - return new String(sw.toString()); + return sw.toString(); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java index 0868501..3fde39f 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java @@ -47,13 +47,21 @@ import org.uddi.v3_service.DispositionReportFaultMessage; */ public abstract class AuthenticatedService { + /** + * @return the node + */ + public static String getNode() { + return node; + } + + public static final String UTF8 = "UTF-8"; public static final int AUTHTOKEN_ACTIVE = 1; public static final int AUTHTOKEN_RETIRED = 0; static final Log logger = LogFactory.getLog(AuthenticatedService.class); /** * the node id of this server instance, as loaded from the config file */ - protected static String node = "UNDEFINED_NODE_NAME"; + private static String node = "UNDEFINED_NODE_NAME"; protected String baseUrlSSL = "UNDEFINED"; protected String baseUrl = "UNDEFINED"; http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java index b9d48da..987b8eb 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java @@ -444,11 +444,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy if (obj == null) { throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNotFound", entityKey)); } - if (!obj.getNodeId().equals(node)) { - throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNodeOwner", entityKey + " this node " + node + " owning node " + obj.getNodeId())); + if (!obj.getNodeId().equals(getNode())) { + throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.TModelNodeOwner", entityKey + " this node " + getNode() + " owning node " + obj.getNodeId())); } em.remove(obj); - changes.add(UDDIPublicationImpl.getChangeRecord_deleteTModelDelete(entityKey, node)); + changes.add(UDDIPublicationImpl.getChangeRecord_deleteTModelDelete(entityKey, getNode())); } @@ -1365,7 +1365,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy if (!((Publisher) publisher).isAdmin()) { throw new UserMismatchException(new ErrorMessage("errors.AdminReqd")); } - new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration, em, node, AppConfig.getConfiguration()); + new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration, em, getNode(), AppConfig.getConfiguration()); //StringWriter sw = new StringWriter(); //JAXB.marshal(replicationConfiguration, sw); @@ -1433,7 +1433,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy } @Override - public org.uddi.repl_v3.ReplicationConfiguration getReplicationNodes(String authInfo) throws DispositionReportFaultMessage, RemoteException { + public synchronized org.uddi.repl_v3.ReplicationConfiguration getReplicationNodes(String authInfo) throws DispositionReportFaultMessage, RemoteException { long startTime = System.currentTimeMillis(); org.uddi.repl_v3.ReplicationConfiguration r = new org.uddi.repl_v3.ReplicationConfiguration(); @@ -1470,7 +1470,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy r.setCommunicationGraph(new CommunicationGraph()); Operator op = new Operator(); - op.setOperatorNodeID(node); + op.setOperatorNodeID(getNode()); op.setSoapReplicationURL(baseUrlSSL + "replication/services/replication"); op.getContact().add(new Contact()); @@ -1478,7 +1478,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy op.setOperatorStatus(OperatorStatusType.NORMAL); r.getOperator().add(op); - r.getCommunicationGraph().getNode().add(node); + r.getCommunicationGraph().getNode().add(getNode()); r.getCommunicationGraph().getControlledMessage().add("*"); long procTime = System.currentTimeMillis() - startTime; r.setSerialNumber(0); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java index 3421d81..a05582e 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java @@ -59,6 +59,7 @@ import org.apache.juddi.replication.ReplicationNotifier; import org.apache.juddi.v3.client.UDDIService; import org.apache.juddi.v3.error.ErrorMessage; import org.apache.juddi.v3.error.FatalErrorException; +import org.apache.juddi.v3.error.InvalidValueException; import org.apache.juddi.v3.error.TransferNotAllowedException; import org.apache.juddi.validation.ValidateCustodyTransfer; import org.uddi.api_v3.OperationalInfo; @@ -94,6 +95,10 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD public UDDICustodyTransferImpl() { super(); serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass()); + init(); + } + + private static synchronized void init() { if (df == null) { try { df = DatatypeFactory.newInstance(); @@ -120,7 +125,12 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD org.uddi.custody_v3.TransferToken apiTransferToken = body.getTransferToken(); if (apiTransferToken != null) { - String transferTokenId = new String(apiTransferToken.getOpaqueToken()); + String transferTokenId; + try { + transferTokenId = new String(apiTransferToken.getOpaqueToken(), UTF8); + } catch (UnsupportedEncodingException ex) { + throw new InvalidValueException(new ErrorMessage("errors.stringEncoding")); + } org.apache.juddi.model.TransferToken modelTransferToken = em.find(org.apache.juddi.model.TransferToken.class, transferTokenId); if (modelTransferToken != null) { em.remove(modelTransferToken); @@ -194,8 +204,12 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD String transferKey = TRANSFER_TOKEN_PREFIX + UUID.randomUUID(); org.apache.juddi.model.TransferToken transferToken = new org.apache.juddi.model.TransferToken(); transferToken.setTransferToken(transferKey); - // For output - opaqueToken.value = transferKey.getBytes(); + try { + // For output + opaqueToken.value = transferKey.getBytes(UTF8); + } catch (UnsupportedEncodingException ex) { + throw new InvalidValueException(new ErrorMessage("errors.stringEncoding")); + } GregorianCalendar gc = new GregorianCalendar(); gc.add(GregorianCalendar.DAY_OF_MONTH, transferExpirationDays); @@ -286,21 +300,21 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD transferCustody.setKeyBag(body.getKeyBag()); transferCustody.setTransferOperationalInfo(new TransferOperationalInfo()); transferCustody.getTransferOperationalInfo().setAuthorizedName(publisher.getAuthorizedName()); - transferCustody.getTransferOperationalInfo().setNodeID(node); + transferCustody.getTransferOperationalInfo().setNodeID(getNode()); //and trigger the transfer - logger.info("AUDIT, transfering " + transferCustody.getKeyBag().getKey().size() + " entities to " + publisher.getAuthorizedName() + " at node " + node + " from source " + sourceNode); + logger.info("AUDIT, transfering " + transferCustody.getKeyBag().getKey().size() + " entities to " + publisher.getAuthorizedName() + " at node " + getNode() + " from source " + sourceNode); replicationClient.transferCustody(transferCustody); } catch (DispositionReportFaultMessage df) { - logger.error("Unable to transfer entities from " + sourceNode + " to node " + node + " to user " + publisher.getAuthorizedName(), df); + logger.error("Unable to transfer entities from " + sourceNode + " to node " + getNode() + " to user " + publisher.getAuthorizedName(), df); throw new TransferNotAllowedException(new ErrorMessage("E_transferBlocked", df.getMessage())); } catch (Exception ex) { - logger.error("Unable to transfer entities from " + sourceNode + " to node " + node + " to user " + publisher.getAuthorizedName(), ex); + logger.error("Unable to transfer entities from " + sourceNode + " to node " + getNode() + " to user " + publisher.getAuthorizedName(), ex); throw new TransferNotAllowedException(new ErrorMessage("E_transferBlocked", ex.getMessage())); } } else { - changes.addAll(executeTransfer(body, em, publisher.getAuthorizedName(), node)); + changes.addAll(executeTransfer(body, em, publisher.getAuthorizedName(), getNode())); //all of the items to be transfer are owned locally by *this node. } @@ -310,7 +324,7 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD for (ChangeRecord c : changes) { try { c.setChangeID(new ChangeRecordIDType()); - c.getChangeID().setNodeID(node); + c.getChangeID().setNodeID(getNode()); c.getChangeID().setOriginatingUSN(null); ReplicationNotifier.Enqueue(MappingApiToModel.mapChangeRecord(c)); } catch (UnsupportedEncodingException ex) { @@ -444,7 +458,12 @@ public class UDDICustodyTransferImpl extends AuthenticatedService implements UDD // After transfer is finished, the token can be removed org.uddi.custody_v3.TransferToken apiTransferToken = body.getTransferToken(); - String transferTokenId = new String(apiTransferToken.getOpaqueToken()); + String transferTokenId; + try { + transferTokenId = new String(apiTransferToken.getOpaqueToken(), UTF8); + } catch (UnsupportedEncodingException ex) { + throw new InvalidValueException(new ErrorMessage("errors.stringEncoding")); + } org.apache.juddi.model.TransferToken modelTransferToken = em.find(org.apache.juddi.model.TransferToken.class, transferTokenId); em.remove(modelTransferToken); return changes; http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java index af2e32f..8067a76 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java @@ -157,7 +157,9 @@ public class UDDIInquiryImpl extends AuthenticatedService implements UDDIInquiry org.apache.juddi.model.BusinessService modelBusinessService = null; try { modelBusinessService=em.find(org.apache.juddi.model.BusinessService.class, serviceKey); - } catch (Exception e) {} + } catch (Exception e) { + log.debug(e.getMessage(), e); + } if (modelBusinessService == null) throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.ServiceNotFound", serviceKey)); http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java index eb1885c..8c74893 100644 --- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java +++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java @@ -163,14 +163,14 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub em.merge(existingPubAssertion); persistNewAssertion = false; - changes.add(getChangeRecord_deletePublisherAssertion(apiPubAssertion, node, existingPubAssertion.getToCheck().equalsIgnoreCase("false"), existingPubAssertion.getFromCheck().equalsIgnoreCase("false"), System.currentTimeMillis())); + changes.add(getChangeRecord_deletePublisherAssertion(apiPubAssertion, getNode(), existingPubAssertion.getToCheck().equalsIgnoreCase("false"), existingPubAssertion.getFromCheck().equalsIgnoreCase("false"), System.currentTimeMillis())); } else { // Otherwise, it is a new relationship between these entities. Remove the old one so the new one can be added. // TODO: the model only seems to allow one assertion per two business (primary key is fromKey and toKey). Spec seems to imply as // many relationships as desired (the differentiator would be the keyedRef values). removeExistingPublisherAssertionSignatures(existingPubAssertion.getBusinessEntityByFromKey().getEntityKey(), existingPubAssertion.getBusinessEntityByToKey().getEntityKey(), em); em.remove(existingPubAssertion); - changes.add(getChangeRecord_deletePublisherAssertion(apiPubAssertion, node, true, true, System.currentTimeMillis())); + changes.add(getChangeRecord_deletePublisherAssertion(apiPubAssertion, getNode(), true, true, System.currentTimeMillis())); } } @@ -194,7 +194,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub em.persist(modelPubAssertion); - changes.add(getChangeRecord_NewAssertion(apiPubAssertion, modelPubAssertion, node)); + changes.add(getChangeRecord_NewAssertion(apiPubAssertion, modelPubAssertion, getNode())); } @@ -237,7 +237,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub List<ChangeRecord> changes = new ArrayList<ChangeRecord>(); for (String entityKey : entityKeyList) { deleteBinding(entityKey, em); - changes.add(getChangeRecord_deleteBinding(entityKey, node)); + changes.add(getChangeRecord_deleteBinding(entityKey, getNode())); } tx.commit(); for (int i = 0; i < changes.size(); i++) { @@ -296,7 +296,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub List<ChangeRecord> changes = new ArrayList<ChangeRecord>(); for (String entityKey : entityKeyList) { deleteBusiness(entityKey, em); - changes.add(getChangeRecord_deleteBusiness(entityKey, node)); + changes.add(getChangeRecord_deleteBusiness(entityKey, getNode())); } tx.commit(); @@ -378,7 +378,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub em.persist(existingPubAssertion); } - changes.add(getChangeRecord_deletePublisherAssertion(entity, node, tokey, fromkey, existingPubAssertion.getModified().getTime())); + changes.add(getChangeRecord_deletePublisherAssertion(entity, getNode(), tokey, fromkey, existingPubAssertion.getModified().getTime())); } tx.commit(); @@ -463,7 +463,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub List<ChangeRecord> changes = new ArrayList<ChangeRecord>(); for (String entityKey : entityKeyList) { deleteService(entityKey, em); - changes.add(getChangeRecord_deleteService(entityKey, node)); + changes.add(getChangeRecord_deleteService(entityKey, getNode())); } tx.commit(); @@ -525,7 +525,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub List<ChangeRecord> changes = new ArrayList<ChangeRecord>(); for (String entityKey : entityKeyList) { deleteTModel(entityKey, em); - changes.add(getChangeRecord_deleteTModelHide(entityKey, node)); + changes.add(getChangeRecord_deleteTModelHide(entityKey, getNode())); } tx.commit(); @@ -762,7 +762,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub result.getListDescription().setActualCount(result.getListDescription().getActualCount() + 1); result.getListDescription().setIncludeCount(result.getListDescription().getIncludeCount() + 1); validator.validateSaveBindingMax(em, modelBindingTemplate.getBusinessService().getEntityKey()); - changes.add(getChangeRecord(modelBindingTemplate, apiBindingTemplate, node)); + changes.add(getChangeRecord(modelBindingTemplate, apiBindingTemplate, getNode())); } tx.commit(); @@ -822,7 +822,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub log.debug("Saving business " + modelBusinessEntity.getEntityKey()); em.persist(modelBusinessEntity); - changes.add(getChangeRecord(modelBusinessEntity, apiBusinessEntity, node)); + changes.add(getChangeRecord(modelBusinessEntity, apiBusinessEntity, getNode())); result.getBusinessEntity().add(apiBusinessEntity); } @@ -895,7 +895,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub result.getBusinessService().add(apiBusinessService); validator.validateSaveServiceMax(em, modelBusinessService.getBusinessEntity().getEntityKey()); - changes.add(getChangeRecord(modelBusinessService, apiBusinessService, node)); + changes.add(getChangeRecord(modelBusinessService, apiBusinessService, getNode())); } tx.commit(); @@ -955,7 +955,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub em.persist(modelTModel); result.getTModel().add(apiTModel); - changes.add(getChangeRecord(modelTModel, apiTModel, node)); + changes.add(getChangeRecord(modelTModel, apiTModel, getNode())); /* //TODO JUDDI-915 if (obj != null) { @@ -1049,7 +1049,7 @@ public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPub del.setModified(new Date()); em.merge(del); } - changes.add(getChangeRecord_deletePublisherAssertion(api, node, to, from, System.currentTimeMillis())); + changes.add(getChangeRecord_deletePublisherAssertion(api, getNode(), to, from, System.currentTimeMillis())); } //DeletePublisherAssertionByBusinessQuery.delete(em, businessKeysFound); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
