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 [1/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/...
Author: pkluegl
Date: Wed Sep 4 18:04:18 2013
New Revision: 1520086
URL: http://svn.apache.org/r1520086
Log:
UIMA-3246
- ruta analysis engine is now a uimaFIT component
- renaming of parameter constants
- added documentation as javadoc for parameters
Added:
uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/
uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/
uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/typepriorities.txt
uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/UimafitTest.ruta
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/casdump.txt
Modified:
uima/sandbox/ruta/trunk/RELEASE_NOTES.html
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/test/java/org/apache/uima/ruta/example/extensions/RutaTestUtils.java
uima/sandbox/ruta/trunk/ruta-core/pom.xml
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/StyleMapCreator.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/ResourcePathResourceLoader.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaResourceLoader.java
uima/sandbox/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RutaTestUtils.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ShiftWithLowMemoryProfileTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java
uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml
uima/sandbox/ruta/trunk/ruta-eclipse-update-site/pom.xml
uima/sandbox/ruta/trunk/ruta-ep-addons/pom.xml
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaGEConstraint.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptKeepBasicsJob.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptNoXMIJob.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptRemoveBasicsJob.java
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/builder/RutaSimpleBuilder.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/packages/DLTKRutaHelper.java
uima/sandbox/ruta/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/core/TextRulerBasicLearner.java
Modified: uima/sandbox/ruta/trunk/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/RELEASE_NOTES.html?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/RELEASE_NOTES.html (original)
+++ uima/sandbox/ruta/trunk/RELEASE_NOTES.html Wed Sep 4 18:04:18 2013
@@ -68,6 +68,9 @@
Direct import of uimaFIT analysis engines without descriptor
</li>
<li>
+ RutaEngine is now a uimaFIT component
+ </li>
+ <li>
Manual specification of the start anchor for a rule match
</li>
<li>
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/test/java/org/apache/uima/ruta/example/extensions/RutaTestUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/test/java/org/apache/uima/ruta/example/extensions/RutaTestUtils.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/test/java/org/apache/uima/ruta/example/extensions/RutaTestUtils.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/test/java/org/apache/uima/ruta/example/extensions/RutaTestUtils.java Wed Sep 4 18:04:18 2013
@@ -142,17 +142,17 @@ public class RutaTestUtils {
aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { ruleFile
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { ruleFile
.getParentFile().getPath() });
String name = ruleFile.getName();
if (name.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
name = name.substring(0, name.length() - 5);
}
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
- ae.setConfigParameterValue(RutaEngine.DYNAMIC_ANCHORING, dynamicAnchoring);
- ae.setConfigParameterValue(RutaEngine.SIMPLE_GREEDY_FOR_COMPOSED, simpleGreedyForComposed);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DYNAMIC_ANCHORING, dynamicAnchoring);
+ ae.setConfigParameterValue(RutaEngine.PARAM_SIMPLE_GREEDY_FOR_COMPOSED, simpleGreedyForComposed);
if (resourceFile != null) {
- ae.setConfigParameterValue(RutaEngine.RESOURCE_PATHS,
+ ae.setConfigParameterValue(RutaEngine.PARAM_RESOURCE_PATHS,
new String[] { resourceFile.getPath() });
}
Modified: uima/sandbox/ruta/trunk/ruta-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/pom.xml?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-core/pom.xml Wed Sep 4 18:04:18 2013
@@ -122,6 +122,9 @@
<exclude>src/test/resources/org/apache/uima/ruta/seed/*ruta</exclude> <!-- test data -->
<exclude>src/test/resources/org/apache/uima/ruta/engine/*.html</exclude> <!-- test data -->
<exclude>src/test/resources/org/apache/uima/ruta/engine/*ruta</exclude> <!-- test data -->
+ <exclude>src/test/resources/org/apache/uima/ruta/engine/*txt</exclude> <!-- test data -->
+ <exclude>src/test/resources/org/apache/uima/ruta/engine/*txt</exclude> <!-- test data -->
+ <exclude>src/main/resources/META-INF/org.apache.uima.fit/*txt</exclude> <!-- test data -->
<exclude>issuesFixed/**</exclude> <!-- generated -->
</excludes>
</configuration>
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/Ruta.java Wed Sep 4 18:04:18 2013
@@ -62,10 +62,10 @@ public class Ruta {
script = "PACKAGE org.apache.uima.ruta;\n" + script;
}
FileUtils.saveString2File(script, scriptFile);
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
.getAbsolutePath() });
String name = scriptFile.getName().substring(0, scriptFile.getName().length() - 5);
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
if (parameters != null) {
for (Map.Entry<String, Object> parameter : parameters.entrySet()) {
ae.setConfigParameterValue(parameter.getKey(), parameter.getValue());
@@ -138,10 +138,10 @@ public class Ruta {
.parseResourceSpecifier(in);
AnalysisEngineMetaData metaData = aed.getAnalysisEngineMetaData();
ConfigurationParameterSettings settings = metaData.getConfigurationParameterSettings();
- settings.setParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
+ settings.setParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
.getAbsolutePath() });
String name = scriptFile.getName().substring(0, scriptFile.getName().length() - 5);
- settings.setParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ settings.setParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
if (tsds != null) {
List<TypeSystemDescription> tsdList = new ArrayList<TypeSystemDescription>();
tsdList.add(metaData.getTypeSystem());
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Wed Sep 4 18:04:18 2013
@@ -39,7 +39,6 @@ import org.antlr.runtime.CommonTokenStre
import org.antlr.runtime.RecognitionException;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_component.AnalysisComponent;
-import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
@@ -48,6 +47,8 @@ import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceConfigurationException;
@@ -82,108 +83,261 @@ public class RutaEngine extends JCasAnno
public static final String OPTIONAL_TYPE = "org.apache.uima.ruta.type.RutaOptional";
- public static final String SEEDERS = "seeders";
+ /**
+ * Load script in Java notation, with "{@code .}" as package separator and no extension. File
+ * needs to be located in the path specified below with ending {@code .ruta}.
+ */
+ public static final String PARAM_MAIN_SCRIPT = "mainScript";
+
+ @ConfigurationParameter(name = PARAM_MAIN_SCRIPT, mandatory = false)
+ private String mainScipt;
+
+ /**
+ * This parameter specifies the encoding of the rule files. Its default value is "UTF-8".
+ */
+ public static final String PARAM_SCRIPT_ENCODING = "scriptEncoding";
- public static final String REMOVE_BASICS = "removeBasics";
-
- public static final String SCRIPT_PATHS = "scriptPaths";
-
- public static final String DESCRIPTOR_PATHS = "descriptorPaths";
+ @ConfigurationParameter(name = PARAM_SCRIPT_ENCODING, mandatory = false, defaultValue = "UTF-8")
+ private String scriptEncoding;
- public static final String MAIN_SCRIPT = "mainScript";
+ /**
+ * The parameter scriptPaths refers to a list of String values, which specify the possible
+ * locations of script files. The given locations are absolute paths. A typical value for this
+ * parameter is, for example, "C:/Ruta/MyProject/script/". If the parameter mainScript is set to
+ * org.apache.uima.Main, then the absolute path of the script file has to be
+ * "C:/Ruta/MyProject/script/org/apache/uima/Main.ruta". This parameter can contain multiple
+ * values, as the main script can refer to multiple projects similar to a class path in Java.
+ */
+ public static final String PARAM_SCRIPT_PATHS = "scriptPaths";
- public static final String ADDITIONAL_SCRIPTS = "additionalScripts";
+ @ConfigurationParameter(name = PARAM_SCRIPT_PATHS, mandatory = false)
+ private String[] scriptPaths;
- public static final String ADDITIONAL_ENGINES = "additionalEngines";
+ /**
+ * This parameter specifies the possible locations for descriptors like analysis engines or type
+ * systems, similar to the parameter scriptPaths for the script files. A typical value for this
+ * parameter is for example "C:/Ruta/MyProject/descriptor/". The relative values of the parameter
+ * additionalEngines are resolved to these absolute locations. This parameter can contain multiple
+ * values, as the main script can refer to multiple projects similar to a class path in Java.
+ */
+ public static final String PARAM_DESCRIPTOR_PATHS = "descriptorPaths";
- public static final String ADDITIONAL_UIMAFIT_ENGINES = "additionalUimafitEngines";
+ @ConfigurationParameter(name = PARAM_DESCRIPTOR_PATHS, mandatory = false, defaultValue = {})
+ private String[] descriptorPaths;
- public static final String ADDITIONAL_EXTENSIONS = "additionalExtensions";
+ /**
+ * This parameter specifies the possible locations of additional resources like word lists or CSV
+ * tables. The string values have to contain absolute locations, for example,
+ * "C:/Ruta/MyProject/resources/".
+ */
+ public static final String PARAM_RESOURCE_PATHS = "resourcePaths";
- public static final String ADDITIONAL_ENGINE_LOADERS = "additionalEngineLoaders";
+ @ConfigurationParameter(name = PARAM_RESOURCE_PATHS, mandatory = false, defaultValue = {})
+ private String[] resourcePaths;
- public static final String CREATE_DEBUG_INFO = "debug";
+ /**
+ * The parameter additionalScripts is defined as a list of string values and contains script
+ * files, which are additionally loaded by the analysis engine. These script files are specified
+ * by their complete namespace, exactly like the value of the parameter mainScript and can be
+ * refered to by language elements, e.g., by executing the containing rules. An exemplary value of
+ * this parameter is "org.apache.uima.SecondaryScript". In this example, the main script could
+ * import this script file by the declaration "SCRIPT org.apache.uima.SecondaryScript;" and then
+ * could execute it with the rule "Document{-> CALL(SecondaryScript)};".
+ */
+ public static final String PARAM_ADDITIONAL_SCRIPTS = "additionalScripts";
+
+ @ConfigurationParameter(name = PARAM_ADDITIONAL_SCRIPTS, mandatory = false, defaultValue = {})
+ private String[] additionalScripts;
+
+ /**
+ * This parameter contains a list of additional analysis engines, which can be executed by the
+ * UIMA Ruta rules. The single values are given by the name of the analysis engine with their
+ * complete namespace and have to be located relative to one value of the parameter
+ * descriptorPaths, the location where the analysis engine searches for the descriptor file. An
+ * example for one value of the parameter is "utils.HtmlAnnotator", which points to the descriptor
+ * "HtmlAnnotator.xml" in the folder "utils".
+ */
+ public static final String PARAM_ADDITIONAL_ENGINES = "additionalEngines";
+
+ @ConfigurationParameter(name = PARAM_ADDITIONAL_ENGINES, mandatory = false, defaultValue = {})
+ private String[] additionalEngines;
+
+ /**
+ * List of additional uimaFIT analysis engines, which are loaded without descriptor.
+ */
+ public static final String PARAM_ADDITIONAL_UIMAFIT_ENGINES = "additionalUimafitEngines";
- public static final String CREATE_DEBUG_INFO_ONLY_FOR = "debugOnlyFor";
+ @ConfigurationParameter(name = PARAM_ADDITIONAL_UIMAFIT_ENGINES, mandatory = false, defaultValue = {})
+ private String[] additionalUimafitEngines;
- public static final String CREATE_PROFILING_INFO = "profile";
+ /**
+ * The parameter "additionalEngineLoaders" specifies a list of optional implementations of the
+ * interface "org.apache.uima.ruta.extensions.IEngineLoader", which can be used to
+ * application-specific configurations of additional analysis engines.
+ */
+ public static final String PARAM_ADDITIONAL_ENGINE_LOADERS = "additionalEngineLoaders";
- public static final String CREATE_STATISTIC_INFO = "statistics";
+ @ConfigurationParameter(name = PARAM_ADDITIONAL_ENGINE_LOADERS, mandatory = false, defaultValue = {})
+ private String[] additionalEngineLoaders;
- public static final String CREATE_CREATED_BY_INFO = "createdBy";
+ /**
+ * This parameter specifies optional extensions of the UIMA Ruta language. The elements of the
+ * string list have to implement the interface "org.apache.uima.ruta.extensions.IRutaExtension".
+ * With these extensions, application-specific conditions and actions can be added to the set of
+ * provided ones.
+ */
+ public static final String PARAM_ADDITIONAL_EXTENSIONS = "additionalExtensions";
- public static final String CREATE_MATCH_DEBUG_INFO = "debugWithMatches";
+ @ConfigurationParameter(name = PARAM_ADDITIONAL_EXTENSIONS, mandatory = false, defaultValue = {})
+ private String[] additionalExtensions;
- public static final String RESOURCE_PATHS = "resourcePaths";
+ /**
+ * This boolean parameter indicates whether the script or resource files should be reloaded when
+ * processing a CAS. The default value is set to false. In this case, the script files are loaded
+ * when the analysis engine is initialized. If script files or resource files are extended, e.g.,
+ * a dictionary is filled yet when a collection of documents are processed, then the parameter is
+ * needed to be set to true in order to include the changes.
+ */
+ public static final String PARAM_RELOAD_SCRIPT = "reloadScript";
- public static final String SCRIPT_ENCODING = "scriptEncoding";
+ @ConfigurationParameter(name = PARAM_RELOAD_SCRIPT, mandatory = false, defaultValue = "false")
+ private Boolean reloadScript;
- public static final String DEFAULT_FILTERED_TYPES = "defaultFilteredTypes";
+ /**
+ * This list of string values refers to implementations of the interface
+ * "org.apache.uima.ruta.seed.RutaAnnotationSeeder", which can be used to automatically add
+ * annotations to the CAS. The default value of the parameter is a single seeder, namely
+ * "org.apache.uima.ruta.seed.DefaultSeeder" that adds annotations for token classes like CW,
+ * MARKUP or SEMICOLON. Remember that additional annotations can also be added with an additional
+ * engine that is executed by a UIMA Ruta rule.
+ */
+ public static final String PARAM_SEEDERS = "seeders";
- public static final String DYNAMIC_ANCHORING = "dynamicAnchoring";
+ @ConfigurationParameter(name = PARAM_SEEDERS, mandatory = false, defaultValue = { "org.apache.uima.ruta.seed.DefaultSeeder" })
+ private String[] seeders;
- public static final String RELOAD_SCRIPT = "reloadScript";
+ /**
+ * This parameter specifies a list of types, which are filtered by default when executing a script
+ * file. Using the default values of this parameter, whitespaces, line breaks and markup elements
+ * are not visible to Ruta rules. The visibility of annotations and, therefore, the covered text
+ * can be changed using the actions FILTERTYPE and RETAINTYPE.
+ */
+ public static final String PARAM_DEFAULT_FILTERED_TYPES = "defaultFilteredTypes";
+
+ @ConfigurationParameter(name = PARAM_DEFAULT_FILTERED_TYPES, mandatory = false, defaultValue = {
+ "org.apache.uima.ruta.type.SPACE", "org.apache.uima.ruta.type.NBSP",
+ "org.apache.uima.ruta.type.BREAK", "org.apache.uima.ruta.type.MARKUP" })
+ private String[] defaultFilteredTypes;
- public static final String LOW_MEMORY_PROFILE = "lowMemoryProfile";
+ /**
+ * This parameter specifies whether the inference annotations created by the analysis engine
+ * should be removed after processing the CAS. The default value is set to true.
+ */
+ public static final String PARAM_REMOVE_BASICS = "removeBasics";
- public static final String SIMPLE_GREEDY_FOR_COMPOSED = "simpleGreedyForComposed";
+ @ConfigurationParameter(name = PARAM_REMOVE_BASICS, mandatory = false, defaultValue = "true")
+ private Boolean removeBasics;
- private String[] seeders;
+ /**
+ * If this parameter is set to true, then the Ruta rules are not forced to start to match with the
+ * first rule element. Rather, the rule element referring to the most rare type is chosen. This
+ * option can be utilized to optimize the performance. Please mind that the matching result can
+ * vary in some cases when greedy rule elements are applied. The default value is set to false.
+ */
+ public static final String PARAM_DYNAMIC_ANCHORING = "dynamicAnchoring";
- private Boolean createDebugInfo;
+ @ConfigurationParameter(name = PARAM_DYNAMIC_ANCHORING, mandatory = false, defaultValue = "false")
+ private Boolean dynamicAnchoring;
- private String[] createDebugOnlyFor;
+ /**
+ * This parameter specifies whether the memory consumption should be reduced. This parameter
+ * should be set to true for very large CAS documents (e.g., > 500k tokens), but it also reduces
+ * the performance. The default value is set to false.
+ */
+ public static final String PARAM_LOW_MEMORY_PROFILE = "lowMemoryProfile";
- private Boolean createProfilingInfo;
+ @ConfigurationParameter(name = PARAM_LOW_MEMORY_PROFILE, mandatory = false, defaultValue = "false")
+ private Boolean lowMemoryProfile;
- private Boolean createStatisticInfo;
+ /**
+ * This parameter specifies whether a different inference strategy for composed rule elements
+ * should be applied. This option is only necessary when the composed rule element is expected to
+ * match very often, e.g., a rule element like (ANY ANY)+. The default value of this parameter is
+ * set to false.
+ */
+ public static final String PARAM_SIMPLE_GREEDY_FOR_COMPOSED = "simpleGreedyForComposed";
- private Boolean withMatches;
+ @ConfigurationParameter(name = PARAM_SIMPLE_GREEDY_FOR_COMPOSED, mandatory = false, defaultValue = "false")
+ private Boolean simpleGreedyForComposed;
- private String[] resourcePaths;
+ /**
+ * If this parameter is set to true, then additional information about the execution of a rule
+ * script is added to the CAS. The actual information is specified by the following parameters.
+ * The default value of this parameter is set to false.
+ */
+ public static final String PARAM_DEBUG = "debug";
+
+ @ConfigurationParameter(name = PARAM_DEBUG, mandatory = false, defaultValue = "false")
+ private Boolean debug;
+
+ /**
+ * This parameter specificies whether the match information (covered text) of the rules should be
+ * stored in the CAS. The default value of this parameter is set to false.
+ */
+ public static final String PARAM_DEBUG_WITH_MATCHES = "debugWithMatches";
+
+ @ConfigurationParameter(name = PARAM_DEBUG_WITH_MATCHES, mandatory = false, defaultValue = "false")
+ private Boolean debugWithMatches;
+
+ /**
+ * This parameter specifies a list of rule-ids that enumerate the rule for which debug information
+ * should be created. No specific ids are given by default.
+ */
+ public static final String PARAM_DEBUG_ONLY_FOR = "debugOnlyFor";
+
+ @ConfigurationParameter(name = PARAM_DEBUG_ONLY_FOR, mandatory = false, defaultValue = {})
+ private String[] debugOnlyFor;
+
+ /**
+ * If this parameter is set to true, then additional information about the runtime of applied
+ * rules is added to the CAS. The default value of this parameter is set to false.
+ */
+ public static final String PARAM_PROFILE = "profile";
+
+ @ConfigurationParameter(name = PARAM_PROFILE, mandatory = false, defaultValue = "false")
+ private Boolean profile;
+
+ /**
+ * If this parameter is set to true, then additional information about the runtime of UIMA Ruta
+ * language elements like conditions and actions is added to the CAS. The default value of this
+ * parameter is set to false.
+ */
+ public static final String PARAM_STATISTICS = "statistics";
+
+ @ConfigurationParameter(name = PARAM_STATISTICS, mandatory = false, defaultValue = "false")
+ private Boolean statistics;
+
+ /**
+ * If this parameter is set to true, then additional information about what annotation was created
+ * by which rule is added to the CAS. The default value of this parameter is set to false.
+ */
+ public static final String PARAM_CREATED_BY = "createdBy";
- private String scriptEncoding;
+ @ConfigurationParameter(name = PARAM_CREATED_BY, mandatory = false, defaultValue = "false")
+ private Boolean createdBy;
private UimaContext context;
private RutaModule script;
- private String[] additionalScriptLocations;
-
- private String[] additionalEngineLocations;
-
- private String[] additionalUimafitEngines;
-
- private String[] additionalExtensions;
-
- private String[] additionalEngineLoaders;
-
private RutaExternalFactory factory;
private RutaEngineLoader engineLoader;
- private String[] defaultFilteredTypes;
-
private String mainScript;
- private String[] scriptPaths;
-
- private String[] descriptorPaths;
-
private RutaVerbalizer verbalizer;
- private Boolean removeBasics;
-
- private Boolean dynamicAnchoring;
-
- private Boolean reloadScript;
-
- private Boolean lowMemoryProfile;
-
- private Boolean simpleGreedyForComposed;
-
- private Boolean createCreatedByInfo;
-
private boolean initialized = false;
private List<Type> seedTypes;
@@ -194,43 +348,44 @@ public class RutaEngine extends JCasAnno
if (aContext == null && context != null) {
aContext = context;
}
- seeders = (String[]) aContext.getConfigParameterValue(SEEDERS);
- removeBasics = (Boolean) aContext.getConfigParameterValue(REMOVE_BASICS);
- scriptPaths = (String[]) aContext.getConfigParameterValue(SCRIPT_PATHS);
- descriptorPaths = (String[]) aContext.getConfigParameterValue(DESCRIPTOR_PATHS);
- mainScript = (String) aContext.getConfigParameterValue(MAIN_SCRIPT);
- additionalScriptLocations = (String[]) aContext.getConfigParameterValue(ADDITIONAL_SCRIPTS);
- additionalEngineLocations = (String[]) aContext.getConfigParameterValue(ADDITIONAL_ENGINES);
+ seeders = (String[]) aContext.getConfigParameterValue(PARAM_SEEDERS);
+ removeBasics = (Boolean) aContext.getConfigParameterValue(PARAM_REMOVE_BASICS);
+ scriptPaths = (String[]) aContext.getConfigParameterValue(PARAM_SCRIPT_PATHS);
+ descriptorPaths = (String[]) aContext.getConfigParameterValue(PARAM_DESCRIPTOR_PATHS);
+ mainScript = (String) aContext.getConfigParameterValue(PARAM_MAIN_SCRIPT);
+ additionalScripts = (String[]) aContext.getConfigParameterValue(PARAM_ADDITIONAL_SCRIPTS);
+ additionalEngines = (String[]) aContext.getConfigParameterValue(PARAM_ADDITIONAL_ENGINES);
additionalUimafitEngines = (String[]) aContext
- .getConfigParameterValue(ADDITIONAL_UIMAFIT_ENGINES);
- additionalExtensions = (String[]) aContext.getConfigParameterValue(ADDITIONAL_EXTENSIONS);
+ .getConfigParameterValue(PARAM_ADDITIONAL_UIMAFIT_ENGINES);
+ additionalExtensions = (String[]) aContext.getConfigParameterValue(PARAM_ADDITIONAL_EXTENSIONS);
additionalEngineLoaders = (String[]) aContext
- .getConfigParameterValue(ADDITIONAL_ENGINE_LOADERS);
+ .getConfigParameterValue(PARAM_ADDITIONAL_ENGINE_LOADERS);
- createDebugInfo = (Boolean) aContext.getConfigParameterValue(CREATE_DEBUG_INFO);
- createDebugOnlyFor = (String[]) aContext.getConfigParameterValue(CREATE_DEBUG_INFO_ONLY_FOR);
- createProfilingInfo = (Boolean) aContext.getConfigParameterValue(CREATE_PROFILING_INFO);
- createStatisticInfo = (Boolean) aContext.getConfigParameterValue(CREATE_STATISTIC_INFO);
- createCreatedByInfo = (Boolean) aContext.getConfigParameterValue(CREATE_CREATED_BY_INFO);
- withMatches = (Boolean) aContext.getConfigParameterValue(CREATE_MATCH_DEBUG_INFO);
-
- resourcePaths = (String[]) aContext.getConfigParameterValue(RESOURCE_PATHS);
- scriptEncoding = (String) aContext.getConfigParameterValue(SCRIPT_ENCODING);
- defaultFilteredTypes = (String[]) aContext.getConfigParameterValue(DEFAULT_FILTERED_TYPES);
- dynamicAnchoring = (Boolean) aContext.getConfigParameterValue(DYNAMIC_ANCHORING);
- reloadScript = (Boolean) aContext.getConfigParameterValue(RELOAD_SCRIPT);
- lowMemoryProfile = (Boolean) aContext.getConfigParameterValue(LOW_MEMORY_PROFILE);
+ debug = (Boolean) aContext.getConfigParameterValue(PARAM_DEBUG);
+ debugOnlyFor = (String[]) aContext.getConfigParameterValue(PARAM_DEBUG_ONLY_FOR);
+ profile = (Boolean) aContext.getConfigParameterValue(PARAM_PROFILE);
+ statistics = (Boolean) aContext.getConfigParameterValue(PARAM_STATISTICS);
+ createdBy = (Boolean) aContext.getConfigParameterValue(PARAM_CREATED_BY);
+ debugWithMatches = (Boolean) aContext.getConfigParameterValue(PARAM_DEBUG_WITH_MATCHES);
+
+ resourcePaths = (String[]) aContext.getConfigParameterValue(PARAM_RESOURCE_PATHS);
+ scriptEncoding = (String) aContext.getConfigParameterValue(PARAM_SCRIPT_ENCODING);
+ defaultFilteredTypes = (String[]) aContext
+ .getConfigParameterValue(PARAM_DEFAULT_FILTERED_TYPES);
+ dynamicAnchoring = (Boolean) aContext.getConfigParameterValue(PARAM_DYNAMIC_ANCHORING);
+ reloadScript = (Boolean) aContext.getConfigParameterValue(PARAM_RELOAD_SCRIPT);
+ lowMemoryProfile = (Boolean) aContext.getConfigParameterValue(PARAM_LOW_MEMORY_PROFILE);
simpleGreedyForComposed = (Boolean) aContext
- .getConfigParameterValue(SIMPLE_GREEDY_FOR_COMPOSED);
+ .getConfigParameterValue(PARAM_SIMPLE_GREEDY_FOR_COMPOSED);
resourcePaths = resourcePaths == null ? new String[0] : resourcePaths;
removeBasics = removeBasics == null ? false : removeBasics;
- createDebugInfo = createDebugInfo == null ? false : createDebugInfo;
- createDebugOnlyFor = createDebugOnlyFor == null ? new String[0] : createDebugOnlyFor;
- createProfilingInfo = createProfilingInfo == null ? false : createProfilingInfo;
- createStatisticInfo = createStatisticInfo == null ? false : createStatisticInfo;
- createCreatedByInfo = createCreatedByInfo == null ? false : createCreatedByInfo;
- withMatches = withMatches == null ? true : withMatches;
+ debug = debug == null ? false : debug;
+ debugOnlyFor = debugOnlyFor == null ? new String[0] : debugOnlyFor;
+ profile = profile == null ? false : profile;
+ statistics = statistics == null ? false : statistics;
+ createdBy = createdBy == null ? false : createdBy;
+ debugWithMatches = debugWithMatches == null ? true : debugWithMatches;
scriptEncoding = scriptEncoding == null ? "UTF-8" : scriptEncoding;
defaultFilteredTypes = defaultFilteredTypes == null ? new String[0] : defaultFilteredTypes;
@@ -385,17 +540,17 @@ public class RutaEngine extends JCasAnno
private InferenceCrowd initializeCrowd() {
List<RutaInferenceVisitor> visitors = new ArrayList<RutaInferenceVisitor>();
- if (createDebugInfo) {
- visitors.add(new DebugInfoCollectorVisitor(createDebugInfo, withMatches, Arrays
- .asList(createDebugOnlyFor), verbalizer));
+ if (debug) {
+ visitors.add(new DebugInfoCollectorVisitor(debug, debugWithMatches, Arrays
+ .asList(debugOnlyFor), verbalizer));
}
- if (createProfilingInfo) {
+ if (profile) {
visitors.add(new TimeProfilerVisitor());
}
- if (createStatisticInfo) {
+ if (statistics) {
visitors.add(new StatisticsVisitor(verbalizer));
}
- if (createCreatedByInfo) {
+ if (createdBy) {
visitors.add(new CreatedByVisitor(verbalizer));
}
return new InferenceCrowd(visitors);
@@ -474,8 +629,8 @@ public class RutaEngine extends JCasAnno
}
}
- Map<String, RutaModule> additionalScripts = new HashMap<String, RutaModule>();
- Map<String, AnalysisEngine> additionalEngines = new HashMap<String, AnalysisEngine>();
+ Map<String, RutaModule> additionalScriptsMap = new HashMap<String, RutaModule>();
+ Map<String, AnalysisEngine> additionalEnginesMap = new HashMap<String, AnalysisEngine>();
if (additionalUimafitEngines != null) {
for (String eachUimafitEngine : additionalUimafitEngines) {
@@ -492,19 +647,19 @@ public class RutaEngine extends JCasAnno
throw new AnalysisEngineProcessException(e);
}
try {
- additionalEngines.put(eachUimafitEngine, eachEngine);
+ additionalEnginesMap.put(eachUimafitEngine, eachEngine);
String[] eachEngineLocationPartArray = eachUimafitEngine.split("\\.");
if (eachEngineLocationPartArray.length > 1) {
String shortEachEngineLocation = eachEngineLocationPartArray[eachEngineLocationPartArray.length - 1];
- additionalEngines.put(shortEachEngineLocation, eachEngine);
+ additionalEnginesMap.put(shortEachEngineLocation, eachEngine);
}
} catch (Exception e) {
throw new AnalysisEngineProcessException(e);
}
}
}
- if (additionalEngineLocations != null) {
- for (String eachEngineLocation : additionalEngineLocations) {
+ if (additionalEngines != null) {
+ for (String eachEngineLocation : additionalEngines) {
AnalysisEngine eachEngine;
String location = locate(eachEngineLocation, descriptorPaths, ".xml");
if (location == null) {
@@ -542,11 +697,11 @@ public class RutaEngine extends JCasAnno
}
}
try {
- additionalEngines.put(eachEngineLocation, eachEngine);
+ additionalEnginesMap.put(eachEngineLocation, eachEngine);
String[] eachEngineLocationPartArray = eachEngineLocation.split("\\.");
if (eachEngineLocationPartArray.length > 1) {
String shortEachEngineLocation = eachEngineLocationPartArray[eachEngineLocationPartArray.length - 1];
- additionalEngines.put(shortEachEngineLocation, eachEngine);
+ additionalEnginesMap.put(shortEachEngineLocation, eachEngine);
}
} catch (Exception e) {
throw new AnalysisEngineProcessException(e);
@@ -554,21 +709,21 @@ public class RutaEngine extends JCasAnno
}
}
- if (additionalScriptLocations != null) {
- for (String add : additionalScriptLocations) {
- recursiveLoadScript(add, additionalScripts, additionalEngines, viewName);
+ if (additionalScripts != null) {
+ for (String add : additionalScripts) {
+ recursiveLoadScript(add, additionalScriptsMap, additionalEnginesMap, viewName);
}
}
- for (RutaModule each : additionalScripts.values()) {
- each.setScriptDependencies(additionalScripts);
+ for (RutaModule each : additionalScriptsMap.values()) {
+ each.setScriptDependencies(additionalScriptsMap);
}
- script.setScriptDependencies(additionalScripts);
+ script.setScriptDependencies(additionalScriptsMap);
- for (RutaModule each : additionalScripts.values()) {
- each.setEngineDependencies(additionalEngines);
+ for (RutaModule each : additionalScriptsMap.values()) {
+ each.setEngineDependencies(additionalEnginesMap);
}
- script.setEngineDependencies(additionalEngines);
+ script.setEngineDependencies(additionalEnginesMap);
}
public static void addSourceDocumentInformation(CAS cas, File each) {
@@ -712,7 +867,7 @@ public class RutaEngine extends JCasAnno
parser.setResourcePaths(resourcePaths);
String name = scriptFile.getName();
int lastIndexOf = name.lastIndexOf(SCRIPT_FILE_EXTENSION);
- if(lastIndexOf != -1) {
+ if (lastIndexOf != -1) {
name = name.substring(0, lastIndexOf);
}
RutaModule script = parser.file_input(name);
@@ -728,12 +883,12 @@ public class RutaEngine extends JCasAnno
parser.setExternalFactory(factory);
parser.setResourcePaths(resourcePaths);
String name = scriptLocation;
- if(scriptLocation.indexOf("/") != -1) {
+ if (scriptLocation.indexOf("/") != -1) {
String[] split = scriptLocation.split("[/]");
- name = split[split.length-1];
+ name = split[split.length - 1];
}
int lastIndexOf = name.lastIndexOf(SCRIPT_FILE_EXTENSION);
- if(lastIndexOf != -1) {
+ if (lastIndexOf != -1) {
name = name.substring(0, lastIndexOf);
}
RutaModule script = parser.file_input(name);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaModifier.java Wed Sep 4 18:04:18 2013
@@ -65,7 +65,7 @@ public class RutaModifier extends JCasAn
public void initialize(UimaContext aContext) throws ResourceInitializationException {
super.initialize(aContext);
styleMapLocation = (String) aContext.getConfigParameterValue(StyleMapCreator.STYLE_MAP);
- descriptorPaths = (String[]) aContext.getConfigParameterValue(RutaEngine.DESCRIPTOR_PATHS);
+ descriptorPaths = (String[]) aContext.getConfigParameterValue(RutaEngine.PARAM_DESCRIPTOR_PATHS);
outputLocation = (String) aContext.getConfigParameterValue(RutaModifier.OUTPUT_LOCATION);
styleMapFactory = new StyleMapFactory();
modifiedViewName = (String) aContext.getConfigParameterValue(RutaModifier.OUTPUT_VIEW);
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/StyleMapCreator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/StyleMapCreator.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/StyleMapCreator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/StyleMapCreator.java Wed Sep 4 18:04:18 2013
@@ -46,7 +46,7 @@ public class StyleMapCreator extends JCa
aContext = context;
}
styleMapLocation = (String) aContext.getConfigParameterValue(STYLE_MAP);
- descriptorPaths = (String[]) aContext.getConfigParameterValue(RutaEngine.DESCRIPTOR_PATHS);
+ descriptorPaths = (String[]) aContext.getConfigParameterValue(RutaEngine.PARAM_DESCRIPTOR_PATHS);
styleMapFactory = new StyleMapFactory();
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/FeatureExpression.java Wed Sep 4 18:04:18 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.uima.ruta.expression.feature;
import java.util.Collection;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/ResourcePathResourceLoader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/ResourcePathResourceLoader.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/ResourcePathResourceLoader.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/ResourcePathResourceLoader.java Wed Sep 4 18:04:18 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.uima.ruta.resource;
import java.io.File;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaResourceLoader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaResourceLoader.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaResourceLoader.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/RutaResourceLoader.java Wed Sep 4 18:04:18 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.uima.ruta.resource;
import org.springframework.core.io.DefaultResourceLoader;
Added: uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/typepriorities.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/typepriorities.txt?rev=1520086&view=auto
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/typepriorities.txt (added)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/typepriorities.txt Wed Sep 4 18:04:18 2013
@@ -0,0 +1 @@
+classpath*:org/apache/uima/ruta/engine/TypePriorities.xml
\ No newline at end of file
Added: uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt?rev=1520086&view=auto
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt (added)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt Wed Sep 4 18:04:18 2013
@@ -0,0 +1,4 @@
+classpath*:org/apache/uima/ruta/engine/BasicTypeSystem.xml
+classpath*:org/apache/uima/ruta/engine/InternalTypeSystem.xml
+classpath*:org/apache/uima/ruta/engine/HtmlTypeSystem.xml
+classpath*:org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
\ No newline at end of file
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml Wed Sep 4 18:04:18 2013
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
<primitive>true</primitive>
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java Wed Sep 4 18:04:18 2013
@@ -56,7 +56,7 @@ public class CustomViewTest {
private AnalysisEngine createAE(String script) throws ResourceInitializationException, IOException, InvalidXMLException {
final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription(
"org.apache.uima.ruta.engine.BasicEngine",
- RutaEngine.MAIN_SCRIPT, script);
+ RutaEngine.PARAM_MAIN_SCRIPT, script);
ruta.getAnalysisEngineMetaData()
.getTypeSystem()
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java Wed Sep 4 18:04:18 2013
@@ -76,15 +76,15 @@ public class IncompletePartitioningTest
aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { ruleFile
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { ruleFile
.getParentFile().getPath() });
String name = ruleFile.getName();
if (name.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
name = name.substring(0, name.length() - 5);
}
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
- ae.setConfigParameterValue(RutaEngine.SEEDERS, new String[0]);
- ae.setConfigParameterValue(RutaEngine.DEFAULT_FILTERED_TYPES, new String[0]);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_SEEDERS, new String[0]);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEFAULT_FILTERED_TYPES, new String[0]);
ae.reconfigure();
CAS cas = ae.newCAS();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java Wed Sep 4 18:04:18 2013
@@ -42,7 +42,7 @@ public class LoadScriptFromClassPathTest
script += "Document{-> CALL(RuleInferenceTest)};\n";
Map<String, Object> parameters = new HashMap<String, Object>();
- parameters.put(RutaEngine.ADDITIONAL_SCRIPTS,
+ parameters.put(RutaEngine.PARAM_ADDITIONAL_SCRIPTS,
new String[] { "org.apache.uima.ruta.RuleInferenceTest" });
CAS cas = null;
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RutaTestUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RutaTestUtils.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RutaTestUtils.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RutaTestUtils.java Wed Sep 4 18:04:18 2013
@@ -107,8 +107,8 @@ public class RutaTestUtils {
InvalidXMLException, ResourceInitializationException, AnalysisEngineProcessException,
ResourceConfigurationException {
final HashMap parameters = new HashMap();
- parameters.put(RutaEngine.DYNAMIC_ANCHORING, dynamicAnchoring);
- parameters.put(RutaEngine.SIMPLE_GREEDY_FOR_COMPOSED, simpleGreedyForComposed);
+ parameters.put(RutaEngine.PARAM_DYNAMIC_ANCHORING, dynamicAnchoring);
+ parameters.put(RutaEngine.PARAM_SIMPLE_GREEDY_FOR_COMPOSED, simpleGreedyForComposed);
return process(ruleFileName, textFileName, parameters, amount, complexTypes, features, resourceDirName, cas);
}
@@ -162,7 +162,7 @@ public class RutaTestUtils {
aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[]{ruleFile.getParentFile()
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[]{ruleFile.getParentFile()
.getPath()});
String name = ruleFile.getName();
if (name.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
@@ -173,10 +173,10 @@ public class RutaTestUtils {
ae.setConfigParameterValue(parameter.getKey(), parameter.getValue());
}
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
if (resourceFile != null) {
- ae.setConfigParameterValue(RutaEngine.RESOURCE_PATHS, new String[]{resourceFile.getPath()});
+ ae.setConfigParameterValue(RutaEngine.PARAM_RESOURCE_PATHS, new String[]{resourceFile.getPath()});
}
ae.reconfigure();
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ShiftWithLowMemoryProfileTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ShiftWithLowMemoryProfileTest.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ShiftWithLowMemoryProfileTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ShiftWithLowMemoryProfileTest.java Wed Sep 4 18:04:18 2013
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.uima.ruta;
import java.io.IOException;
@@ -31,7 +50,7 @@ public class ShiftWithLowMemoryProfileTe
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
Map<String, Object> parameters = new HashMap<String, Object>();
- parameters.put(RutaEngine.LOW_MEMORY_PROFILE, true);
+ parameters.put(RutaEngine.PARAM_LOW_MEMORY_PROFILE, true);
CAS cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION,
namespace + "/" + name + ".txt", parameters, 50);
Added: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java?rev=1520086&view=auto
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java (added)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java Wed Sep 4 18:04:18 2013
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.ruta.engine;
+
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
+
+import java.io.File;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.fit.component.CasDumpWriter;
+import org.apache.uima.fit.factory.JCasBuilder;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.ruta.type.TruePositive;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UimafitTest {
+ @Test
+ public void test() throws Exception {
+ AnalysisEngine tm = createEngine(RutaEngine.class,
+ // Load script in "Java" notation, with "." as package separator and no extension.
+ // File needs to be located in the path specified below with ending ".ruta".
+ RutaEngine.PARAM_MAIN_SCRIPT, "org.apache.uima.ruta.engine.UimafitTest",
+ // Path(s) where the scripts are located
+ RutaEngine.PARAM_SCRIPT_PATHS, new String[] { "src/test/resources" });
+
+ // Create a CAS from the AE so it has the required type priorities
+ JCas jcas = tm.newJCas();
+
+ // Fill the CAS with some tokens
+ JCasBuilder builder = new JCasBuilder(jcas);
+ builder.add("This", TruePositive.class);
+ builder.add(" ");
+ builder.add("is", TruePositive.class);
+ builder.add(" ");
+ builder.add("a", TruePositive.class);
+ builder.add(" ");
+ builder.add("test", TruePositive.class);
+ builder.add(".", TruePositive.class);
+ builder.close();
+
+ // Apply the script
+ tm.process(jcas);
+
+ AnalysisEngine dumper = createEngine(CasDumpWriter.class, CasDumpWriter.PARAM_OUTPUT_FILE,
+ "target/test-output/casdump.txt");
+ dumper.process(jcas);
+
+ String expected = FileUtils.readFileToString(new File(
+ "src/test/resources/org/apache/uima/ruta/engine/casdump.txt"), "UTF-8");
+ String actual = FileUtils.readFileToString(new File("target/test-output/casdump.txt"), "UTF-8");
+ Assert.assertEquals(expected.trim(), actual.trim());
+ }
+}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java Wed Sep 4 18:04:18 2013
@@ -137,12 +137,12 @@ public class ViewWriterTest {
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
String module = scriptFile.getName().substring(0, scriptFile.getName().length() - 5);
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, module);
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, module);
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { scriptFile.getParentFile()
.getAbsolutePath() });
String aeName = descFile.getName().substring(0, descFile.getName().length() - 4);
- ae.setConfigParameterValue(RutaEngine.ADDITIONAL_ENGINES, new String[] { aeName });
- ae.setConfigParameterValue(RutaEngine.DESCRIPTOR_PATHS, new String[] { descFile.getParentFile()
+ ae.setConfigParameterValue(RutaEngine.PARAM_ADDITIONAL_ENGINES, new String[] { aeName });
+ ae.setConfigParameterValue(RutaEngine.PARAM_DESCRIPTOR_PATHS, new String[] { descFile.getParentFile()
.getAbsolutePath() });
ae.reconfigure();
Added: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/UimafitTest.ruta
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/UimafitTest.ruta?rev=1520086&view=auto
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/UimafitTest.ruta (added)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/UimafitTest.ruta Wed Sep 4 18:04:18 2013
@@ -0,0 +1 @@
+TruePositive+{-PARTOF(FalsePositive) -> MARK(FalsePositive)};
\ No newline at end of file
Added: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/casdump.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/casdump.txt?rev=1520086&view=auto
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/casdump.txt (added)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/casdump.txt Wed Sep 4 18:04:18 2013
@@ -0,0 +1,51 @@
+======== CAS 0 begin ==================================
+
+-------- View _InitialView begin ----------------------------------
+
+DocumentAnnotation
+ sofa: _InitialView
+ begin: 0
+ end: 15
+ language: "x-unspecified"
+
+CAS-Text:
+This is a test.
+[This is a test.]
+FalsePositive
+ sofa: _InitialView
+ begin: 0
+ end: 15
+ original: <null>
+[This]
+TruePositive
+ sofa: _InitialView
+ begin: 0
+ end: 4
+ original: <null>
+[is]
+TruePositive
+ sofa: _InitialView
+ begin: 5
+ end: 7
+ original: <null>
+[a]
+TruePositive
+ sofa: _InitialView
+ begin: 8
+ end: 9
+ original: <null>
+[test]
+TruePositive
+ sofa: _InitialView
+ begin: 10
+ end: 14
+ original: <null>
+[.]
+TruePositive
+ sofa: _InitialView
+ begin: 14
+ end: 15
+ original: <null>
+-------- View _InitialView end ----------------------------------
+
+======== CAS 0 end ==================================
Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Wed Sep 4 18:04:18 2013
@@ -759,19 +759,19 @@ ae.process(cas);]]></programlisting>
</row>
<row>
<entry>
- <link linkend='ugr.tools.ruta.ae.basic.parameter.additionalEngineLoaders'>additionalEngineLoaders</link>
+ <link linkend='ugr.tools.ruta.ae.basic.parameter.additionalUimafitEngines'>additionalUimafitEngines</link>
</entry>
- <entry>List of class names of implementations that are able to perform additional
- task when loading external analysis engines.
+ <entry>List of class names with complete namespace of additional uimaFIT analysis engines, which
+ can be called by UIMA Ruta rules.
</entry>
<entry>Multi String</entry>
</row>
<row>
<entry>
- <link linkend='ugr.tools.ruta.ae.basic.parameter.additionalUimafitEngines'>additionalUimafitEngines</link>
+ <link linkend='ugr.tools.ruta.ae.basic.parameter.additionalEngineLoaders'>additionalEngineLoaders</link>
</entry>
- <entry>List of class names with complete namespace of additional analysis engines, which can be
- referred to.
+ <entry>List of class names of implementations that are able to perform additional
+ task when loading external analysis engines.
</entry>
<entry>Multi String</entry>
</row>
@@ -1007,7 +1007,7 @@ ae.process(cas);]]></programlisting>
<title>removeBasics</title>
<para>
This parameter specifies whether the inference annotations created by the analysis engine should be removed after processing the CAS.
- The default value is set to false.
+ The default value is set to true.
</para>
</section>
<section id="ugr.tools.ruta.ae.basic.parameter.dynamicAnchoring">
@@ -1030,7 +1030,7 @@ ae.process(cas);]]></programlisting>
<title>simpleGreedyForComposed</title>
<para>
This parameter specifies whether a different inference strategy for composed rule elements should be applied. This option is only necessary
- when the composed rule element is expected to match very often, e.g., a rule element like (ANY ANY).
+ when the composed rule element is expected to match very often, e.g., a rule element like (ANY ANY)+.
The default value of this parameter is set to false.
</para>
</section>
@@ -1045,7 +1045,7 @@ ae.process(cas);]]></programlisting>
<section id="ugr.tools.ruta.ae.basic.parameter.debugWithMatches">
<title>debugWithMatches</title>
<para>
- This parameter specificies whether the match information (covered text) of the rules should be stored in the CAS.
+ This parameter specifies whether the match information (covered text) of the rules should be stored in the CAS.
The default value of this parameter is set to false.
</para>
</section>
@@ -1421,7 +1421,7 @@ The|DT rabbit|NN made|VBD up|RB this|DT
<para>The POS tagger is being developed as a Maven-based project.
Since Ruta maven artifacts are available on Maven Central, we
add the following dependency to the project's pom.xml. The functionalities described in this section
- require a version of Ruta equal to or greater than 2.0.2.</para>
+ require a version of Ruta equal to or greater than 2.1.0.</para>
<programlisting><dependency>
<groupId>org.apache.uima</groupId>
<artifactId>ruta-core</artifactId>
Modified: uima/sandbox/ruta/trunk/ruta-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-eclipse-update-site/pom.xml?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-eclipse-update-site/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-eclipse-update-site/pom.xml Wed Sep 4 18:04:18 2013
@@ -55,6 +55,24 @@
<item-eclipse-release-version>2.1.0.SNAPSHOT</item-eclipse-release-version>
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>marker-file-identifying-eclipse-update-site</exclude> <!-- marker file -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/pom.xml?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/pom.xml Wed Sep 4 18:04:18 2013
@@ -58,11 +58,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>ruta-core</artifactId>
<version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-ep-engine</artifactId>
- <version>${project.parent.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaGEConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaGEConstraint.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaGEConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaGEConstraint.java Wed Sep 4 18:04:18 2013
@@ -102,14 +102,14 @@ public class RutaGEConstraint implements
FileUtils.saveString2File(sb.toString(), tempFile, "UTF-8");
String portableString = Path.fromOSString(tempFile.getParentFile().getPath())
.toPortableString();
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { portableString });
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { portableString });
String name = tempFile.getName().substring(0, tempFile.getName().length() - 5);
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
- ae.setConfigParameterValue(RutaEngine.CREATE_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_MATCH_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_PROFILING_INFO, false);
- ae.setConfigParameterValue(RutaEngine.CREATE_STATISTIC_INFO, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG_WITH_MATCHES, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_PROFILE, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_STATISTICS, false);
ae.reconfigure();
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/RutaRuleListConstraint.java Wed Sep 4 18:04:18 2013
@@ -108,14 +108,14 @@ public class RutaRuleListConstraint impl
FileUtils.saveString2File(script, tempFile, "UTF-8");
String portableString = Path.fromOSString(tempFile.getParentFile().getPath())
.toPortableString();
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { portableString });
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { portableString });
String name = tempFile.getName().substring(0, tempFile.getName().length() - 5);
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
- ae.setConfigParameterValue(RutaEngine.CREATE_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_MATCH_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_PROFILING_INFO, false);
- ae.setConfigParameterValue(RutaEngine.CREATE_STATISTIC_INFO, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG_WITH_MATCHES, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_PROFILE, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_STATISTICS, false);
ae.reconfigure();
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/SimpleRutaRuleConstraint.java Wed Sep 4 18:04:18 2013
@@ -109,14 +109,14 @@ public class SimpleRutaRuleConstraint im
FileUtils.saveString2File(script, tempFile, "UTF-8");
String portableString = Path.fromOSString(tempFile.getParentFile().getPath())
.toPortableString();
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { portableString });
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { portableString });
String name = tempFile.getName().substring(0, tempFile.getName().length() - 5);
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
- ae.setConfigParameterValue(RutaEngine.CREATE_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_MATCH_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_PROFILING_INFO, false);
- ae.setConfigParameterValue(RutaEngine.CREATE_STATISTIC_INFO, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG_WITH_MATCHES, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_PROFILE, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_STATISTICS, false);
ae.reconfigure();
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java Wed Sep 4 18:04:18 2013
@@ -189,14 +189,14 @@ public class QueryActionHandler implemen
FileUtils.saveString2File(script, tempFile, "UTF-8");
String portableString = Path.fromOSString(tempFile.getParentFile().getPath())
.toPortableString();
- ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { portableString });
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { portableString });
String name = tempFile.getName().substring(0, tempFile.getName().length() - 5);
- ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+ ae.setConfigParameterValue(RutaEngine.PARAM_MAIN_SCRIPT, name);
- ae.setConfigParameterValue(RutaEngine.CREATE_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_MATCH_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_PROFILING_INFO, false);
- ae.setConfigParameterValue(RutaEngine.CREATE_STATISTIC_INFO, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG_WITH_MATCHES, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_PROFILE, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_STATISTICS, false);
IRutaConditionExtension[] conditionExtensions = RutaExtensionManager.getDefault()
@@ -232,7 +232,7 @@ public class QueryActionHandler implemen
for (IRutaTypeFunctionExtension each : typeFunctionExtensions) {
languageExtensions.add(each.getClass().getName());
}
- ae.setConfigParameterValue(RutaEngine.ADDITIONAL_EXTENSIONS,
+ ae.setConfigParameterValue(RutaEngine.PARAM_ADDITIONAL_EXTENSIONS,
languageExtensions.toArray(new String[0]));
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptKeepBasicsJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptKeepBasicsJob.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptKeepBasicsJob.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptKeepBasicsJob.java Wed Sep 4 18:04:18 2013
@@ -33,7 +33,7 @@ public class ApplyScriptKeepBasicsJob ex
@Override
void initAE(AnalysisEngine ae) {
- ae.setConfigParameterValue(RutaEngine.REMOVE_BASICS, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_REMOVE_BASICS, false);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptNoXMIJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptNoXMIJob.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptNoXMIJob.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptNoXMIJob.java Wed Sep 4 18:04:18 2013
@@ -33,7 +33,7 @@ public class ApplyScriptNoXMIJob extends
@Override
void initAE(AnalysisEngine ae) {
- ae.setConfigParameterValue(RutaEngine.REMOVE_BASICS, false);
+ ae.setConfigParameterValue(RutaEngine.PARAM_REMOVE_BASICS, false);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptRemoveBasicsJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptRemoveBasicsJob.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptRemoveBasicsJob.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/utils/apply/ApplyScriptRemoveBasicsJob.java Wed Sep 4 18:04:18 2013
@@ -33,7 +33,7 @@ public class ApplyScriptRemoveBasicsJob
@Override
void initAE(AnalysisEngine ae) {
- ae.setConfigParameterValue(RutaEngine.REMOVE_BASICS, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_REMOVE_BASICS, true);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaInterpreterRunner.java Wed Sep 4 18:04:18 2013
@@ -235,11 +235,11 @@ public class RutaInterpreterRunner exten
try {
if ("debug".equals(launchMode)) {
- ae.setConfigParameterValue(RutaEngine.CREATE_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_MATCH_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_PROFILING_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_STATISTIC_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_CREATED_BY_INFO, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG_WITH_MATCHES, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_PROFILE, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_STATISTICS, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_CREATED_BY, true);
ae.reconfigure();
}
} catch (Exception e) {
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java Wed Sep 4 18:04:18 2013
@@ -171,11 +171,11 @@ public class RutaLauncher {
private static void configure(AnalysisEngine ae) throws ResourceConfigurationException {
if ("debug".equals(launchMode)) {
- ae.setConfigParameterValue(RutaEngine.CREATE_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_MATCH_DEBUG_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_PROFILING_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_STATISTIC_INFO, true);
- ae.setConfigParameterValue(RutaEngine.CREATE_CREATED_BY_INFO, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_DEBUG_WITH_MATCHES, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_PROFILE, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_STATISTICS, true);
+ ae.setConfigParameterValue(RutaEngine.PARAM_CREATED_BY, true);
}
ae.reconfigure();
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java?rev=1520086&r1=1520085&r2=1520086&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/RutaCheckerUtils.java Wed Sep 4 18:04:18 2013
@@ -250,7 +250,7 @@ public class RutaCheckerUtils {
ConfigurationParameterSettings configurationParameterSettings = aed.getAnalysisEngineMetaData()
.getConfigurationParameterSettings();
String[] paths = (String[]) configurationParameterSettings
- .getParameterValue(RutaEngine.RESOURCE_PATHS);
+ .getParameterValue(RutaEngine.PARAM_RESOURCE_PATHS);
if (paths == null) {
IFolder folder = project.getProject().getFolder(
RutaProjectUtils.getDefaultResourcesLocation());