You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2013/08/01 17:10:53 UTC
svn commit: r1509278 - in
/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher:
AnalysisEngineLaunchConfigurationDelegate.java RemoteLauncher.java
Author: schor
Date: Thu Aug 1 15:10:53 2013
New Revision: 1509278
URL: http://svn.apache.org/r1509278
Log:
[UIMA-3134] Fix normal argument adding to work, test.
Modified:
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java
uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java
Modified: uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java?rev=1509278&r1=1509277&r2=1509278&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java Thu Aug 1 15:10:53 2013
@@ -39,6 +39,7 @@ import org.eclipse.core.runtime.Platform
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.JavaLaunchDelegate;
import org.osgi.framework.Bundle;
@@ -103,6 +104,7 @@ public class AnalysisEngineLaunchConfigu
cmdline.append(RemoteLauncher.INPUT_LANGUAGE_PARAM + " ");
cmdline.append(configuration.getAttribute(LauncherConstants.ATTR_INPUT_LANGUAGE_NAME, "") + " ");
+
}
cmdline.append(RemoteLauncher.INPUT_RECURSIVE_PARAM + " ");
@@ -126,7 +128,12 @@ public class AnalysisEngineLaunchConfigu
cmdline.append(configuration.getAttribute(LauncherConstants.ATTR_OUTPUT_CLEAR_NAME, false));
}
}
-
+
+ String pgmArgs = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "");
+ if (pgmArgs != null) {
+ cmdline.append(' ').append(pgmArgs);
+ }
+
return cmdline.toString();
}
Modified: uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java?rev=1509278&r1=1509277&r2=1509278&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java (original)
+++ uima/uimaj/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/RemoteLauncher.java Thu Aug 1 15:10:53 2013
@@ -24,9 +24,6 @@ import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.util.List;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
@@ -300,6 +297,12 @@ public class RemoteLauncher {
// long maxHeap = memoryMxBean.getHeapMemoryUsage().getMax();
// System.out.println("JVM MaxHeap: " + maxHeap);
+ // show what command line args (not jvm args) got passed
+// System.out.println("Cmdline args: ");
+// for (int i = 0; i < args.length; i++) {
+// System.out.println(" arg " + i + " = " + args[i]);
+// }
+
if (!parseCmdLineArgs(args)) {
throw new IllegalArgumentException("Passed arguments are invalid!");
}