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 2013/09/04 20:04:19 UTC

svn commit: r1520086 [2/2] - in /uima/sandbox/ruta/trunk: ./ example-projects/ruta-ep-example-extensions/src/test/java/org/apache/uima/ruta/example/extensions/ ruta-core/ ruta-core/src/main/java/org/apache/uima/ruta/engine/ ruta-core/src/main/java/org/...

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java Wed Sep  4 18:04:18 2013
@@ -347,13 +347,13 @@ public class RutaSimpleBuilder {
     }
 
     analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.MAIN_SCRIPT, mainScript);
+            .setParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, mainScript);
     analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.SCRIPT_PATHS, scriptPaths);
+            .setParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, scriptPaths);
     analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.DESCRIPTOR_PATHS, descriptorPaths);
+            .setParameterValue(RutaEngine.PARAM_DESCRIPTOR_PATHS, descriptorPaths);
     String[] parameterValue = (String[]) analysisEngineDescription.getAnalysisEngineMetaData()
-            .getConfigurationParameterSettings().getParameterValue(RutaEngine.RESOURCE_PATHS);
+            .getConfigurationParameterSettings().getParameterValue(RutaEngine.PARAM_RESOURCE_PATHS);
     Set<String> resourceLocations = new HashSet<String>();
 
     if (parameterValue != null && parameterValue.length != 0) {
@@ -366,22 +366,22 @@ public class RutaSimpleBuilder {
       resourceLocations.add(defaultResourceDir.getAbsolutePath());
     }
     analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.RESOURCE_PATHS, resourceLocations.toArray(new String[0]));
+            .setParameterValue(RutaEngine.PARAM_RESOURCE_PATHS, resourceLocations.toArray(new String[0]));
 
     String[] additionalScriptsArray = desc.getImportedScripts().toArray(new String[] {});
     analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.ADDITIONAL_SCRIPTS, additionalScriptsArray);
+            .setParameterValue(RutaEngine.PARAM_ADDITIONAL_SCRIPTS, additionalScriptsArray);
 
     String[] additionalEnginesArray = desc.getImportedEngines().toArray(new String[] {});
     analysisEngineDescription.getAnalysisEngineMetaData().getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.ADDITIONAL_ENGINES, additionalEnginesArray);
+            .setParameterValue(RutaEngine.PARAM_ADDITIONAL_ENGINES, additionalEnginesArray);
 
     String[] additionalUimafitEnginesArray = desc.getImportedUimafitEngines().toArray(
             new String[] {});
     analysisEngineDescription
             .getAnalysisEngineMetaData()
             .getConfigurationParameterSettings()
-            .setParameterValue(RutaEngine.ADDITIONAL_UIMAFIT_ENGINES, additionalUimafitEnginesArray);
+            .setParameterValue(RutaEngine.PARAM_ADDITIONAL_UIMAFIT_ENGINES, additionalUimafitEnginesArray);
 
     analysisEngineDescription.getAnalysisEngineMetaData().setTypeSystem(typeSystemDescription);
 
@@ -404,9 +404,9 @@ public class RutaSimpleBuilder {
 
     List<String> languageExtensions = options.getLanguage();
 
-    configurationParameterSettings.setParameterValue(RutaEngine.ADDITIONAL_EXTENSIONS,
+    configurationParameterSettings.setParameterValue(RutaEngine.PARAM_ADDITIONAL_EXTENSIONS,
             languageExtensions.toArray(new String[0]));
-    configurationParameterSettings.setParameterValue(RutaEngine.ADDITIONAL_ENGINE_LOADERS, options
+    configurationParameterSettings.setParameterValue(RutaEngine.PARAM_ADDITIONAL_ENGINE_LOADERS, options
             .getEngines().toArray(new String[0]));
   }
 

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java Wed Sep  4 18:04:18 2013
@@ -58,7 +58,7 @@ import org.xml.sax.helpers.DefaultHandle
 
 public class DLTKRutaHelper {
 
-  private static final String DLTK_TM = "scripts/dltk" + RutaEngine.SCRIPT_FILE_EXTENSION; //$NON-NLS-1$
+  private static final String DLTK_RUTA = "scripts/dltk" + RutaEngine.SCRIPT_FILE_EXTENSION; //$NON-NLS-1$
 
   public static List getScriptOutput(InputStream stream) {
     final List elements = new ArrayList();
@@ -131,7 +131,7 @@ public class DLTKRutaHelper {
   private static IFileHandle deploy(IDeployment deployment) {
     IFileHandle script;
     try {
-      IPath path = deployment.add(RutaIdeCorePlugin.getDefault().getBundle(), DLTK_TM);
+      IPath path = deployment.add(RutaIdeCorePlugin.getDefault().getBundle(), DLTK_RUTA);
       script = deployment.getFile(path);
     } catch (IOException e) {
       if (DLTKCore.DEBUG) {

Modified: uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerBasicLearner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerBasicLearner.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerBasicLearner.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerBasicLearner.java Wed Sep  4 18:04:18 2013
@@ -159,19 +159,19 @@ public abstract class TextRulerBasicLear
     // the FILTERTYPE expression!
     String tempRulesFileName = getTempRulesFileName();
     IPath path = new Path(tempRulesFileName);
-    ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, path.removeFileExtension().lastSegment());
+    ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, path.removeFileExtension().lastSegment());
     String portableString = path.removeLastSegments(1).toPortableString();
-    ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { portableString });
-    ae.setConfigParameterValue(RutaEngine.ADDITIONAL_SCRIPTS, new String[0]);
-    ae.setConfigParameterValue(RutaEngine.RELOAD_SCRIPT, true);
+    ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { portableString });
+    ae.setConfigParameterValue(RutaEngine.PARAM_ADDITIONAL_SCRIPTS, new String[0]);
+    ae.setConfigParameterValue(RutaEngine.PARAM_RELOAD_SCRIPT, true);
     if (useDynamicAnchoring) {
-      ae.setConfigParameterValue(RutaEngine.DYNAMIC_ANCHORING, true);
+      ae.setConfigParameterValue(RutaEngine.PARAM_DYNAMIC_ANCHORING, true);
     }
     IPreferenceStore store = TextRulerPlugin.getDefault().getPreferenceStore();
     boolean lowMemoryProfile = store.getBoolean(TextRulerPreferences.LOW_MEMORY_PROFILE);
     boolean removeBasics = store.getBoolean(TextRulerPreferences.REMOVE_BASICS);
-    ae.setConfigParameterValue(RutaEngine.LOW_MEMORY_PROFILE, lowMemoryProfile);
-    ae.setConfigParameterValue(RutaEngine.REMOVE_BASICS, removeBasics);
+    ae.setConfigParameterValue(RutaEngine.PARAM_LOW_MEMORY_PROFILE, lowMemoryProfile);
+    ae.setConfigParameterValue(RutaEngine.PARAM_REMOVE_BASICS, removeBasics);
 
     try {
       ae.reconfigure();