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/12/17 17:18:23 UTC
svn commit: r1551603 - in /uima/uimaj/trunk:
jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
Author: schor
Date: Tue Dec 17 16:18:22 2013
New Revision: 1551603
URL: http://svn.apache.org/r1551603
Log:
[UIMA-3044] fix typo in command line argument, but keep old one for backwards compatibility
Modified:
uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
Modified: uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java?rev=1551603&r1=1551602&r2=1551603&view=diff
==============================================================================
--- uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java (original)
+++ uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java Tue Dec 17 16:18:22 2013
@@ -190,7 +190,7 @@ public class JCasGenMojo extends Abstrac
args.addAll(asList("-limitToDirectory", limitToDirectory.toString()));
}
args.addAll(asList("-jcasgeninput", typeSystemFile.getAbsolutePath(), "-jcasgenoutput",
- this.outputDirectory.getAbsolutePath(), "=jcasgenclasspath", classpath));
+ this.outputDirectory.getAbsolutePath(), "-jcasgenclasspath", classpath));
// run JCasGen to generate the Java sources
Jg jCasGen = new Jg();
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java?rev=1551603&r1=1551602&r2=1551603&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java Tue Dec 17 16:18:22 2013
@@ -461,8 +461,9 @@ public class Jg {
outputDirectory = arguments[++i];
continue;
}
- // This next is not apparently used 5/2012 schor
- if (arguments[i].equalsIgnoreCase("=jcasgenclasspath")) {
+ // This is used by the jcasgen maven plugin
+ if (arguments[i].equalsIgnoreCase("=jcasgenclasspath") || // https://issues.apache.org/jira/browse/UIMA-3044
+ arguments[i].equalsIgnoreCase("-jcasgenclasspath")) { // https://issues.apache.org/jira/browse/UIMA-3044
classPath = arguments[++i];
continue;
}
@@ -750,9 +751,9 @@ public class Jg {
* @param outputDirectory output directory
* @param jcasTypeInstance Template instance used to generate class
* @param jcas_TypeInstance Template instance used to generate class
- * @throws IOException
- * @throws InstantiationException
- * @throws IllegalAccessException
+ * @throws IOException -
+ * @throws InstantiationException -
+ * @throws IllegalAccessException -
* @return void
*/
private void generateClassesFromTemplate(TypeDescription td, String outputDirectory,