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/20 11:08:50 UTC
svn commit: r1674767 - 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: Mon Apr 20 09:08:49 2015
New Revision: 1674767
URL: http://svn.apache.org/r1674767
Log:
UIMA-3650
- load extensions with given classloader
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-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorInformation.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=1674767&r1=1674766&r2=1674767&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 Mon Apr 20 09:08:49 2015
@@ -37,10 +37,11 @@ public class RutaBuildOptions {
private String encoding;
private String typeSystemSuffix = "TypeSystem";
-
+
private String analysisEngineSuffix = "Engine";
-
-
+
+ private ClassLoader classLoader;
+
public RutaBuildOptions() {
super();
}
@@ -109,4 +110,14 @@ public class RutaBuildOptions {
this.engineLoaders = engineLoaders;
}
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
+
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
+
+ }
+
}
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=1674767&r1=1674766&r2=1674767&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 Mon Apr 20 09:08:49 2015
@@ -84,15 +84,15 @@ public class RutaDescriptorBuilder {
}
public TypeSystemDescription createTypeSystemDescription(RutaDescriptorInformation desc,
- String typeSystemOutput, RutaBuildOptions option, String[] enginePaths,
- ClassLoader classloader) throws InvalidXMLException, ResourceInitializationException,
- IOException, URISyntaxException {
+ String typeSystemOutput, RutaBuildOptions options, String[] enginePaths)
+ throws InvalidXMLException, ResourceInitializationException, IOException,
+ URISyntaxException {
TypeSystemDescription typeSystemDescription = uimaFactory.createTypeSystemDescription();
ResourceManager rm = UIMAFramework.newDefaultResourceManager();
- if (classloader != null) {
- new ResourceManager_impl(classloader);
+ if (options.getClassLoader() != null) {
+ new ResourceManager_impl(options.getClassLoader());
}
if (enginePaths != null) {
String dataPath = "";
@@ -110,10 +110,10 @@ public class RutaDescriptorBuilder {
List<TypeSystemDescription> toInclude = new ArrayList<TypeSystemDescription>();
List<Import> importList = new ArrayList<Import>();
Import_impl import_impl = new Import_impl();
- if (option.isImportByName()) {
+ if (options.isImportByName()) {
String name = initialTypeSystem.getName();
import_impl.setName(name);
- } else if (option.isResolveImports()) {
+ } else if (options.isResolveImports()) {
String absoluteLocation = initialTypeSystem.getSourceUrlString();
import_impl.setLocation(absoluteLocation);
} else {
@@ -146,14 +146,14 @@ public class RutaDescriptorBuilder {
url = file.toURI().toURL();
}
if (url == null) {
- url = checkImportExistence(eachName, ".xml", classloader);
+ url = checkImportExistence(eachName, ".xml", options.getClassLoader());
include = true;
if (url == null) {
throw new FileNotFoundException("Build process can't find " + eachName + " in "
+ desc.getScriptName());
}
}
- TypeSystemDescription each = getTypeSystemDescriptor(url, option, rm);
+ TypeSystemDescription each = getTypeSystemDescriptor(url, options, rm);
if (each != null) {
fillTypeNameMap(typeNameMap, each);
if (include) {
@@ -162,9 +162,9 @@ public class RutaDescriptorBuilder {
toInclude.add(each);
} else {
import_impl = new Import_impl();
- if (option.isImportByName()) {
+ if (options.isImportByName()) {
import_impl.setName(eachName);
- } else if (option.isResolveImports()) {
+ } else if (options.isResolveImports()) {
String absoluteLocation = each.getSourceUrlString();
import_impl.setLocation(absoluteLocation);
} else {
@@ -187,7 +187,7 @@ public class RutaDescriptorBuilder {
}
}
for (String eachName : desc.getImportedScripts()) {
- String locate = RutaEngine.locate(eachName, enginePaths, option.getTypeSystemSuffix()
+ String locate = RutaEngine.locate(eachName, enginePaths, options.getTypeSystemSuffix()
+ ".xml");
URL url = null;
if (locate != null) {
@@ -195,19 +195,20 @@ public class RutaDescriptorBuilder {
url = file.toURI().toURL();
}
if (url == null) {
- url = checkImportExistence(eachName, option.getTypeSystemSuffix() + ".xml", classloader);
+ url = checkImportExistence(eachName, options.getTypeSystemSuffix() + ".xml",
+ options.getClassLoader());
if (url == null) {
throw new FileNotFoundException("Build process can't find " + eachName + " in "
+ desc.getScriptName());
}
}
- TypeSystemDescription each = getTypeSystemDescriptor(url, option, rm);
+ TypeSystemDescription each = getTypeSystemDescriptor(url, options, rm);
if (each != null) {
fillTypeNameMap(typeNameMap, each);
import_impl = new Import_impl();
- if (option.isImportByName()) {
- import_impl.setName(eachName + option.getTypeSystemSuffix());
- } else if (option.isResolveImports()) {
+ if (options.isImportByName()) {
+ import_impl.setName(eachName + options.getTypeSystemSuffix());
+ } else if (options.isResolveImports()) {
String absoluteLocation = each.getSourceUrlString();
import_impl.setLocation(absoluteLocation);
} else {
@@ -225,7 +226,7 @@ public class RutaDescriptorBuilder {
Import[] newImports = importList.toArray(new Import[0]);
typeSystemDescription.setImports(newImports);
}
- if (option.isResolveImports()) {
+ if (options.isResolveImports()) {
typeSystemDescription.resolveImports(rm);
}
@@ -277,7 +278,7 @@ public class RutaDescriptorBuilder {
types.addAll(Arrays.asList(presentTypes));
typeSystemDescription.setTypes(types.toArray(new TypeDescription[0]));
- typeSystemDescription.setName(desc.getScriptName() + option.getTypeSystemSuffix());
+ typeSystemDescription.setName(desc.getScriptName() + options.getTypeSystemSuffix());
typeSystemDescription.setSourceUrl(typeSystemFile.toURI().toURL());
return typeSystemDescription;
@@ -285,11 +286,11 @@ public class RutaDescriptorBuilder {
public AnalysisEngineDescription createAnalysisEngineDescription(RutaDescriptorInformation desc,
TypeSystemDescription typeSystemDescription, String typeSystemOutput,
- String engineOutput, RutaBuildOptions option, String[] scriptPaths, String[] enginePaths,
- String[] resourcePaths, ClassLoader classloader) throws InvalidXMLException, IOException {
+ String engineOutput, RutaBuildOptions options, String[] scriptPaths,
+ String[] enginePaths, String[] resourcePaths) throws InvalidXMLException, IOException {
TypeSystemDescription aets = uimaFactory.createTypeSystemDescription();
Import_impl import_impl = new Import_impl();
- if (option.isImportByName()) {
+ if (options.isImportByName()) {
if (typeSystemDescription != null) {
import_impl.setName(typeSystemDescription.getName());
}
@@ -301,21 +302,21 @@ public class RutaDescriptorBuilder {
}
}
- return configureEngine(desc, engineOutput, option, scriptPaths, enginePaths, resourcePaths,
+ return configureEngine(desc, engineOutput, options, scriptPaths, enginePaths, resourcePaths,
import_impl, aets);
}
public void build(RutaDescriptorInformation desc, String typeSystemOutput, String engineOutput,
- RutaBuildOptions option, String mainScript, String[] scriptPaths, String[] enginePaths,
- ClassLoader classloader) throws SAXException, InvalidXMLException, IOException,
- ResourceInitializationException, URISyntaxException {
+ RutaBuildOptions options, String mainScript, String[] scriptPaths, String[] enginePaths)
+ throws SAXException, InvalidXMLException, IOException, ResourceInitializationException,
+ URISyntaxException {
TypeSystemDescription typeSystemDescription = createTypeSystemDescription(desc,
- typeSystemOutput, option, enginePaths, classloader);
+ typeSystemOutput, options, enginePaths);
AnalysisEngineDescription analysisEngineDescription = createAnalysisEngineDescription(desc,
- typeSystemDescription, typeSystemOutput, engineOutput, option, scriptPaths,
- enginePaths, null, classloader);
+ typeSystemDescription, typeSystemOutput, engineOutput, options, scriptPaths,
+ enginePaths, null);
File analysisEngineFile = getFile(engineOutput);
File typeSystemFile = getFile(typeSystemOutput);
@@ -429,7 +430,7 @@ public class RutaDescriptorBuilder {
}
String mainScript = desc.getScriptName();
- if(!StringUtils.isBlank(desc.getPackageString())) {
+ if (!StringUtils.isBlank(desc.getPackageString())) {
mainScript = desc.getPackageString().concat(".").concat(mainScript);
}
analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java?rev=1674767&r1=1674766&r2=1674767&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java Mon Apr 20 09:08:49 2015
@@ -36,6 +36,8 @@ import org.apache.commons.lang3.tuple.Pa
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.ResourceManager;
+import org.apache.uima.resource.impl.ResourceManager_impl;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.ruta.engine.HtmlAnnotator;
import org.apache.uima.ruta.engine.RutaEngine;
@@ -62,11 +64,11 @@ public class RutaDescriptorFactory {
public RutaDescriptorFactory(String defaultTypeSystem, String defaultEngine)
throws MalformedURLException {
super();
- this.defaultTypeSystem = new File(defaultTypeSystem).toURI().toURL();
- this.defaultEngine = new File(defaultEngine).toURI().toURL();
+ this.defaultTypeSystem = new File(defaultTypeSystem).toURI().toURL();
+ this.defaultEngine = new File(defaultEngine).toURI().toURL();
}
- public RutaDescriptorFactory(URL defaultTypeSystem, URL defaultEngine) {
+ public RutaDescriptorFactory(URL defaultTypeSystem, URL defaultEngine) {
super();
this.defaultTypeSystem = defaultTypeSystem;
this.defaultEngine = defaultEngine;
@@ -80,7 +82,7 @@ public class RutaDescriptorFactory {
RutaDescriptorBuilder builder = new RutaDescriptorBuilder(defaultTypeSystem, defaultEngine);
TypeSystemDescription typeSystemDescription = builder.createTypeSystemDescription(
- descriptorInformation, typeSystemOutput, options, null, classloader);
+ descriptorInformation, typeSystemOutput, options, null);
return typeSystemDescription;
}
@@ -94,7 +96,7 @@ public class RutaDescriptorFactory {
AnalysisEngineDescription analysisEngineDescription = builder.createAnalysisEngineDescription(
descriptorInformation, null, null, engineOutput, options, scriptPaths, descriptorPaths,
- resourcePaths, classloader);
+ resourcePaths);
return analysisEngineDescription;
}
@@ -102,25 +104,25 @@ public class RutaDescriptorFactory {
public Pair<AnalysisEngineDescription, TypeSystemDescription> createDescriptions(
String engineOutput, String typeSystemOutput,
RutaDescriptorInformation descriptorInformation, RutaBuildOptions options,
- String[] scriptPaths, String[] descriptorPaths, String[] resourcePaths,
- ClassLoader classloader) throws IOException, RecognitionException, InvalidXMLException,
+ String[] scriptPaths, String[] descriptorPaths, String[] resourcePaths)
+ throws IOException, RecognitionException, InvalidXMLException,
ResourceInitializationException, URISyntaxException {
RutaDescriptorBuilder builder = new RutaDescriptorBuilder(defaultTypeSystem, defaultEngine);
TypeSystemDescription typeSystemDescription = builder.createTypeSystemDescription(
- descriptorInformation, typeSystemOutput, options, descriptorPaths, classloader);
+ descriptorInformation, typeSystemOutput, options, descriptorPaths);
AnalysisEngineDescription analysisEngineDescription = builder.createAnalysisEngineDescription(
descriptorInformation, typeSystemDescription, typeSystemOutput, engineOutput, options,
- scriptPaths, descriptorPaths, resourcePaths, classloader);
+ scriptPaths, descriptorPaths, resourcePaths);
return new ImmutablePair<AnalysisEngineDescription, TypeSystemDescription>(
analysisEngineDescription, typeSystemDescription);
}
- public RutaDescriptorInformation parseDescriptorInformation(File scriptFile, RutaBuildOptions options)
- throws IOException, RecognitionException {
+ public RutaDescriptorInformation parseDescriptorInformation(File scriptFile,
+ RutaBuildOptions options) throws IOException, RecognitionException {
CharStream st = new ANTLRFileStream(scriptFile.getAbsolutePath(), options.getEncoding());
RutaLexer lexer = new RutaLexer(st);
CommonTokenStream tokens = new CommonTokenStream(lexer);
@@ -132,8 +134,8 @@ public class RutaDescriptorFactory {
parser.setExternalFactory(initializeExternalFactory(options));
// TODO no resource, avoid fail on missing resources while parsing
parser.setResourcePaths(new String[0]);
- // TODO what about the loading from classpath?
- parser.setResourceManager(UIMAFramework.newDefaultResourceManager());
+ ResourceManager rm = getResourceManager(options);
+ parser.setResourceManager(rm);
String name = scriptFile.getName();
int lastIndexOf = name.lastIndexOf(RutaEngine.SCRIPT_FILE_EXTENSION);
if (lastIndexOf != -1) {
@@ -144,13 +146,13 @@ public class RutaDescriptorFactory {
return descInfo;
}
- public RutaDescriptorInformation parseDescriptorInformation(String script)
- throws IOException, RecognitionException {
- return parseDescriptorInformation(script, new RutaBuildOptions());
- }
-
- public RutaDescriptorInformation parseDescriptorInformation(String script, RutaBuildOptions options) throws IOException,
+ public RutaDescriptorInformation parseDescriptorInformation(String script) throws IOException,
RecognitionException {
+ return parseDescriptorInformation(script, new RutaBuildOptions());
+ }
+
+ public RutaDescriptorInformation parseDescriptorInformation(String script,
+ RutaBuildOptions options) throws IOException, RecognitionException {
CharStream st = new ANTLRStringStream(script);
RutaLexer lexer = new RutaLexer(st);
CommonTokenStream tokens = new CommonTokenStream(lexer);
@@ -162,34 +164,48 @@ public class RutaDescriptorFactory {
parser.setExternalFactory(initializeExternalFactory(options));
// TODO no resource, avoid fail on missing resources while parsing
parser.setResourcePaths(new String[0]);
- // TODO what about the loading from classpath?
- parser.setResourceManager(UIMAFramework.newDefaultResourceManager());
+ ResourceManager rm = getResourceManager(options);
+ parser.setResourceManager(rm);
String name = "Anonymous";
descInfo.setScriptName(name);
parser.file_input(name);
return descInfo;
}
-
- private RutaExternalFactory initializeExternalFactory(RutaBuildOptions options) {
- RutaExternalFactory factory = new RutaExternalFactory();
- List<String> languageExtensions = options.getLanguageExtensions();
- for (String each : languageExtensions) {
- try {
- Class<?> forName = Class.forName(each);
- if (IRutaExtension.class.isAssignableFrom(forName)) {
- IRutaExtension extension = (IRutaExtension) forName.newInstance();
- for (String name : extension.getKnownExtensions()) {
- factory.addExtension(name, extension);
- }
- }
- } catch (Exception e) {
- // System.out.println("EXTENSION ERROR: " + each);
- }
- }
- return factory;
+ private ResourceManager getResourceManager(RutaBuildOptions options) {
+ ResourceManager rm = null;
+ if(options.getClassLoader() != null) {
+ rm = new ResourceManager_impl(options.getClassLoader());
+ } else {
+ rm = UIMAFramework.newDefaultResourceManager();
+ }
+ return rm;
}
-
+
+ private RutaExternalFactory initializeExternalFactory(RutaBuildOptions options) {
+ RutaExternalFactory factory = new RutaExternalFactory();
+ List<String> languageExtensions = options.getLanguageExtensions();
+ for (String each : languageExtensions) {
+ try {
+ Class<?> forName = null;
+ if (options.getClassLoader() != null) {
+ options.getClassLoader().loadClass(each);
+ } else {
+ forName = Class.forName(each);
+ }
+ if (forName != null && IRutaExtension.class.isAssignableFrom(forName)) {
+ IRutaExtension extension = (IRutaExtension) forName.newInstance();
+ for (String name : extension.getKnownExtensions()) {
+ factory.addExtension(name, extension);
+ }
+ }
+ } catch (Exception e) {
+ // System.out.println("EXTENSION ERROR: " + each);
+ }
+ }
+ return factory;
+ }
+
public URL getDefaultTypeSystem() {
return defaultTypeSystem;
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorInformation.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorInformation.java?rev=1674767&r1=1674766&r2=1674767&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorInformation.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorInformation.java Mon Apr 20 09:08:49 2015
@@ -142,11 +142,11 @@ public class RutaDescriptorInformation {
}
public void setScriptName(String scriptName) {
- this.scriptName = scriptName;
+ this.scriptName = scriptName;
}
-
+
public String getScriptName() {
- return scriptName;
+ return scriptName;
}
public String getPackageString() {
@@ -156,5 +156,5 @@ public class RutaDescriptorInformation {
public void setPackageString(String packageString) {
this.packageString = packageString;
}
-
+
}
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=1674767&r1=1674766&r2=1674767&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 Mon Apr 20 09:08:49 2015
@@ -215,6 +215,7 @@ public class RutaGenerateDescriptorMojo
options.setEncoding(encoding);
options.setResolveImports(resolveImports);
options.setImportByName(importByName);
+ options.setClassLoader(classloader);
List<String> extensions = getExtensionsFromClasspath(classloader);
options.setLanguageExtensions(extensions);
@@ -231,7 +232,8 @@ public class RutaGenerateDescriptorMojo
for (String fileString : files) {
File file = new File(fileString);
try {
- RutaDescriptorInformation descriptorInformation = factory.parseDescriptorInformation(file, options);
+ RutaDescriptorInformation descriptorInformation = factory.parseDescriptorInformation(file,
+ options);
toBuild.add(descriptorInformation);
} catch (RecognitionException re) {
getLog().warn("Failed to parse UIMA Ruta script file: " + file.getAbsolutePath(), re);
@@ -245,7 +247,7 @@ public class RutaGenerateDescriptorMojo
RutaDescriptorInformation descriptorInformation = toBuild.poll();
String scriptName = descriptorInformation.getScriptName();
try {
- createDescriptors(factory, classloader, options, descriptorInformation);
+ createDescriptors(factory, options, descriptorInformation);
} catch (RecognitionException re) {
getLog().warn("Failed to parse UIMA Ruta script: " + scriptName, re);
} catch (IOException ioe) {
@@ -292,13 +294,13 @@ public class RutaGenerateDescriptorMojo
}
- private void createDescriptors(RutaDescriptorFactory factory, URLClassLoader classloader,
- RutaBuildOptions options, RutaDescriptorInformation descriptorInformation)
- throws IOException, RecognitionException, InvalidXMLException,
- ResourceInitializationException, URISyntaxException, SAXException {
+ private void createDescriptors(RutaDescriptorFactory factory, RutaBuildOptions options,
+ RutaDescriptorInformation descriptorInformation) throws IOException,
+ RecognitionException, InvalidXMLException, ResourceInitializationException,
+ URISyntaxException, SAXException {
String packageString = "";
- if(!StringUtils.isBlank(descriptorInformation.getPackageString())) {
- packageString = descriptorInformation.getPackageString().replaceAll("[.]", "/").concat("/");
+ if (!StringUtils.isBlank(descriptorInformation.getPackageString())) {
+ packageString = descriptorInformation.getPackageString().replaceAll("[.]", "/").concat("/");
}
String engineOutput = new File(analysisEngineOutputDirectory, packageString
+ descriptorInformation.getScriptName() + analysisEngineSuffix + ".xml")
@@ -307,7 +309,7 @@ public class RutaGenerateDescriptorMojo
+ descriptorInformation.getScriptName() + typeSystemSuffix + ".xml").getAbsolutePath();
Pair<AnalysisEngineDescription, TypeSystemDescription> descriptions = factory
.createDescriptions(engineOutput, typeSystemOutput, descriptorInformation, options,
- scriptPaths, descriptorPaths, resourcePaths, classloader);
+ scriptPaths, descriptorPaths, resourcePaths);
write(descriptions.getKey(), engineOutput);
write(descriptions.getValue(), typeSystemOutput);
buildContext.refresh(analysisEngineOutputDirectory);