Author: challngr
Date: Fri Apr 12 14:32:07 2013
New Revision: 1467284
URL: http://svn.apache.org/r1467284
Log:
UIMA-2810
Don't create redundant 'services' in service log path.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1467284&r1=1467283&r2=1467284&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
Fri Apr 12 14:32:07 2013
@@ -270,7 +270,7 @@ public class DuccServiceApi
if(DuccUiUtilities.isSupportedBeta()) {
registration_options = registration_options_beta;
}
- init(this.getClass().getName(), registration_options, args, dp,
sm_host, sm_port, "sm", callback, "services");
+ init(this.getClass().getName(), registration_options, args, dp,
sm_host, sm_port, "sm", callback, null);
//
// Now: get jvm args and resolve placeholders, in particular, the
broker url
@@ -356,7 +356,7 @@ public class DuccServiceApi
throws Exception
{
DuccProperties dp = new DuccProperties();
- init(this.getClass().getName(), unregister_options, args, dp, sm_host,
sm_port, "sm", callback, "services");
+ init(this.getClass().getName(), unregister_options, args, dp, sm_host,
sm_port, "sm", callback, null);
Pair<Integer, String> id = getId(UiOption.Unregister);
String user = dp.getProperty(UiOption.User.pname());
@@ -380,7 +380,7 @@ public class DuccServiceApi
throws Exception
{
DuccProperties dp = new DuccProperties();
- init(this.getClass().getName(), start_options, args, dp, sm_host,
sm_port, "sm", callback, "services");
+ init(this.getClass().getName(), start_options, args, dp, sm_host,
sm_port, "sm", callback, null);
Pair<Integer, String> id = getId(UiOption.Start);
String user = dp.getProperty(UiOption.User.pname());
@@ -410,7 +410,7 @@ public class DuccServiceApi
throws Exception
{
DuccProperties dp = new DuccProperties();
- init(this.getClass().getName(), stop_options, args, dp, sm_host,
sm_port, "sm", callback, "services");
+ init(this.getClass().getName(), stop_options, args, dp, sm_host,
sm_port, "sm", callback, null);
Pair<Integer, String> id = getId(UiOption.Stop);
String user = dp.getProperty(UiOption.User.pname());
@@ -438,7 +438,7 @@ public class DuccServiceApi
throws Exception
{
DuccProperties dp = new DuccProperties();
- init(this.getClass().getName(), modify_options, args, dp, sm_host,
sm_port, "sm", callback, "services");
+ init(this.getClass().getName(), modify_options, args, dp, sm_host,
sm_port, "sm", callback, null);
Pair<Integer, String> id = getId(UiOption.Modify);
String user = dp.getProperty(UiOption.User.pname());
@@ -468,7 +468,7 @@ public class DuccServiceApi
throws Exception
{
DuccProperties dp = new DuccProperties();
- init(this.getClass().getName(), query_options, args, dp, sm_host,
sm_port, "sm", callback, "services");
+ init(this.getClass().getName(), query_options, args, dp, sm_host,
sm_port, "sm", callback, null);
Pair<Integer, String> id = null;
String sid = cli_props.getProperty(UiOption.Query.pname()).trim();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1467284&r1=1467283&r2=1467284&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
Fri Apr 12 14:32:07 2013
@@ -108,7 +108,7 @@ public class DuccServiceSubmit
if(DuccUiUtilities.isSupportedBeta()) {
opts = opts_beta;
}
- init(this.getClass().getName(), opts, arg_array, requestProperties,
or_host, or_port, "or", null, "services");
+ init(this.getClass().getName(), opts, arg_array, requestProperties,
or_host, or_port, "or", null, null);
}
public DuccServiceSubmit(String[] args)
@@ -118,7 +118,7 @@ public class DuccServiceSubmit
if(DuccUiUtilities.isSupportedBeta()) {
opts = opts_beta;
}
- init(this.getClass().getName(), opts, args, requestProperties,
or_host, or_port, "or", null, "services");
+ init(this.getClass().getName(), opts, args, requestProperties,
or_host, or_port, "or", null, null);
}
public DuccServiceSubmit(Properties props)
@@ -132,7 +132,7 @@ public class DuccServiceSubmit
if(DuccUiUtilities.isSupportedBeta()) {
opts = opts_beta;
}
- init(this.getClass().getName(), opts, null, requestProperties,
or_host, or_port, "or", null, "services");
+ init(this.getClass().getName(), opts, null, requestProperties,
or_host, or_port, "or", null, null);
}
// TODO: if uima-as, then DD is required
