You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/11/02 01:37:38 UTC
svn commit: r1636075 -
/uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
Author: rec
Date: Sun Nov 2 00:37:37 2014
New Revision: 1636075
URL: http://svn.apache.org/r1636075
Log:
[UIMA-4081] Failure to import another type system from the same project
- Adding main source and resource folders to Jg classpath.
Modified:
uima/uimaj/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.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=1636075&r1=1636074&r2=1636075&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 Sun Nov 2 00:37:37 2014
@@ -108,20 +108,40 @@ public class JCasGenMojo extends Abstrac
this.project.addCompileSourceRoot(this.outputDirectory.getPath());
// assemble the classpath
+ StringBuilder classpathBuilder = new StringBuilder();
+
+ // Source roots
+ for (String element : this.project.getCompileSourceRoots()) {
+ if (classpathBuilder.length() > 0) {
+ classpathBuilder.append(File.pathSeparatorChar);
+ }
+ classpathBuilder.append(element);
+ getLog().debug("JCasGen: Adding source root to classpath '" + element + "'");
+ }
+
+ // Resource roots
+ for (Resource element : this.project.getResources()) {
+ if (classpathBuilder.length() > 0) {
+ classpathBuilder.append(File.pathSeparatorChar);
+ }
+ classpathBuilder.append(element.getDirectory());
+ getLog().debug("JCasGen: Adding resource root to classpath '" + element.getDirectory() + "'");
+ }
+
+ // Dependencies
List<String> elements;
try {
elements = this.project.getCompileClasspathElements();
} catch (DependencyResolutionRequiredException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
-
- StringBuilder classpathBuilder = new StringBuilder();
+
for (String element : elements) {
if (classpathBuilder.length() > 0) {
classpathBuilder.append(File.pathSeparatorChar);
}
classpathBuilder.append(element);
- getLog().debug("JCasGen: Adding to classpath '" + element + "'");
+ getLog().debug("JCasGen: Adding dependency to classpath '" + element + "'");
}
String classpath = classpathBuilder.toString();