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 2017/03/03 21:14:25 UTC
svn commit: r1785391 - in /uima/uimaj/branches/experiment-v3-jcas:
uimaj-examples/src/main/run_configuration/
uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/
Author: schor
Date: Fri Mar 3 21:14:25 2017
New Revision: 1785391
URL: http://svn.apache.org/viewvc?rev=1785391&view=rev
Log:
[UIMA-5350] streamline the launch of the migration tool for common cases.
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from classes roots.launch
uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from sources roots.launch
uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from classes roots.launch
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA%20Run%20V3%20migrate%20JCas%20from%20classes%20roots.launch?rev=1785391&r1=1785390&r2=1785391&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from classes roots.launch (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from classes roots.launch Fri Mar 3 21:14:25 2017
@@ -19,6 +19,6 @@
-->
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.uima.migratev3.jcas.MigrateJCas"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classesRoots "${folder_prompt:root dir for compiled classes and jars and PEARs}" -outputDirectory "${folder_prompt:output file, something like /temp/uima-v3-migrated/:/temp/uima_v3_migrate}" -migrateClasspath ${project_classpath}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classesRoots "${folder_prompt:root dir for compiled classes and jars and PEARs}" -migrateClasspath ${project_classpath}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="uimaj-examples"/>
</launchConfiguration>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from sources roots.launch
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA%20Run%20V3%20migrate%20JCas%20from%20sources%20roots.launch?rev=1785391&r1=1785390&r2=1785391&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from sources roots.launch (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/run_configuration/UIMA Run V3 migrate JCas from sources roots.launch Fri Mar 3 21:14:25 2017
@@ -19,6 +19,6 @@
-->
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.uima.migratev3.jcas.MigrateJCas"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-sourcesRoots "${folder_prompt:root dir for sources}" -outputDirectory "${folder_prompt:output file, something like /temp/uima-v3-migrated/:/temp/uima_v3_migrate}" -migrateClasspath ${project_classpath}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-sourcesRoots ${selected_resource_loc} -migrateClasspath ${project_classpath}"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="uimaj-examples"/>
</launchConfiguration>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java?rev=1785391&r1=1785390&r2=1785391&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java Fri Mar 3 21:14:25 2017
@@ -37,6 +37,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.FileAttribute;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
@@ -635,7 +636,8 @@ public class MigrateJCas extends VoidVis
private void processCollection(String sourceName, Iterator<String> sourceIterator) {
- System.out.println("Migrating " + sourceName + ", number of classes migrated:");
+ System.out.println("Migrating " + sourceName);
+ System.out.println("number of classes migrated:");
System.out.flush();
int i = 1;
System.out.print(" ");
@@ -1742,8 +1744,12 @@ public class MigrateJCas extends VoidVis
outDirSkipped = outputDirectory + "not-converted/";
outDirLog = outputDirectory + "logs/";
} else {
- System.err.println("-outputDirectory is a required parameter, must be a path to a writable file directory.");
- return false;
+ try {
+ outputDirectory = Files.createTempDirectory("UimaV3MigrateOutput").toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
}
if (clp.isInArgsList(MIGRATE_CLASSPATH)) {
@@ -2143,7 +2149,8 @@ public class MigrateJCas extends VoidVis
+ " [-classesRoots <One-or-more-directories-or-jars-or-pears-separated-by-Path-separator>]\n"
+ " [-classes <one-or-more-fully-qualified-class-names-separated-by-Path-separator]\n"
+ " example: -classes mypkg.foo:pkg2.bar\n"
- + " [-outputDirectory a-writable-directory-path (required)\n"
+ + " [-outputDirectory a-writable-directory-path (optional)\n"
+ + " if omitted, a temporary directory is used\n"
+ " [-migrateClasspath a-class-path to use in decompiling, used if -classesRoots is specified\n"
+ " also used when compiling the migrated classes.\n"
+ " PEAR processing augments this with the PEAR's classpath information "
@@ -2151,7 +2158,7 @@ public class MigrateJCas extends VoidVis
+ " NOTE: either -sourcesRoots or -classesRoots is required, but only one may be specified.\n"
+ " NOTE: classesRoots are scanned for JCas classes, which are then decompiled, and the results processed like sourcesRoots\n"
+ " The decompiling requires that the classes being scanned be on the migrateClasspath when this is invoked.\n"
- + " NOTE: -outputDirectory is required\n");
+ );
}
private static final Pattern implementsEmpty = Pattern.compile("implements \\{");