You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2015/04/08 11:28:44 UTC
svn commit: r1672044 - in /uima/ruta/trunk:
ruta-core/src/main/java/org/apache/uima/ruta/descriptor/
ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/
Author: pkluegl
Date: Wed Apr 8 09:28:43 2015
New Revision: 1672044
URL: http://svn.apache.org/r1672044
Log:
UIMA-3650
- use RutaBuildOptions with suffix in maven plugin
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaBuildOptions.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaBuildOptions.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaBuildOptions.java?rev=1672044&r1=1672043&r2=1672044&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaBuildOptions.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaBuildOptions.java Wed Apr 8 09:28:43 2015
@@ -36,6 +36,10 @@ public class RutaBuildOptions {
private String encoding;
+ private String typeSystemSuffix = "TypeSystem";
+
+ private String analysisEngineSuffix = "Engine";
+
public RutaBuildOptions(List<String> language, List<String> engines) {
super();
this.language = language;
@@ -45,7 +49,6 @@ public class RutaBuildOptions {
public RutaBuildOptions() {
super();
}
-
public List<String> getLanguage() {
return language;
@@ -87,4 +90,20 @@ public class RutaBuildOptions {
this.encoding = encoding;
}
+ public String getTypeSystemSuffix() {
+ return typeSystemSuffix;
+ }
+
+ public void setTypeSystemSuffix(String typeSystemSuffix) {
+ this.typeSystemSuffix = typeSystemSuffix;
+ }
+
+ public String getAnalysisEngineSuffix() {
+ return analysisEngineSuffix;
+ }
+
+ public void setAnalysisEngineSuffix(String analysisEngineSuffix) {
+ this.analysisEngineSuffix = analysisEngineSuffix;
+ }
+
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java?rev=1672044&r1=1672043&r2=1672044&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java Wed Apr 8 09:28:43 2015
@@ -133,7 +133,7 @@ public class RutaDescriptorBuilder {
toInclude.add(initialTypeSystem);
}
}
- if(import_impl.getLocation() != null || import_impl.getName() != null) {
+ if (import_impl.getLocation() != null || import_impl.getName() != null) {
importList.add(import_impl);
}
for (String eachName : desc.getImportedTypeSystems()) {
@@ -186,14 +186,15 @@ public class RutaDescriptorBuilder {
}
}
for (String eachName : desc.getImportedScripts()) {
- String locate = RutaEngine.locate(eachName, enginePaths, "TypeSystem.xml");
+ String locate = RutaEngine.locate(eachName, enginePaths, option.getTypeSystemSuffix()
+ + ".xml");
URL url = null;
if (locate != null) {
File file = new File(locate);
url = file.toURI().toURL();
}
if (url == null) {
- url = checkImportExistence(eachName, "TypeSystem.xml", classloader);
+ url = checkImportExistence(eachName, option.getTypeSystemSuffix() + ".xml", classloader);
if (url == null) {
throw new FileNotFoundException("Build process can't find " + eachName + " in "
+ desc.getScriptName());
@@ -204,7 +205,7 @@ public class RutaDescriptorBuilder {
fillTypeNameMap(typeNameMap, each);
import_impl = new Import_impl();
if (option.isImportByName()) {
- import_impl.setName(eachName + "TypeSystem");
+ import_impl.setName(eachName + option.getTypeSystemSuffix());
} else if (option.isResolveImports()) {
String absoluteLocation = each.getSourceUrlString();
import_impl.setLocation(absoluteLocation);
@@ -275,7 +276,7 @@ public class RutaDescriptorBuilder {
types.addAll(Arrays.asList(presentTypes));
typeSystemDescription.setTypes(types.toArray(new TypeDescription[0]));
- typeSystemDescription.setName(desc.getScriptName() + "TypeSystem");
+ typeSystemDescription.setName(desc.getScriptName() + option.getTypeSystemSuffix());
typeSystemDescription.setSourceUrl(typeSystemFile.toURI().toURL());
return typeSystemDescription;
Modified: uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java?rev=1672044&r1=1672043&r2=1672044&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java (original)
+++ uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java Wed Apr 8 09:28:43 2015
@@ -140,6 +140,20 @@ public class RutaGenerateDescriptorMojo
@Parameter(defaultValue = "${project.build.sourceEncoding}", required = true)
private String encoding;
+
+ /**
+ * Type of type system imports. default false = import by location
+ */
+ @Parameter(defaultValue = "false", required = false)
+ private boolean importByName;
+
+
+ /**
+ * Option to resolve imports while building
+ */
+ @Parameter(defaultValue = "false", required = false)
+ private boolean resolveImports;
+
/**
* Add UIMA Ruta nature to .project
*/
@@ -177,6 +191,12 @@ public class RutaGenerateDescriptorMojo
URLClassLoader classloader = getClassloader(project, getLog());
RutaBuildOptions options = new RutaBuildOptions();
+ options.setTypeSystemSuffix(typeSystemSuffix);
+ options.setAnalysisEngineSuffix(analysisEngineSuffix);
+ options.setEncoding(encoding);
+ options.setResolveImports(resolveImports);
+ options.setImportByName(importByName);
+
String[] files = FileUtils.getFilesFromExtension(project.getBuild().getOutputDirectory(),
new String[] { "ruta" });