juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject juddi git commit: JUDDI-241 fixing the build and cleaning up some of the logging
Date Sat, 31 Jan 2015 03:08:43 GMT
Repository: juddi
Updated Branches:
  refs/heads/master acd11a002 -> 30b66ba4e


JUDDI-241 fixing the build and cleaning up some of the logging


Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/30b66ba4
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/30b66ba4
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/30b66ba4

Branch: refs/heads/master
Commit: 30b66ba4e0d1c1918c4e4d18663f6ba7c735f6d3
Parents: acd11a0
Author: Alex <alexoree@apache.org>
Authored: Fri Jan 30 22:08:39 2015 -0500
Committer: Alex <alexoree@apache.org>
Committed: Fri Jan 30 22:08:39 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/juddi/api/impl/UDDIReplicationImpl.java    | 6 +++++-
 .../java/org/apache/juddi/validation/ValidateReplication.java  | 2 +-
 juddi-core/src/test/resources/juddiv3DisabledTModelKeybag.xml  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/30b66ba4/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 9596c18..6a15569 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -186,10 +186,14 @@ public class UDDIReplicationImpl extends AuthenticatedService implements
UDDIRep
 
         private static UDDIPublicationImpl pub = null;
 
-        public UDDIReplicationImpl() throws ConfigurationException {
+        public UDDIReplicationImpl()  {
                 super();
+                try{
                 this.interval = AppConfig.getConfiguration().getLong(Property.JUDDI_REPLICATION_INTERVAL,
5000L);
                 this.startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_REPLICATION_START_BUFFER,
5000L);
+                }catch(Exception ex){
+                        logger.warn("Config error!",ex);
+                }
                 if (pub == null) {
                         pub = new UDDIPublicationImpl();
                 }

http://git-wip-us.apache.org/repos/asf/juddi/blob/30b66ba4/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
index 8fa247c..44ec063 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
@@ -232,7 +232,7 @@ public class ValidateReplication extends ValidateUDDIApi {
 
                         String enc = config.getString(Property.JUDDI_REJECT_ENTITIES_WITH_INVALID_SIG_PREFIX
+ "trustStorePassword", "");
                         if (config.getBoolean(Property.JUDDI_REJECT_ENTITIES_WITH_INVALID_SIG_PREFIX
+ "trustStorePassword[@isPasswordEncrypted]", false)) {
-                                log.info("trust password is encrypted, decrypting...");
+                                log.debug("trust password is encrypted, decrypting...");
                                 
                                 String prov = config.getString(Property.JUDDI_REJECT_ENTITIES_WITH_INVALID_SIG_PREFIX
+ "trustStorePassword[@cryptoProvider]", "");
                                 try {

http://git-wip-us.apache.org/repos/asf/juddi/blob/30b66ba4/juddi-core/src/test/resources/juddiv3DisabledTModelKeybag.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/resources/juddiv3DisabledTModelKeybag.xml b/juddi-core/src/test/resources/juddiv3DisabledTModelKeybag.xml
index ff6ce9d..d16e1d9 100644
--- a/juddi-core/src/test/resources/juddiv3DisabledTModelKeybag.xml
+++ b/juddi-core/src/test/resources/juddiv3DisabledTModelKeybag.xml
@@ -177,7 +177,7 @@
                             <trustStoreType>JKS</trustStoreType>
                             <trustStorePassword
                                     isPasswordEncrypted="true" 
-                                    cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">8133dcd169105875a711e4b8b3e03bce</trustStorePassword>
+                                    cryptoProvider="org.apache.juddi.v3.client.cryptor.AES128Cryptor">8133dcd169105875a711e4b8b3e03bce</trustStorePassword>
                                     <!-- Test -->
 
                             <checkTimestamps>true</checkTimestamps>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message