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/02 19:12:24 UTC
svn commit: r1519479 - in /uima/sandbox/ruta/trunk:
example-projects/ruta-ep-example-extensions/
example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/
ruta-core/ ruta-core/src/main/java/org/apache/uima/ruta/...
Author: pkluegl
Date: Mon Sep 2 17:12:23 2013
New Revision: 1519479
URL: http://svn.apache.org/r1519479
Log:
UIMA-2992
- do not use antlr, but antlr-runtime -> replaced exceptions by own one
- adapted engine bundle
- updated parent
Added:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaParseException.java
Modified:
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionExtension.java
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionExtension.java
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionExtension.java
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionExtension.java
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionExtension.java
uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/pom.xml
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java
uima/sandbox/ruta/trunk/ruta-ep-engine/pom.xml
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/pom.xml
uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java
uima/sandbox/ruta/trunk/ruta-parent/pom.xml
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml Mon Sep 2 17:12:23 2013
@@ -54,11 +54,10 @@
<version>[3.0.1,5.0.0)</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>3.1.3</version>
- <scope>compile</scope>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionExtension.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleActionExtension.java Mon Sep 2 17:12:23 2013
@@ -27,10 +27,9 @@ import org.apache.uima.ruta.action.Abstr
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.number.NumberExpression;
import org.apache.uima.ruta.extensions.IRutaActionExtension;
+import org.apache.uima.ruta.extensions.RutaParseException;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-import antlr.ANTLRException;
-
public class ExampleActionExtension implements IRutaActionExtension {
private final String[] knownExtensions = new String[] { "ExampleAction" };
@@ -48,14 +47,14 @@ public class ExampleActionExtension impl
}
public AbstractRutaAction createAction(String name, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
List<NumberExpression> arguments = new ArrayList<NumberExpression>();
if (args != null) {
for (RutaExpression each : args) {
if (each instanceof NumberExpression) {
arguments.add((NumberExpression) each);
} else {
- throw new ANTLRException("ExampleAction accepts only NumberExpressions as arguments");
+ throw new RutaParseException("ExampleAction accepts only NumberExpressions as arguments");
}
}
}
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleBooleanFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -25,10 +25,9 @@ import org.apache.uima.ruta.RutaElement;
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.extensions.IRutaBooleanFunctionExtension;
+import org.apache.uima.ruta.extensions.RutaParseException;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-import antlr.ANTLRException;
-
public class ExampleBooleanFunctionExtension implements IRutaBooleanFunctionExtension {
private final String[] knownExtensions = new String[] { "ExampleBooleanFunction" };
@@ -45,9 +44,9 @@ public class ExampleBooleanFunctionExten
}
public ExampleBooleanFunction createBooleanFunction(String name, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
if (args == null || args.size() != 1 || !(args.get(0) instanceof TypeExpression)) {
- throw new ANTLRException(
+ throw new RutaParseException(
"ExampleBooleanFunction accepts only one TypeExpression as argument!");
}
return new ExampleBooleanFunction((TypeExpression) args.get(0));
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionExtension.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleConditionExtension.java Mon Sep 2 17:12:23 2013
@@ -26,10 +26,9 @@ import org.apache.uima.ruta.condition.Ab
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.string.StringExpression;
import org.apache.uima.ruta.extensions.IRutaConditionExtension;
+import org.apache.uima.ruta.extensions.RutaParseException;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-import antlr.ANTLRException;
-
public class ExampleConditionExtension implements IRutaConditionExtension {
private final String[] knownExtensions = new String[] { "ExampleCondition" };
@@ -47,14 +46,14 @@ public class ExampleConditionExtension i
}
public AbstractRutaCondition createCondition(String name, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
if (args != null && args.size() == 2) {
if (!(args.get(0) instanceof StringExpression)) {
}
if (!(args.get(1) instanceof StringExpression)) {
}
} else {
- throw new ANTLRException(
+ throw new RutaParseException(
"ExampleCondition accepts exactly two StringExpressions as arguments");
}
return new ExampleCondition((StringExpression) args.get(0), (StringExpression) args.get(1));
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleNumberFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -26,10 +26,9 @@ import org.apache.uima.ruta.expression.R
import org.apache.uima.ruta.expression.number.NumberFunctionExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.extensions.IRutaNumberFunctionExtension;
+import org.apache.uima.ruta.extensions.RutaParseException;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-import antlr.ANTLRException;
-
public class ExampleNumberFunctionExtension implements IRutaNumberFunctionExtension {
private final String[] knownExtensions = new String[] { "ExampleNumberFunction" };
@@ -46,9 +45,9 @@ public class ExampleNumberFunctionExtens
}
public NumberFunctionExpression createNumberFunction(String name, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
if (args == null || args.size() != 1 || !(args.get(0) instanceof TypeExpression)) {
- throw new ANTLRException("ExampleNumberFunction accepts only one TypeExpression as argument!");
+ throw new RutaParseException("ExampleNumberFunction accepts only one TypeExpression as argument!");
}
return new ExampleNumberFunction((TypeExpression) args.get(0));
}
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleStringFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -25,10 +25,9 @@ import org.apache.uima.ruta.RutaElement;
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
import org.apache.uima.ruta.extensions.IRutaStringFunctionExtension;
+import org.apache.uima.ruta.extensions.RutaParseException;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-import antlr.ANTLRException;
-
public class ExampleStringFunctionExtension implements IRutaStringFunctionExtension {
private final String[] knownExtensions = new String[] { "ExampleStringFunction" };
@@ -45,9 +44,9 @@ public class ExampleStringFunctionExtens
}
public ExampleStringFunction createStringFunction(String name, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
if (args == null || args.size() != 1 || !(args.get(0) instanceof TypeExpression)) {
- throw new ANTLRException("ExampleStringFunction accepts only one TypeExpression as argument!");
+ throw new RutaParseException("ExampleStringFunction accepts only one TypeExpression as argument!");
}
return new ExampleStringFunction((TypeExpression) args.get(0));
}
Modified: uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/ExampleTypeFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -26,10 +26,9 @@ import org.apache.uima.ruta.expression.R
import org.apache.uima.ruta.expression.string.StringExpression;
import org.apache.uima.ruta.expression.type.TypeFunctionExpression;
import org.apache.uima.ruta.extensions.IRutaTypeFunctionExtension;
+import org.apache.uima.ruta.extensions.RutaParseException;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
-import antlr.ANTLRException;
-
public class ExampleTypeFunctionExtension implements IRutaTypeFunctionExtension {
private final String[] knownExtensions = new String[] { "ExampleTypeFunction" };
@@ -46,9 +45,9 @@ public class ExampleTypeFunctionExtensio
}
public TypeFunctionExpression createTypeFunction(String name, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
if (args == null || args.size() != 1 || !(args.get(0) instanceof StringExpression)) {
- throw new ANTLRException("ExampleTypeFunction accepts only one StringExpression as argument!");
+ throw new RutaParseException("ExampleTypeFunction accepts only one StringExpression as argument!");
}
return new ExampleTypeFunction((StringExpression) args.get(0));
}
Modified: uima/sandbox/ruta/trunk/ruta-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/pom.xml?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-core/pom.xml Mon Sep 2 17:12:23 2013
@@ -41,11 +41,10 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>3.1.3</version>
- <scope>compile</scope>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>org.htmlparser</groupId>
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaActionExtension.java Mon Sep 2 17:12:23 2013
@@ -24,10 +24,8 @@ import java.util.List;
import org.apache.uima.ruta.action.AbstractRutaAction;
import org.apache.uima.ruta.expression.RutaExpression;
-import antlr.ANTLRException;
-
public interface IRutaActionExtension extends IRutaExtension {
- AbstractRutaAction createAction(String name, List<RutaExpression> args) throws ANTLRException;
+ AbstractRutaAction createAction(String name, List<RutaExpression> args) throws RutaParseException;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaBooleanFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -24,11 +24,9 @@ import java.util.List;
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.bool.BooleanFunctionExpression;
-import antlr.ANTLRException;
-
public interface IRutaBooleanFunctionExtension extends IRutaExtension {
BooleanFunctionExpression createBooleanFunction(String name, List<RutaExpression> args)
- throws ANTLRException;
+ throws RutaParseException;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaConditionExtension.java Mon Sep 2 17:12:23 2013
@@ -24,11 +24,9 @@ import java.util.List;
import org.apache.uima.ruta.condition.AbstractRutaCondition;
import org.apache.uima.ruta.expression.RutaExpression;
-import antlr.ANTLRException;
-
public interface IRutaConditionExtension extends IRutaExtension {
AbstractRutaCondition createCondition(String name, List<RutaExpression> args)
- throws ANTLRException;
+ throws RutaParseException;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaNumberFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -24,11 +24,9 @@ import java.util.List;
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.number.NumberFunctionExpression;
-import antlr.ANTLRException;
-
public interface IRutaNumberFunctionExtension extends IRutaExtension {
NumberFunctionExpression createNumberFunction(String name, List<RutaExpression> args)
- throws ANTLRException;
+ throws RutaParseException;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaStringFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -24,11 +24,9 @@ import java.util.List;
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.string.StringFunctionExpression;
-import antlr.ANTLRException;
-
public interface IRutaStringFunctionExtension extends IRutaExtension {
StringFunctionExpression createStringFunction(String name, List<RutaExpression> args)
- throws ANTLRException;
+ throws RutaParseException;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/IRutaTypeFunctionExtension.java Mon Sep 2 17:12:23 2013
@@ -24,11 +24,9 @@ import java.util.List;
import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.type.TypeFunctionExpression;
-import antlr.ANTLRException;
-
public interface IRutaTypeFunctionExtension extends IRutaExtension {
TypeFunctionExpression createTypeFunction(String name, List<RutaExpression> args)
- throws ANTLRException;
+ throws RutaParseException;
}
Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaExternalFactory.java Mon Sep 2 17:12:23 2013
@@ -32,8 +32,6 @@ import org.apache.uima.ruta.expression.n
import org.apache.uima.ruta.expression.string.StringExpression;
import org.apache.uima.ruta.expression.type.TypeExpression;
-import antlr.ANTLRException;
-
public class RutaExternalFactory {
private Map<String, IRutaConditionExtension> conditionExtensions;
@@ -59,7 +57,7 @@ public class RutaExternalFactory {
}
public AbstractRutaCondition createExternalCondition(Token id, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
String name = id.getText();
IRutaConditionExtension extension = conditionExtensions.get(name);
if (extension != null) {
@@ -70,7 +68,7 @@ public class RutaExternalFactory {
}
public AbstractRutaAction createExternalAction(Token id, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
String name = id.getText();
IRutaActionExtension extension = actionExtensions.get(name);
if (extension != null) {
@@ -81,7 +79,7 @@ public class RutaExternalFactory {
}
public TypeExpression createExternalTypeFunction(Token id, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
String name = id.getText();
IRutaTypeFunctionExtension extension = typeFunctionExtensions.get(name);
if (extension != null) {
@@ -92,7 +90,7 @@ public class RutaExternalFactory {
}
public BooleanExpression createExternalBooleanFunction(Token id, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
String name = id.getText();
IRutaBooleanFunctionExtension extension = booleanFunctionExtensions.get(name);
if (extension != null) {
@@ -103,7 +101,7 @@ public class RutaExternalFactory {
}
public StringExpression createExternalStringFunction(Token id, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
String name = id.getText();
IRutaStringFunctionExtension extension = stringFunctionExtensions.get(name);
if (extension != null) {
@@ -114,7 +112,7 @@ public class RutaExternalFactory {
}
public NumberExpression createExternalNumberFunction(Token id, List<RutaExpression> args)
- throws ANTLRException {
+ throws RutaParseException {
String name = id.getText();
IRutaNumberFunctionExtension extension = numberFunctionExtensions.get(name);
if (extension != null) {
Added: uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaParseException.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaParseException.java?rev=1519479&view=auto
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaParseException.java (added)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/extensions/RutaParseException.java Mon Sep 2 17:12:23 2013
@@ -0,0 +1,30 @@
+/*
+ * 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.extensions;
+
+public class RutaParseException extends Exception {
+
+ public RutaParseException(String message) {
+ super(message);
+ }
+
+ private static final long serialVersionUID = -2728650696200821469L;
+
+}
Modified: uima/sandbox/ruta/trunk/ruta-ep-engine/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-engine/pom.xml?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-engine/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-engine/pom.xml Mon Sep 2 17:12:23 2013
@@ -1,24 +1,17 @@
<?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
+<!-- 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. -->
- 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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ruta-ep-engine</artifactId>
<version>2.0.2-SNAPSHOT</version>
@@ -43,14 +36,116 @@ licensed under the Common Public License
<description>Provides the UIMA Ruta engine to other Eclipse
plugins for their use</description>
<dependencies>
- <!-- <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> <version>3.4</version>
- <scope>compile</scope> </dependency> -->
+ <!-- <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId>
+ <version>3.4</version> <scope>compile</scope> </dependency> -->
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>ruta-core</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-core</artifactId>
+ <version>2.0.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.1.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.1.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.1.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.1.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.1.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>3.1.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<scm>
<url>http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-engine</url>
@@ -58,7 +153,8 @@ licensed under the Common Public License
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/ruta/trunk/ruta-ep-engine</developerConnection>
</scm>
<build>
- <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <!-- don't use artifactId as first part of finalName, follow instead
+ the eclipse convention -->
<finalName>org.apache.uima.ruta.engine_${parsedVersion.osgiVersion}</finalName>
<pluginManagement>
<plugins>
@@ -80,7 +176,6 @@ licensed under the Common Public License
</plugin>
</plugins>
</pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -120,8 +215,7 @@ licensed under the Common Public License
org.antlr.stringtemplate,
org.antlr.stringtemplate.language,
org.antlr.stringtemplate.misc,
- antlr,
- antlr.*,
+ org.antlr.*
org.htmlparser,
org.htmlparser.*,
org.apache.commons.lang3.*,
@@ -129,13 +223,56 @@ licensed under the Common Public License
org.apache.uima.fit.*,
org.apache.commons.math3.*
</_exportcontents>
- <Require-Bundle>
- org.apache.uima.runtime
- </Require-Bundle>
+
<Import-Package>
+ <!-- -->
+ org.apache.uima.*,
+ !antlr, !bsh, !com.jamonapi, !com.sun.net.httpserver,
+ !edu.emory.mathcs.backport.java.util.concurrent,
+ !groovy.lang, !javax.annotation, !javax.ejb,
+ !javax.el, !javax.inject,
+ !javax.interceptor, !javax.jms,
+ !javax.management, !javax.management.modelmbean, !javax.management.openmbean,
+ !javax.management.remote,
+ !javax.naming, !javax.persistence.spi, !javax.rmi, !javax.servlet,
+ !javax.swing, !javax.swing.border,
+ !javax.swing.event, !javax.swing.text, !javax.swing.tree, !javax.validation,
+ !javax.validation.bootstrap,
+ !javax.validation.metadata, !javax.xml.namespace,
+ !javax.xml.parsers, !javax.xml.stream,
+ !javax.xml.stream.events, !javax.xml.stream.util,
+ !javax.xml.transform, !javax.xml.transform.sax,
+ !javax.xml.transform.stax,
+ !javax.xml.ws, !joptsimple, !net.sf.cglib.*, !net.sf.ehcache.*,
+ !org.antlr.stringtemplate,
+ !org.apache.avalon.framework.logger,
+ !org.apache.commons.pool,
+ !org.apache.commons.pool.impl,
+ !org.apache.log, !org.apache.log4j, !org.apache.log4j.xml,
+ !org.aspectj.*, !org.codehaus.groovy.*, !org.hibernate.* ,
+ !org.joda.*, !org.jruby.*, !org.omg.CORBA,
+ !org.springframework.instrument,
+ !org.w3c.dom, !org.xml.sax, !org.xml.sax.ext, !org.xml.sax.helpers
</Import-Package>
+ <!-- -->
+ <Require-Bundle> org.apache.uima.runtime </Require-Bundle>
+ <!-- <Import-Package>org.apache.uima, org.apache.uima.analysis_component,
+ org.apache.uima.analysis_engine, org.apache.uima.analysis_engine.annotator,
+ org.apache.uima.analysis_engine.asb, org.apache.uima.analysis_engine.asb.impl,
+ org.apache.uima.analysis_engine.impl, org.apache.uima.analysis_engine.impl.compatibility,
+ org.apache.uima.analysis_engine.metadata, org.apache.uima.analysis_engine.metadata.impl,
+ org.apache.uima.analysis_engine.service.impl, org.apache.uima.cas, org.apache.uima.cas.admin,
+ org.apache.uima.cas.impl, org.apache.uima.cas.text, org.apache.uima.cas_data,
+ org.apache.uima.cas_data.impl, org.apache.uima.flow, org.apache.uima.flow.impl,
+ org.apache.uima.impl, org.apache.uima.internal.util, org.apache.uima.internal.util.rb_trees,
+ org.apache.uima.internal.util.text, org.apache.uima.jcas, org.apache.uima.jcas.cas,
+ org.apache.uima.jcas.impl, org.apache.uima.jcas.tcas, org.apache.uima.resource,
+ org.apache.uima.resource.impl, org.apache.uima.resource.metadata, org.apache.uima.resource.metadata.impl,
+ org.apache.uima.resource.service.impl, org.apache.uima.search, org.apache.uima.search.impl,
+ org.apache.uima.uimacpp, org.apache.uima.util, org.apache.uima.util.impl,
+ </Import-Package> -->
<Embed-Dependency>*;scope=compile</Embed-Dependency>
-
+ <!-- <Embed-Transitive>true</Embed-Transitive> -->
<Bundle-SymbolicName>org.apache.uima.ruta.engine;singleton:=true</Bundle-SymbolicName>
<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
<Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
@@ -152,7 +289,9 @@ licensed under the Common Public License
<executions>
<execution>
<id>copyDependentJars</id>
- <goals><goal>copy-dependencies</goal></goals>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<excludeArtifactIds>uimaj-core,uimaj-tools,uimaj-document-annotation,uimaj-adapter-vinci,jVinci,uimaj-cpe,tools</excludeArtifactIds>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/pom.xml?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/pom.xml Mon Sep 2 17:12:23 2013
@@ -35,8 +35,6 @@
<url>${uimaWebsiteUrl}</url>
<description>Provides the UIMA Ruta development environment for Eclipse</description>
<dependencies>
- <!-- <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> <version>3.4</version>
- <scope>compile</scope> </dependency> -->
<dependency>
<groupId>org.eclipse.dltk</groupId>
<artifactId>core</artifactId>
@@ -271,8 +269,6 @@
<excludes>
<exclude>release.properties</exclude> <!-- release generated artifact -->
<exclude>marker-file-identifying-*</exclude>
- <exclude>src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens</exclude> <!-- grammar tokens -->
- <exclude>src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens</exclude> <!-- grammar tokens -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/formatter/*.ruta</exclude> <!-- preview file -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/formatter/preferences/*.ruta</exclude> <!-- preview file -->
<exclude>src/main/resources/org/apache/uima/ruta/ide/launching/*.ruta</exclude> <!-- preview file -->
@@ -334,8 +330,6 @@
org.eclipse.core.variables,
org.eclipse.jdt.launching
</Require-Bundle>
- <!-- <Bundle-ClassPath>.,antlr-runtime-3.4.jar,stringtemplate-3.2.1.jar</Bundle-ClassPath>
- !org.eclipse.core.runtime, !org.antlr.runtime, !org.antlr.stringtemplate, * -->
<Import-Package>
</Import-Package>
<Bundle-Localization>plugin</Bundle-Localization>
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/formatter/RutaFormatter.java Mon Sep 2 17:12:23 2013
@@ -93,7 +93,7 @@ public class RutaFormatter extends Abstr
BitSet bs = new BitSet();
bs.add(org.apache.uima.ruta.parser.RutaParser.LINE_COMMENT);
bs.add(org.apache.uima.ruta.parser.RutaParser.COMMENT);
- List<CommonToken> comments = tokenStream.getTokens(0, tokenStream.size(), bs);
+ List<CommonToken> comments = (List<CommonToken>) tokenStream.getTokens(0, tokenStream.size(), bs);
final String output = format(input, (ModuleDeclaration) md, comments, indent);
if (output != null) {
Modified: uima/sandbox/ruta/trunk/ruta-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-parent/pom.xml?rev=1519479&r1=1519478&r2=1519479&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-parent/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-parent/pom.xml Mon Sep 2 17:12:23 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>4</version>
+ <version>6</version>
<relativePath />
</parent>
@@ -167,37 +167,6 @@ Creative Commons Attribution 3.0 License
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.uima</groupId>
- <artifactId>
- uima-build-helper-maven-plugin
- </artifactId>
- <versionRange>[2,)</versionRange>
- <goals>
- <goal>parse-date-time</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>