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 2016/07/25 12:39:33 UTC
svn commit: r1753984 - in /uima/ruta/trunk:
ruta-core/src/main/java/org/apache/uima/ruta/descriptor/ ruta-ep-ide/
ruta-ep-ide/schema/ ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/
ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/build...
Author: pkluegl
Date: Mon Jul 25 12:39:32 2016
New Revision: 1753984
URL: http://svn.apache.org/viewvc?rev=1753984&view=rev
Log:
UIMA-5029 + UIMA-5027
- fixed compile errors
- remove engine loader extension
Removed:
uima/ruta/trunk/ruta-ep-ide/schema/engineExtension.exsd
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-ep-ide/plugin.xml
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java
uima/ruta/trunk/ruta-parent/pom.xml
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=1753984&r1=1753983&r2=1753984&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 Jul 25 12:39:32 2016
@@ -26,8 +26,6 @@ public class RutaBuildOptions {
private List<String> languageExtensions = Collections.emptyList();
- private List<String> engineLoaders = Collections.emptyList();
-
private boolean importByName = false;
private boolean resolveImports = false;
@@ -102,14 +100,6 @@ public class RutaBuildOptions {
this.languageExtensions = languageExtensions;
}
- public List<String> getEngineLoaders() {
- return engineLoaders;
- }
-
- public void setEngineLoaders(List<String> engineLoaders) {
- this.engineLoaders = engineLoaders;
- }
-
public void setClassLoader(ClassLoader classLoader) {
this.classLoader = 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=1753984&r1=1753983&r2=1753984&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 Jul 25 12:39:32 2016
@@ -544,12 +544,10 @@ public class RutaDescriptorBuilder {
.getParameterValue(RutaEngine.PARAM_ADDITIONAL_EXTENSIONS);
List<String> es = new ArrayList<String>();
- List<String> ls = new ArrayList<String>();
if (extensions != null) {
es.addAll(Arrays.asList(extensions));
}
es.addAll(languageExtensions);
- ls.addAll(options.getEngineLoaders());
configurationParameterSettings.setParameterValue(RutaEngine.PARAM_ADDITIONAL_EXTENSIONS,
es.toArray(new String[0]));
Modified: uima/ruta/trunk/ruta-ep-ide/plugin.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/plugin.xml?rev=1753984&r1=1753983&r2=1753984&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/plugin.xml (original)
+++ uima/ruta/trunk/ruta-ep-ide/plugin.xml Mon Jul 25 12:39:32 2016
@@ -27,7 +27,6 @@ under the License.
<extension-point id="rutaExtension" name="rutaExtension" schema="schema/rutaExtension.exsd"/>
<extension-point id="conditionExtension" name="conditionExtension" schema="schema/conditionExtension.exsd"/>
<extension-point id="actionExtension" name="actionExtension" schema="schema/actionExtension.exsd"/>
- <extension-point id="engineExtension" name="engineExtension" schema="schema/engineExtension.exsd"/>
<extension-point id="booleanFunctionExtension" name="booleanFunctionExtension" schema="schema/booleanFunctionExtension.exsd"/>
<extension-point id="typeFunctionExtension" name="typeFunctionExtension" schema="schema/typeFunctionExtension.exsd"/>
<extension-point id="numberFunctionExtension" name="numberFunctionExtension" schema="schema/numberFunctionExtension.exsd"/>
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java?rev=1753984&r1=1753983&r2=1753984&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/RutaExtensionManager.java Mon Jul 25 12:39:32 2016
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.uima.ruta.extensions.IEngineLoader;
import org.apache.uima.ruta.extensions.IRutaActionExtension;
import org.apache.uima.ruta.extensions.IRutaBlockExtension;
import org.apache.uima.ruta.extensions.IRutaBooleanFunctionExtension;
@@ -439,25 +438,5 @@ public class RutaExtensionManager {
return result.toArray(new IRutaBlockExtension[0]);
}
- public IEngineLoader[] getEngineExtensions() {
- Collection<IEngineLoader> result = new ArrayList<IEngineLoader>();
- IExtension[] conditionExtensions = Platform.getExtensionRegistry()
- .getExtensionPoint(RutaIdeCorePlugin.PLUGIN_ID, "engineExtension").getExtensions();
- for (IExtension extension : conditionExtensions) {
- IConfigurationElement[] configurationElements = extension.getConfigurationElements();
- for (IConfigurationElement configurationElement : configurationElements) {
- Object obj = null;
- try {
- obj = configurationElement.createExecutableExtension("class");
- } catch (CoreException e) {
- e.printStackTrace();
- }
- if (obj instanceof IEngineLoader) {
- result.add((IEngineLoader) obj);
- }
- }
- }
- return result.toArray(new IEngineLoader[0]);
- }
}
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java?rev=1753984&r1=1753983&r2=1753984&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaBuilder.java Mon Jul 25 12:39:32 2016
@@ -31,7 +31,6 @@ import org.apache.uima.ruta.descriptor.R
import org.apache.uima.ruta.descriptor.RutaDescriptorBuilder;
import org.apache.uima.ruta.descriptor.RutaDescriptorInformation;
import org.apache.uima.ruta.engine.RutaEngine;
-import org.apache.uima.ruta.extensions.IEngineLoader;
import org.apache.uima.ruta.extensions.IRutaActionExtension;
import org.apache.uima.ruta.extensions.IRutaBlockExtension;
import org.apache.uima.ruta.extensions.IRutaBooleanFunctionExtension;
@@ -252,10 +251,8 @@ public class RutaBuilder extends Abstrac
.getRutaTypeFunctionExtensions();
IRutaBlockExtension[] blockExtensions = RutaExtensionManager.getDefault()
.getRutaBlockExtensions();
- IEngineLoader[] engineExtensions = RutaExtensionManager.getDefault().getEngineExtensions();
List<String> language = new ArrayList<String>();
- List<String> engines = new ArrayList<String>();
for (IRutaConditionExtension each : conditionExtensions) {
language.add(each.getClass().getName());
@@ -278,14 +275,10 @@ public class RutaBuilder extends Abstrac
for (IRutaBlockExtension each : blockExtensions) {
language.add(each.getClass().getName());
}
- for (IEngineLoader each : engineExtensions) {
- engines.add(each.getClass().getName());
- }
try {
RutaBuildOptions option = new RutaBuildOptions();
option.setLanguageExtensions(language);
- option.setEngineLoaders(engines);
IPreferenceStore store = RutaIdeCorePlugin.getDefault().getPreferenceStore();
option.setImportByName(store.getBoolean(RutaCorePreferences.BUILDER_IMPORT_BY_NAME));
option.setResolveImports(store.getBoolean(RutaCorePreferences.BUILDER_RESOLVE_IMPORTS));
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java?rev=1753984&r1=1753983&r2=1753984&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaProjectUtils.java Mon Jul 25 12:39:32 2016
@@ -19,6 +19,7 @@
package org.apache.uima.ruta.ide.core.builder;
+import java.io.IOException;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -31,7 +32,9 @@ import java.util.TreeSet;
import org.apache.commons.lang3.StringUtils;
import org.apache.uima.ruta.engine.RutaEngine;
+import org.apache.uima.ruta.ide.RutaIdeCorePlugin;
import org.apache.uima.ruta.ide.core.RutaNature;
+import org.apache.uima.ruta.resource.RutaResourceLoader;
import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -54,6 +57,7 @@ import org.eclipse.jdt.core.IJavaProject
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.core.JavaProject;
+import org.springframework.core.io.Resource;
public class RutaProjectUtils {
@@ -114,12 +118,17 @@ public class RutaProjectUtils {
String analysisEngineSuffix = getAnalysisEngineSuffix(project);
String name = getScriptWithPackage(scriptPath, project);
String[] paths = getDescriptorPathsArray(project);
- String locate = RutaEngine.locate(name, paths, analysisEngineSuffix + ".xml");
- if (locate != null) {
- return org.eclipse.core.runtime.Path.fromPortableString(locate);
- } else {
- return null;
+ RutaResourceLoader loader = new RutaResourceLoader(paths);
+ Resource resource = loader.getResource(name + analysisEngineSuffix + ".xml");
+ if (resource != null && resource.exists()) {
+ try {
+ return org.eclipse.core.runtime.Path
+ .fromPortableString(resource.getFile().getAbsolutePath());
+ } catch (IOException e) {
+ RutaIdeCorePlugin.error(e);
+ }
}
+ return null;
}
public static IPath getAnalysisEngineDescriptorPath(String scriptLocation) throws CoreException {
@@ -138,12 +147,17 @@ public class RutaProjectUtils {
String typeSystemSuffix = getTypeSystemSuffix(project);
String name = getScriptWithPackage(scriptPath, project);
String[] paths = getDescriptorPathsArray(project);
- String locate = RutaEngine.locate(name, paths, typeSystemSuffix + ".xml");
- if (locate != null) {
- return org.eclipse.core.runtime.Path.fromPortableString(locate);
- } else {
- return null;
+ RutaResourceLoader loader = new RutaResourceLoader(paths);
+ Resource resource = loader.getResource(name + typeSystemSuffix + ".xml");
+ if (resource != null && resource.exists()) {
+ try {
+ return org.eclipse.core.runtime.Path
+ .fromPortableString(resource.getFile().getAbsolutePath());
+ } catch (IOException e) {
+ RutaIdeCorePlugin.error(e);
+ }
}
+ return null;
}
public static IPath getTypeSystemDescriptorPath(String scriptLocation) throws CoreException {
@@ -266,7 +280,7 @@ public class RutaProjectUtils {
result.addAll(getReferencedDescriptorFolders(proj));
return result;
}
-
+
public static List<IFolder> getAllResourceFolders(IProject proj) throws CoreException {
List<IFolder> result = new ArrayList<IFolder>();
result.addAll(getResourceFolders(proj));
@@ -291,7 +305,7 @@ public class RutaProjectUtils {
}
return result;
}
-
+
public static List<IFolder> getReferencedResourceFolders(IProject proj) throws CoreException {
return getReferencedDescriptorFolders(proj, new HashSet<IProject>());
}
@@ -547,7 +561,7 @@ public class RutaProjectUtils {
IClasspathEntry[] resolvedClasspath = javaProject.getResolvedClasspath();
IWorkspace workspace = ResourcesPlugin.getWorkspace();
IWorkspaceRoot root = workspace.getRoot();
-
+
// TODO: skip jre libs?
for (IClasspathEntry each : resolvedClasspath) {
int entryKind = each.getEntryKind();
@@ -581,7 +595,8 @@ public class RutaProjectUtils {
return result;
}
- private static void addAbsoluteLocation(Collection<String> result, IWorkspaceRoot root, IPath outputLocation) {
+ private static void addAbsoluteLocation(Collection<String> result, IWorkspaceRoot root,
+ IPath outputLocation) {
if (outputLocation != null) {
IFolder folder = root.getFolder(outputLocation);
if (folder != null && folder.exists()) {
Modified: uima/ruta/trunk/ruta-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-parent/pom.xml?rev=1753984&r1=1753983&r2=1753984&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-parent/pom.xml (original)
+++ uima/ruta/trunk/ruta-parent/pom.xml Mon Jul 25 12:39:32 2016
@@ -134,7 +134,7 @@ Creative Commons Attribution 3.0 License
BACKWARD_COMPATIBLE_USER - minor version (=.+.0)
NON_BACKWARD_COMPATIBLE - major version (+.0.0)
-->
- <compat.level>BACKWARD_COMPATIBLE_USER</compat.level>
+ <compat.level>NON_BACKWARD_COMPATIBLE</compat.level>
<compat.previous.version>2.4.0</compat.previous.version>
</properties>