You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/07/27 11:41:58 UTC
svn commit: r1754249 - in /uima/uima-ducc/trunk:
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
Author: degenaro
Date: Wed Jul 27 11:41:58 2016
New Revision: 1754249
URL: http://svn.apache.org/viewvc?rev=1754249&view=rev
Log:
UIMA-4966 UIMA-DUCC Prepare for 2.1 Release
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1754249&r1=1754248&r2=1754249&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java Wed Jul 27 11:41:58 2016
@@ -168,7 +168,7 @@ public class DuccPropertiesResolver {
public static final String ducc_transport_trace = "ducc.transport.trace";
- public static final String ducc_ws_port_https = "ducc.ws.port.https";
+ public static final String ducc_ws_port_ssl = "ducc.ws.port.ssl";
public static final String ducc_ws_idle_timeout = "ducc.ws.idle.timeout";
public static final String ducc_ws_max_threads = "ducc.ws.max.threads";
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java?rev=1754249&r1=1754248&r2=1754249&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java Wed Jul 27 11:41:58 2016
@@ -125,7 +125,7 @@ public class DuccWebServer {
}
public int getPortSsl() {
- String property = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_ws_port_https);
+ String property = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_ws_port_ssl);
int portHttps = ConfigValue.PortHttps.getInt(property);
return portHttps;
}
@@ -173,9 +173,9 @@ public class DuccWebServer {
/**
* Determine server https port
- * ducc.ws.port.https
+ * ducc.ws.port.ssl
*/
- property = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_ws_port_https);
+ property = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_ws_port_ssl);
int portHttps = ConfigValue.PortHttps.getInt(property);
try {