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 2015/02/25 14:10:53 UTC
svn commit: r1662208 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/
uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader...
Author: burn
Date: Wed Feb 25 13:10:53 2015
New Revision: 1662208
URL: http://svn.apache.org/r1662208
Log:
UIMA-4219 - Drop flow-controller options - user can replace the default name
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/PrivateClassLoader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java?rev=1662208&r1=1662207&r2=1662208&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java Wed Feb 25 13:10:53 2015
@@ -73,8 +73,6 @@ public class DuccJobSubmit
UiOption.ProcessDescriptorAEOverrides,
UiOption.ProcessDescriptorCC,
UiOption.ProcessDescriptorCCOverrides,
- UiOption.ProcessDescriptorFC,
- UiOption.ProcessDescriptorFCOverrides,
UiOption.ProcessDeploymentsMax,
UiOption.ProcessInitializationFailuresCap,
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1662208&r1=1662207&r2=1662208&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java Wed Feb 25 13:10:53 2015
@@ -436,20 +436,6 @@ public interface IUiOptions
public String example() { return "name1=value1,name2=\"value2a value2b value2c\",name3=value3..."; }
},
- ProcessDescriptorFC {
- public String pname() { return JobSpecificationProperties.key_process_descriptor_FC; }
- public String description() { return "Process Flow Controller for aggregate."; }
- public String argname() { return "descriptor xml"; }
- public String example() { return "/home/" + System.getProperty("user.name") + "/descriptors/MyFC.xml"; }
- },
-
- ProcessDescriptorFCOverrides {
- public String pname() { return JobSpecificationProperties.key_process_descriptor_FC_overrides; }
- public String argname() { return "list of overrides"; }
- public String description() { return "Process Flow Controller configuration parameter name/value pair overrides. Parameters must already be defined in the FC descriptor."; }
- public String example() { return "name1=value1,name2=\"value2a value2b value2c\",name3=value3..."; }
- },
-
ProcessDD {
public String pname() { return JobSpecificationProperties.key_process_DD; }
public String description() { return "Process deployment descriptor (mutually exclusive with CM+AE+CC)."; }
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java?rev=1662208&r1=1662207&r2=1662208&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java Wed Feb 25 13:10:53 2015
@@ -788,9 +788,7 @@ public class AllInOneLauncher extends Cl
UiOption.ProcessDescriptorAE,
UiOption.ProcessDescriptorAEOverrides,
UiOption.ProcessDescriptorCC,
- UiOption.ProcessDescriptorCCOverrides,
- UiOption.ProcessDescriptorFC,
- UiOption.ProcessDescriptorFCOverrides };
+ UiOption.ProcessDescriptorCCOverrides };
/*
* Create a string hold the args for the java command.
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/PrivateClassLoader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/PrivateClassLoader.java?rev=1662208&r1=1662207&r2=1662208&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/PrivateClassLoader.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/PrivateClassLoader.java Wed Feb 25 13:10:53 2015
@@ -75,4 +75,37 @@ public class PrivateClassLoader {
}
}
}
+
+ public static void main(String[] args) throws IOException {
+ if (args.length < 2) {
+ System.out.println("args: classpath class-to-load");
+ return;
+ }
+ URLClassLoader pcl = create(args[0]);
+ Class<?> cl;
+ try {
+ cl = pcl.loadClass(args[1]);
+ System.out.println("loadClass OK");
+ } catch (ClassNotFoundException e) {
+ System.out.println("loadClass failed");
+ }
+
+ try {
+ cl = Class.forName(args[1], false, pcl);
+ System.out.println("forName OK");
+ } catch (ClassNotFoundException e) {
+ System.out.println("forName failed");
+ }
+
+ URL res = pcl.findResource(args[1]);
+ if (res != null) {
+ System.out.println("findResource: " + res);
+ } else {
+ System.out.println("findResource failed");
+ }
+
+ if (args.length > 2) {
+ dump(pcl, 1);
+ }
+ }
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex?rev=1662208&r1=1662207&r2=1662208&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex Wed Feb 25 13:10:53 2015
@@ -271,25 +271,6 @@ ducc.submit.environment.propagated
--process_descriptor_DD /home/billy/resource/DD_foo.xml
\end{verbatim}
- \item[$--$process\_descriptor\_FC {[descriptor]} ]
-
- This specifies the Flow Controller descriptor to be deployed in the Job Processes. This
- descriptor is a resource that is searched for in the filesystem or Java classpath as described
- in the ~\hyperref[par:cli.submit.notes]{notes below}.
- For example:
- \begin{verbatim}
---process\_descriptor\_FC /home/billy/flow\_foo.xml
- \end{verbatim}
-
- \begin{sloppypar}
- \item[$--$process\_descriptor\_FC\_overrides {[list]} ]
-
- This specifies FC overrides. It is a whitespace-delimited list of name/value pairs. Example:
- \begin{verbatim}
---process\_descriptor\_FC\_overrides name1=value1 name2=value2
- \end{verbatim}
- \end{sloppypar}
-
\item[$--$process\_failures\_limit {[integer]} ]
This specifies the maximum number of individual Job Process (JP) failures allowed
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java?rev=1662208&r1=1662207&r2=1662208&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java Wed Feb 25 13:10:53 2015
@@ -59,8 +59,6 @@ public class JobSpecificationProperties
public static String key_process_descriptor_AE_overrides = "process_descriptor_AE_overrides";
public static String key_process_descriptor_CC = "process_descriptor_CC";
public static String key_process_descriptor_CC_overrides = "process_descriptor_CC_overrides";
- public static String key_process_descriptor_FC = "process_descriptor_FC";
- public static String key_process_descriptor_FC_overrides = "process_descriptor_FC_overrides";
public static String key_process_deployments_max = "process_deployments_max";
public static String key_process_deployments_min = "process_deployments_min";
@@ -109,8 +107,6 @@ public class JobSpecificationProperties
key_process_descriptor_AE_overrides,
key_process_descriptor_CC,
key_process_descriptor_CC_overrides,
- key_process_descriptor_FC,
- key_process_descriptor_FC_overrides,
key_process_deployments_max,
key_process_deployments_min,
key_process_initialization_failures_cap,