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 2019/11/18 12:19:33 UTC
svn commit: r1869967 [12/12] - in /uima/uv3/ruta-v3/trunk: ./
example-projects/ExampleProject/descriptor/
example-projects/ExampleProject/descriptor/uima/ruta/example/
example-projects/ExtensionsExample/ example-projects/GermanNovels/
example-projects/...
Modified: uima/uv3/ruta-v3/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/TextRulerView.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/TextRulerView.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/TextRulerView.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-ep-textruler/src/main/java/org/apache/uima/ruta/textruler/ui/TextRulerView.java Mon Nov 18 12:19:31 2019
@@ -60,7 +60,8 @@ public class TextRulerView extends ViewP
}
public boolean yesNoAlert(String message) {
- MessageBox alert = new MessageBox(getSite().getShell(), SWT.OK | SWT.CANCEL | SWT.ICON_QUESTION);
+ MessageBox alert = new MessageBox(getSite().getShell(),
+ SWT.OK | SWT.CANCEL | SWT.ICON_QUESTION);
alert.setMessage(message);
int result = alert.open();
return result == SWT.OK; // THIS DOES NOT WORK IN OS X !!??
@@ -104,16 +105,14 @@ public class TextRulerView extends ViewP
}
String[] slotNames = viewContent.getSlotNames();
- for (String string : slotNames) {
- System.out.println(string);
- }
String[] filterArray = viewContent.getFilters();
Set<String> filters = new HashSet<String>();
for (String s : filterArray)
filters.add(s);
if (slotNames.length == 0 || inputDir.length() == 0 || preProcTMFile.length() == 0) {
- errorAlert("Please specify at least one slot type, the input directory and the preprocessing file (this is needed even if preprocessing is skipped)!");
+ errorAlert(
+ "Please specify at least one slot type, the input directory and the preprocessing file (this is needed even if preprocessing is skipped)!");
return;
}
File dir = new File(inputDir);
@@ -138,10 +137,7 @@ public class TextRulerView extends ViewP
if ((resultView = getView(TextRulerResultsView.ID, c.getID())) == null) {
try {
- IViewPart view = PlatformUI
- .getWorkbench()
- .getActiveWorkbenchWindow()
- .getActivePage()
+ IViewPart view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.showView(TextRulerResultsView.ID, ((TextRulerLearnerController) i).getID(),
IWorkbenchPage.VIEW_CREATE);
((TextRulerResultsView) view).setViewTitle(c.getName() + " - Results");
@@ -152,7 +148,7 @@ public class TextRulerView extends ViewP
((TextRulerResultsView) resultView).setViewTitle(c.getName() + " - Results");
}
}
-
+
if (TextRulerController.enabledAlgorithmsCount() > 0) {
// GlobalCASSource.releaseAll();
TextRulerController.start(inputDir, additionalDir, preProcTMFile, slotNames, filters, this,
@@ -169,6 +165,7 @@ public class TextRulerView extends ViewP
public void asyncUpdateGlobalStatus(final String str) {
viewContent.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
viewContent.setGlobalStatusString(str);
updateEnabledStatus();
@@ -179,6 +176,7 @@ public class TextRulerView extends ViewP
public void asyncUpdateList(final TextRulerLearnerController algController,
final boolean ruleBaseChanged) {
viewContent.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
updateList(algController, ruleBaseChanged);
}
@@ -196,6 +194,7 @@ public class TextRulerView extends ViewP
}
}
+ @Override
public synchronized void algorithmDidEnd(TextRulerLearnerController algController) {
asyncUpdateList(algController, true);
@@ -222,15 +221,18 @@ public class TextRulerView extends ViewP
return null;
}
+ @Override
public synchronized void algorithmStatusUpdate(TextRulerLearnerController algController,
String statusString, TextRulerLearnerState state, boolean ruleBaseChanged) {
asyncUpdateList(algController, ruleBaseChanged);
}
+ @Override
public void preprocessorStatusUpdate(TextRulerPreprocessor p, String statusString) {
asyncUpdateGlobalStatus("Preprocessing... " + statusString);
}
+ @Override
public void globalStatusUpdate(String str) {
asyncUpdateGlobalStatus(str);
}
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-archetype/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-archetype/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-archetype/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-archetype/pom.xml Mon Nov 18 12:19:31 2019
@@ -31,7 +31,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.3</version>
+ <version>3.1.2</version>
</extension>
</extensions>
<pluginManagement>
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.4</version>
+ <version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-archetype/src/main/resources/archetype-resources/pom.xml Mon Nov 18 12:19:31 2019
@@ -31,12 +31,11 @@
<groupId>org.apache.uima</groupId>
<artifactId>ruta-parent</artifactId>
<version>${archetypeVersion}</version>
- <relativePath>../ruta-parent/pom.xml</relativePath>
</parent>
<properties>
<junit-version>4.11</junit-version>
- <uima-version>2.10.0</uima-version>
+ <uima-version>3.1.1</uima-version>
<ruta-version>${archetypeVersion}</ruta-version>
</properties>
@@ -104,6 +103,9 @@
</extensionPackages>
<addRutaNature>true</addRutaNature>
<buildPaths>
+ <buildPath>script:src/main/ruta</buildPath>
+ <buildPath>descriptor:target/generated-sources/ruta/descriptor</buildPath>
+ <buildPath>resources:src/main/resources</buildPath>
</buildPaths>
</configuration>
</execution>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/pom.xml Mon Nov 18 12:19:31 2019
@@ -42,6 +42,27 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/uima/ruta/trunk/ruta-maven-plugin</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/uima/ruta/trunk/ruta-maven-plugin</developerConnection>
</scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- Dependencies on the Maven Plugin API and friends -->
<dependency>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/conflictingShortName/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/conflictingShortName/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/conflictingShortName/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/conflictingShortName/pom.xml Mon Nov 18 12:19:31 2019
@@ -22,6 +22,19 @@
<groupId>test</groupId>
<artifactId>conflictingShortName</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom</artifactId>
+ <version>12</version>
+ <relativePath />
+ </parent>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/importByName/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/importByName/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/importByName/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/importByName/pom.xml Mon Nov 18 12:19:31 2019
@@ -22,6 +22,19 @@
<groupId>test</groupId>
<artifactId>importByName</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom</artifactId>
+ <version>12</version>
+ <relativePath />
+ </parent>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml Mon Nov 18 12:19:31 2019
@@ -22,61 +22,67 @@
<groupId>test</groupId>
<artifactId>additional</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-core</artifactId>
- <version>@project.version@</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-core</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/ruta</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/main/ruta</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-maven-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <scriptFiles>
- <directory>${basedir}/src/main/ruta</directory>
- <includes>
- <include>**/*.ruta</include>
- </includes>
- </scriptFiles>
- <typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
- <analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
- <descriptorPaths>
- <descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
- </descriptorPaths>
- <analysisEngineSuffix>Engine</analysisEngineSuffix>
- <typeSystemSuffix>TypeSystem</typeSystemSuffix>
- <encoding>UTF-8</encoding>
- <importByName>true</importByName>
- <addRutaNature>false</addRutaNature>
- </configuration>
- <executions>
- <execution>
- <id>descriptors</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-maven-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <scriptFiles>
+ <directory>${basedir}/src/main/ruta</directory>
+ <includes>
+ <include>**/*.ruta</include>
+ </includes>
+ </scriptFiles>
+ <typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
+ <analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
+ <descriptorPaths>
+ <descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
+ </descriptorPaths>
+ <analysisEngineSuffix>Engine</analysisEngineSuffix>
+ <typeSystemSuffix>TypeSystem</typeSystemSuffix>
+ <encoding>UTF-8</encoding>
+ <importByName>true</importByName>
+ <addRutaNature>false</addRutaNature>
+ </configuration>
+ <executions>
+ <execution>
+ <id>descriptors</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml Mon Nov 18 12:19:31 2019
@@ -22,66 +22,72 @@
<groupId>test</groupId>
<artifactId>main</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>additional</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-core</artifactId>
- <version>@project.version@</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>additional</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-core</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/ruta</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/main/ruta</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/generated-sources/ruta/descriptor</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-maven-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <scriptFiles>
- <directory>${basedir}/src/main/ruta</directory>
- <includes>
- <include>**/*.ruta</include>
- </includes>
- </scriptFiles>
- <typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
- <analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
- <descriptorPaths>
- <descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
- </descriptorPaths>
- <analysisEngineSuffix>Engine</analysisEngineSuffix>
- <typeSystemSuffix>TypeSystem</typeSystemSuffix>
- <encoding>UTF-8</encoding>
- <importByName>true</importByName>
- <addRutaNature>false</addRutaNature>
- </configuration>
- <executions>
- <execution>
- <id>descriptors</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>ruta-maven-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <scriptFiles>
+ <directory>${basedir}/src/main/ruta</directory>
+ <includes>
+ <include>**/*.ruta</include>
+ </includes>
+ </scriptFiles>
+ <typeSystemOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</typeSystemOutputDirectory>
+ <analysisEngineOutputDirectory>${project.build.directory}/generated-sources/ruta/descriptor</analysisEngineOutputDirectory>
+ <descriptorPaths>
+ <descriptorPath>${project.build.directory}/generated-sources/ruta/descriptor</descriptorPath>
+ </descriptorPaths>
+ <analysisEngineSuffix>Engine</analysisEngineSuffix>
+ <typeSystemSuffix>TypeSystem</typeSystemSuffix>
+ <encoding>UTF-8</encoding>
+ <importByName>true</importByName>
+ <addRutaNature>false</addRutaNature>
+ </configuration>
+ <executions>
+ <execution>
+ <id>descriptors</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml Mon Nov 18 12:19:31 2019
@@ -20,16 +20,22 @@
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>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>4</version>
- <relativePath />
- </parent>
-
<artifactId>multimodule</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom</artifactId>
+ <version>12</version>
+ <relativePath />
+ </parent>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<modules>
<module>additional</module>
<module>main</module>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/wordlists/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/wordlists/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/wordlists/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/it/wordlists/pom.xml Mon Nov 18 12:19:31 2019
@@ -22,6 +22,19 @@
<groupId>test</groupId>
<artifactId>wordlists</artifactId>
<version>1.0.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom</artifactId>
+ <version>12</version>
+ <relativePath />
+ </parent>
+
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java Mon Nov 18 12:19:31 2019
@@ -87,15 +87,15 @@ public class RutaGenerateDescriptorMojo
private static final String RUTA_NATURE = "org.apache.uima.ruta.ide.nature";
- @Parameter( defaultValue = "${project}", readonly = true )
+ @Parameter(defaultValue = "${project}", readonly = true)
private MavenProject project;
@Component
private BuildContext buildContext;
- @Parameter( defaultValue = "${session}", readonly = true )
+ @Parameter(defaultValue = "${session}", readonly = true)
private MavenSession session;
-
+
/**
* The source files for the multi tree word list.
*/
@@ -198,6 +198,7 @@ public class RutaGenerateDescriptorMojo
@Parameter(required = false)
private String[] buildPaths;
+ @Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (!typeSystemOutputDirectory.exists()) {
@@ -212,8 +213,7 @@ public class RutaGenerateDescriptorMojo
this.project.addCompileSourceRoot(this.typeSystemOutputDirectory.getPath());
this.project.addCompileSourceRoot(this.analysisEngineOutputDirectory.getPath());
-
-
+
String[] files = null;
if (scriptFiles != null) {
try {
@@ -239,18 +239,18 @@ public class RutaGenerateDescriptorMojo
List<File> filesToBuild = new ArrayList<File>();
for (String each : files) {
File file = new File(each);
-
+
// TODO should check the correct package!
List<File> possibleDescriptors = getPossibleDescriptors(file);
- if(possibleDescriptors == null) {
+ if (possibleDescriptors == null) {
filesToBuild.add(file);
continue;
}
-
+
long scriptModified = file.lastModified();
for (File eachDescriptor : possibleDescriptors) {
long descModified = eachDescriptor.lastModified();
- if(scriptModified > descModified) {
+ if (scriptModified > descModified) {
filesToBuild.add(file);
break;
}
@@ -262,8 +262,6 @@ public class RutaGenerateDescriptorMojo
return;
}
-
-
RutaDescriptorFactory factory = new RutaDescriptorFactory();
if (typeSystemTemplate != null) {
try {
@@ -292,8 +290,7 @@ public class RutaGenerateDescriptorMojo
List<String> extensions = getExtensionsFromClasspath(classloader);
options.setLanguageExtensions(extensions);
-
-
+
if (maxBuildRetries == -1) {
maxBuildRetries = filesToBuild.size() * 3;
}
@@ -322,9 +319,8 @@ public class RutaGenerateDescriptorMojo
getLog().warn("Failed to parse UIMA Ruta script: " + scriptName, re);
} catch (IOException ioe) {
toBuild.add(descriptorInformation);
- getLog().warn(
- "Tried to build " + scriptName
- + ", but failed (dependency probably not yet build): " + ioe.getMessage());
+ getLog().warn("Tried to build " + scriptName
+ + ", but failed (dependency probably not yet build): " + ioe.getMessage());
count++;
} catch (SAXException saxe) {
getLog().warn("Failed to write descriptor: " + scriptName, saxe);
@@ -376,7 +372,6 @@ public class RutaGenerateDescriptorMojo
return result;
}
-
private List<String> getExtensionsFromClasspath(ClassLoader classloader) {
List<String> result = new ArrayList<String>();
@@ -398,18 +393,18 @@ public class RutaGenerateDescriptorMojo
}
private void createDescriptors(RutaDescriptorFactory factory, RutaBuildOptions options,
- RutaDescriptorInformation descriptorInformation) throws IOException,
- RecognitionException, InvalidXMLException, ResourceInitializationException,
- URISyntaxException, SAXException {
+ RutaDescriptorInformation descriptorInformation) throws IOException, RecognitionException,
+ InvalidXMLException, ResourceInitializationException, URISyntaxException, SAXException {
String packageString = "";
if (!StringUtils.isBlank(descriptorInformation.getPackageString())) {
packageString = descriptorInformation.getPackageString().replaceAll("[.]", "/").concat("/");
}
- String engineOutput = new File(analysisEngineOutputDirectory, packageString
- + descriptorInformation.getScriptName() + analysisEngineSuffix + ".xml")
- .getAbsolutePath();
- String typeSystemOutput = new File(typeSystemOutputDirectory, packageString
- + descriptorInformation.getScriptName() + typeSystemSuffix + ".xml").getAbsolutePath();
+ String engineOutput = new File(analysisEngineOutputDirectory,
+ packageString + descriptorInformation.getScriptName() + analysisEngineSuffix + ".xml")
+ .getAbsolutePath();
+ String typeSystemOutput = new File(typeSystemOutputDirectory,
+ packageString + descriptorInformation.getScriptName() + typeSystemSuffix + ".xml")
+ .getAbsolutePath();
Pair<AnalysisEngineDescription, TypeSystemDescription> descriptions = factory
.createDescriptions(engineOutput, typeSystemOutput, descriptorInformation, options,
scriptPaths, descriptorPaths, resourcePaths);
@@ -434,10 +429,6 @@ public class RutaGenerateDescriptorMojo
}
}
- /**
- * Create a class loader which covers the classes compiled in the current project and all
- * dependencies.
- */
public static URLClassLoader getClassloader(MavenProject project, Log aLog)
throws MojoExecutionException {
@@ -446,12 +437,12 @@ public class RutaGenerateDescriptorMojo
for (String element : project.getCompileSourceRoots()) {
try {
urls.add(new File(element).toURI().toURL());
- if(aLog != null) {
+ if (aLog != null) {
aLog.debug("Classpath entry: " + element);
}
} catch (MalformedURLException e) {
- throw new MojoExecutionException("Unable to assemble classpath: "
- + ExceptionUtils.getRootCauseMessage(e), e);
+ throw new MojoExecutionException(
+ "Unable to assemble classpath: " + ExceptionUtils.getRootCauseMessage(e), e);
}
}
@@ -459,31 +450,31 @@ public class RutaGenerateDescriptorMojo
try {
String directory = element.getDirectory();
urls.add(new File(directory).toURI().toURL());
- if(aLog != null) {
+ if (aLog != null) {
aLog.debug("Classpath entry: " + directory);
}
} catch (MalformedURLException e) {
- throw new MojoExecutionException("Unable to assemble classpath: "
- + ExceptionUtils.getRootCauseMessage(e), e);
+ throw new MojoExecutionException(
+ "Unable to assemble classpath: " + ExceptionUtils.getRootCauseMessage(e), e);
}
}
try {
for (Object object : project.getCompileClasspathElements()) {
String path = (String) object;
- if(aLog != null) {
+ if (aLog != null) {
aLog.debug("Classpath entry: " + object);
}
urls.add(new File(path).toURI().toURL());
}
} catch (IOException e) {
- throw new MojoExecutionException("Unable to assemble classpath: "
- + ExceptionUtils.getRootCauseMessage(e), e);
+ throw new MojoExecutionException(
+ "Unable to assemble classpath: " + ExceptionUtils.getRootCauseMessage(e), e);
} catch (DependencyResolutionRequiredException e) {
- throw new MojoExecutionException("Unable to resolve dependencies: "
- + ExceptionUtils.getRootCauseMessage(e), e);
+ throw new MojoExecutionException(
+ "Unable to resolve dependencies: " + ExceptionUtils.getRootCauseMessage(e), e);
}
- Set<Artifact> artifacts = (Set<Artifact>) project.getDependencyArtifacts();
+ Set<Artifact> artifacts = project.getDependencyArtifacts();
if (artifacts != null) {
for (Artifact dep : artifacts) {
try {
@@ -491,9 +482,9 @@ public class RutaGenerateDescriptorMojo
// Unresolved file because it is in the wrong scope (e.g. test?)
continue;
}
- if(aLog != null) {
- aLog.debug("Classpath entry: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":"
- + dep.getVersion() + " -> " + dep.getFile());
+ if (aLog != null) {
+ aLog.debug("Classpath entry: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":"
+ + dep.getVersion() + " -> " + dep.getFile());
}
urls.add(dep.getFile().toURI().toURL());
} catch (Exception e) {
Modified: uima/uv3/ruta-v3/trunk/ruta-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-parent/pom.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-parent/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-parent/pom.xml Mon Nov 18 12:19:31 2019
@@ -127,8 +127,9 @@ This product contains icons developed by
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License.
</postNoticeText>
- <uimaVersion>3.1.0</uimaVersion>
+ <uimaVersion>3.1.1</uimaVersion>
<uimafit-version>3.0.0</uimafit-version>
+ <spring-version>4.3.22.RELEASE</spring-version>
<!--
BACKWARD_COMPATIBLE_IMPLEMENTER - patch version (=.=.+)
BACKWARD_COMPATIBLE_USER - minor version (=.+.0)
@@ -140,7 +141,7 @@ Creative Commons Attribution 3.0 License
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
- <api_check_oldVersion>2.6.0</api_check_oldVersion>
+ <api_check_oldVersion>2.6.1</api_check_oldVersion>
</properties>
<dependencyManagement>
@@ -193,11 +194,6 @@ Creative Commons Attribution 3.0 License
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
- </plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
@@ -315,9 +311,9 @@ Creative Commons Attribution 3.0 License
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.9.3</version>
+ <version>0.13.0</version>
<configuration>
- <skip>true</skip>
+ <skip>true</skip>
<oldVersion>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -331,8 +327,8 @@ Creative Commons Attribution 3.0 License
<exclude>org.apache.uima.ruta.type</exclude>
<exclude>org.apache.uima.ruta.parser.RutaParser</exclude>
</excludes>
- <!-- filter out classes with impl in their package or class name -->
- <postAnalysisScript>${project.basedir}/../ruta-parent/src/main/groovy/api-report.groovy</postAnalysisScript>
+ <!-- filter out classes with impl in their package or class name -->
+<!-- <postAnalysisScript>${project.basedir}/../ruta-parent/src/main/groovy/api-report.groovy</postAnalysisScript> -->
</parameter>
</configuration>
<executions>
@@ -351,7 +347,8 @@ Creative Commons Attribution 3.0 License
<executions>
<execution>
<id>copy-API-change-report</id>
- <phase>install</phase> <!-- must follow verify -->
+ <phase>install</phase>
+<!-- must follow verify -->
<goals><goal>run</goal></goals>
<configuration>
<target>
Modified: uima/uv3/ruta-v3/trunk/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml?rev=1869967&r1=1869966&r2=1869967&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml Mon Nov 18 12:19:31 2019
@@ -17,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
<name>org.apache.uima.ruta.engine.RutaInternalTypeSystem</name>
<description/>
@@ -156,6 +155,13 @@
<elementType>org.apache.uima.ruta.type.DebugRuleElementMatches</elementType>
<multipleReferencesAllowed>false</multipleReferencesAllowed>
</featureDescription>
+ <featureDescription>
+ <name>inlinedConditionBlocks</name>
+ <description/>
+ <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+ <elementType>org.apache.uima.ruta.type.DebugInlinedBlock</elementType>
+ <multipleReferencesAllowed>false</multipleReferencesAllowed>
+ </featureDescription>
</features>
</typeDescription>
<typeDescription>
@@ -179,6 +185,42 @@
<description/>
<rangeTypeName>uima.cas.Boolean</rangeTypeName>
</featureDescription>
+ <featureDescription>
+ <name>inlinedActionBlocks</name>
+ <description/>
+ <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+ <elementType>org.apache.uima.ruta.type.DebugInlinedBlock</elementType>
+ <multipleReferencesAllowed>false</multipleReferencesAllowed>
+ </featureDescription>
+ </features>
+ </typeDescription>
+ <typeDescription>
+ <name>org.apache.uima.ruta.type.DebugInlinedBlock</name>
+ <description/>
+ <supertypeName>uima.cas.TOP</supertypeName>
+ <features>
+ <featureDescription>
+ <name>element</name>
+ <description/>
+ <rangeTypeName>uima.cas.String</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>asCondition</name>
+ <description/>
+ <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>matched</name>
+ <description/>
+ <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>inlinedRules</name>
+ <description/>
+ <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+ <elementType>org.apache.uima.ruta.type.DebugScriptApply</elementType>
+ <multipleReferencesAllowed>false</multipleReferencesAllowed>
+ </featureDescription>
</features>
</typeDescription>
<typeDescription>