You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2014/06/17 23:41:24 UTC
svn commit: r1603295 - in /uima/sandbox/uima-ducc/trunk: src/main/assembly/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/
uima-ducc-web/src/main/java/org/apache/uima/ducc/...
Author: burn
Date: Tue Jun 17 21:41:24 2014
New Revision: 1603295
URL: http://svn.apache.org/r1603295
Log:
UIMA-3892 Make private file only visible to ducc; fix loading of private properties
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1603295&r1=1603294&r2=1603295&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Tue Jun 17 21:41:24 2014
@@ -495,14 +495,16 @@ under the License.
<outputDirectory>resources</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- <includes />
+ <excludes>
+ <exclude>private/*</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>src/main/resources/private</directory>
<outputDirectory>resources/private</outputDirectory>
- <fileMode>640</fileMode>
- <directoryMode>750</directoryMode>
+ <fileMode>600</fileMode>
+ <directoryMode>700</directoryMode>
<includes />
</fileSet>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java?rev=1603295&r1=1603294&r2=1603295&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java Tue Jun 17 21:41:24 2014
@@ -26,7 +26,7 @@ public interface IDuccEnv {
public static final String DUCC_HOME_DIR = DUCC_HOME+File.separator;
public static final String DUCC_RESOURCES_DIR = DUCC_HOME_DIR+"resources"+File.separator;
- public static final String DUCC_PRIVATE_DIR = DUCC_HOME_DIR+"private"+File.separator;
+ public static final String DUCC_PRIVATE_DIR = DUCC_RESOURCES_DIR+"private"+File.separator;
public static final String DUCC_PRIVATE_PROPERTIES_FILE = DUCC_PRIVATE_DIR+"ducc.private.properties";
public static final String DUCC_PROPERTIES_FILE = DUCC_RESOURCES_DIR+"ducc.properties";
public static final String DUCC_NODES_FILE_NAME = "ducc.nodes";
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java?rev=1603295&r1=1603294&r2=1603295&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java Tue Jun 17 21:41:24 2014
@@ -189,9 +189,6 @@ public class CommonConfiguration {
@Value("#{ systemProperties['ducc.ws.port.ssl'] }")
public String wsPortSsl;
- @Value("#{ systemProperties['ducc.ws.port.ssl.pw'] }")
- public String wsPortSslPw;
-
@Value("#{ systemProperties['ducc.agent.launcher.process.stop.timeout'] }")
public String processStopTimeout;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java?rev=1603295&r1=1603294&r2=1603295&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java Tue Jun 17 21:41:24 2014
@@ -29,6 +29,7 @@ import org.apache.uima.ducc.common.confi
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
+import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.ws.DuccPlugins;
import org.eclipse.jetty.http.ssl.SslContextFactory;
@@ -134,9 +135,9 @@ public class DuccWebServer {
if(commonConfiguration.wsPortSsl != null) {
this.portSsl = Integer.parseInt(commonConfiguration.wsPortSsl);
logger.info(methodName, null, messages.fetchLabel("SSL port")+portSsl);
- if(commonConfiguration.wsPortSslPw != null) {
- this.portSslPw = commonConfiguration.wsPortSslPw;
- logger.debug(methodName, null, messages.fetchLabel("SSL pw")+portSslPw);
+ String psp = DuccPropertiesResolver.get("ducc.ws.port.ssl.pw");
+ if (psp != null) {
+ this.portSslPw = psp;
}
}
try {