svn commit: r1534695 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common: main/DuccAdmin.java utils/Utils.java

[cwiklik]

Author: cwiklik
Date: Tue Oct 22 16:24:25 2013
New Revision: 1534695

URL: http://svn.apache.org/r1534695
Log:
UIMA-3367 set DUCC_HOME

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java?rev=1534695&r1=1534694&r2=1534695&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
 Tue Oct 22 16:24:25 2013
@@ -106,6 +106,7 @@ public class DuccAdmin extends AbstractD
                            if ( brokerCredentialsFile != null && 
brokerCredentialsFile.length() > 0 ) {
                                String path ="";
                                try {
+                                         Utils.findDuccHome();  // add 
DUCC_HOME to System.properties
                                              path = 
Utils.resolvePlaceholderIfExists(brokerCredentialsFile, System.getProperties());
                                          Credentials credentials = 
BrokerCredentials.get(path);
                                                  if ( 
credentials.getUsername() != null && credentials.getPassword() != null ) {

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java?rev=1534695&r1=1534694&r2=1534695&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/Utils.java
 Tue Oct 22 16:24:25 2013
@@ -274,6 +274,8 @@ public class Utils {
         * @return
         */
        public static String resolvePlaceholderIfExists(String value, 
Properties props ) {
+               findDuccHome();  // add DUCC_HOME to System.properties
+
                if ( value != null && value.contains("${")) {
             PropertyPlaceholderHelper pph = new 
PropertyPlaceholderHelper("${","}");
             value = pph.replacePlaceholders(value, props);