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 2018/02/01 20:42:32 UTC
svn commit: r1822905 - in /uima/uv3/uimaj-v3/trunk:
uimaj-ep-configurator/src/main/java/
uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/
uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/
Author: schor
Date: Thu Feb 1 20:42:31 2018
New Revision: 1822905
URL: http://svn.apache.org/viewvc?rev=1822905&view=rev
Log:
[UIMA-5715] better way to get location of project, to make limited work.
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Feb 1 20:42:31 2018
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/src/main/java:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-ep-configurator/src/main/java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-configurator/src/main/java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-configurator/src/main/java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/src/main/java:933273-944402
+/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java:1690273-1822904
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java?rev=1822905&r1=1822904&r2=1822905&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java Thu Feb 1 20:42:31 2018
@@ -2828,7 +2828,8 @@ public class MultiPageEditor extends For
try {
jg.mainForCde(new MergerImpl(), new JCasGenProgressMonitor(progressMonitor),
jCasGenThrower, inputFile, outputDirectory, types, (CASImpl) getCurrentView(),
- getProject().getLocationURI().getPath(),
+ getProject().getLocation().toString(), // https://issues.apache.org/jira/browse/UIMA-5715
+ // getLocationURI().getPath(), // on linux/mars, was returning /default/project.name etc
limitJCasGenToProjectScope,
mergedTypesAddingFeatures);
} catch (IOException e) {
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Feb 1 20:42:31 2018
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen:961329-961746
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen:933273-944404
+/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen:1690273-1822904
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java?rev=1822905&r1=1822904&r2=1822905&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java Thu Feb 1 20:42:31 2018
@@ -81,6 +81,7 @@ import org.apache.uima.util.XMLizable;
public class Jg {
+ private final static boolean IS_TRACE_LIMITED = false;
/**
* Interface implemented by JCAS code generation's templates.
*/
@@ -880,7 +881,7 @@ public class Jg {
*/
/**
- * return true if td is not defined in this project, of
+ * return true if td is not defined in this project, or
* it is defined, but is also in merged and any of the other
* merged urls are not defined in this project.
*
@@ -893,6 +894,9 @@ public class Jg {
try {
typeDefinitionUri = new URI (td.getSourceUrlString());
} catch (URISyntaxException e) {
+ if (IS_TRACE_LIMITED) {
+ error.newError(IError.INFO, "debug isOutOfScope: got URISyntaxException, td.getSourceUrlstring: " + ((td.getSourceUrlString() == null) ? "null" : td.getSourceUrlString()), e);
+ }
return true; // may be overkill - but if td's source can't be parsed ... likely out of project
}
String tdPath = typeDefinitionUri.getPath();
@@ -900,6 +904,9 @@ public class Jg {
// Issue UIMA-4080 - If a type system resides in a JAR, then the path is null and it is
// certainly out of scope.
if (tdPath == null) {
+ if (IS_TRACE_LIMITED) {
+ error.newError(IError.INFO, "debug isOutOfScope: typeDefinitionUri had null path. " + typeDefinitionUri.toString(), null);
+ }
return true;
}
@@ -910,7 +917,7 @@ public class Jg {
// as well as clients that use file-system notation (e.g. jcasgen-maven-plugin or a simple
// invocation from the command line.
String resolvedProjectPath;
- if (!projectDirPath.startsWith("/")) {
+ if (!projectDirPath.startsWith("/")) {
resolvedProjectPath = new File(projectDirPath).getAbsoluteFile().toURI().getPath();
}
else {
@@ -929,6 +936,10 @@ public class Jg {
boolean r = !tdPath.startsWith(resolvedProjectPath);
if (r) {
+ if (IS_TRACE_LIMITED) {
+ error.newError(IError.INFO, "debug isOutOfScope: tdPath doesn't start with resolved ProjectPath, tdPath: "
+ + tdPath + ", resolvedProjectPath: " + resolvedProjectPath, null);
+ }
return true;
}
Set<String> mergedPaths = mergedTypesAddingFeatures.get(td.getName());
@@ -942,6 +953,9 @@ public class Jg {
}
String tempPath = tempURI.getPath();
if (!tempPath.startsWith(resolvedProjectPath)) {
+ if (IS_TRACE_LIMITED) {
+ error.newError(IError.INFO, "debug isOutOfScope due to mergedType adding feature", null);
+ }
return true;
}
}