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 2015/08/16 17:19:59 UTC
svn commit: r1696150 - in /uima/ruta/trunk/ruta-maven-plugin: ./
src/it/multimodule/ src/it/multimodule/additional/
src/it/multimodule/additional/src/ src/it/multimodule/additional/src/main/
src/it/multimodule/additional/src/main/ruta/ src/it/multimodu...
Author: pkluegl
Date: Sun Aug 16 15:19:58 2015
New Revision: 1696150
URL: http://svn.apache.org/r1696150
Log:
UIMA-4513
- added multimodule integration test for import by name
Added:
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/three/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/three/Three.ruta
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/two/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/two/Two.ruta
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/one/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/one/One.ruta
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/maven/
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/maven/OneEngineTest.java
uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml
Modified:
uima/ruta/trunk/ruta-maven-plugin/pom.xml
Modified: uima/ruta/trunk/ruta-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/pom.xml?rev=1696150&r1=1696149&r2=1696150&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/pom.xml (original)
+++ uima/ruta/trunk/ruta-maven-plugin/pom.xml Sun Aug 16 15:19:58 2015
@@ -113,7 +113,7 @@
<goal>package</goal>
<goal>integration-test</goal>
</goals>
- <invokerTest>importByName</invokerTest>
+ <invokerTest>importByName,multimodule</invokerTest>
</configuration>
<executions>
<execution>
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/pom.xml Sun Aug 16 15:19:58 2015
@@ -0,0 +1,82 @@
+<!--
+ 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.
+-->
+<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>
+ <groupId>test</groupId>
+ <artifactId>additional</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <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>
+ </dependencies>
+ <build>
+ <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>
+ </build>
+</project>
\ No newline at end of file
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/three/Three.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/three/Three.ruta?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/three/Three.ruta (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/three/Three.ruta Sun Aug 16 15:19:58 2015
@@ -0,0 +1,3 @@
+PACKAGE my.package.three;
+DECLARE Type3;
+CW{-> Type3};
\ No newline at end of file
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/two/Two.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/two/Two.ruta?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/two/Two.ruta (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/additional/src/main/ruta/my/package/two/Two.ruta Sun Aug 16 15:19:58 2015
@@ -0,0 +1,3 @@
+PACKAGE my.package.two;
+DECLARE Type2;
+CW{-> Type2};
\ No newline at end of file
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/pom.xml Sun Aug 16 15:19:58 2015
@@ -0,0 +1,87 @@
+<!--
+ 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.
+-->
+<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>
+ <groupId>test</groupId>
+ <artifactId>main</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <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>
+ </dependencies>
+ <build>
+ <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>
+ </build>
+</project>
\ No newline at end of file
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/one/One.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/one/One.ruta?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/one/One.ruta (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/main/ruta/my/package/one/One.ruta Sun Aug 16 15:19:58 2015
@@ -0,0 +1,8 @@
+PACKAGE my.package.one;
+SCRIPT my.package.two.Two;
+ENGINE my.package.three.ThreeEngine;
+TYPESYSTEM my.package.three.ThreeTypeSystem;
+CALL(Two);
+EXEC(ThreeEngine);
+DECLARE Type1;
+Type2{-> Type1};
\ No newline at end of file
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/maven/OneEngineTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/maven/OneEngineTest.java?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/maven/OneEngineTest.java (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/main/src/test/java/org/apache/uima/ruta/maven/OneEngineTest.java Sun Aug 16 15:19:58 2015
@@ -0,0 +1,51 @@
+package org.apache.uima.ruta.maven;
+
+import java.io.File;
+
+import static org.junit.Assert.*;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.util.XMLInputSource;
+import org.junit.Test;
+
+public class OneEngineTest {
+
+ @Test
+ public void test() throws Exception{
+ File descDirectory = new File("target/generated-sources/ruta/descriptor");
+ File aeFile1 = new File(descDirectory, "my/package/one/OneEngine.xml");
+ assertTrue(aeFile1.exists());
+ File tsFile1 = new File(descDirectory, "my/package/one/OneTypeSystem.xml");
+ assertTrue(tsFile1.exists());
+
+ AnalysisEngineDescription aed = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(new XMLInputSource(aeFile1));
+ AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aed);
+ CAS cas = ae.newCAS();
+ cas.setDocumentText("This is a test.");
+ ae.process(cas);
+
+ Type type1 = cas.getTypeSystem().getType("my.package.one.One.Type1");
+ AnnotationIndex<AnnotationFS> ai1 = cas.getAnnotationIndex(type1);
+ assertEquals(1, ai1.size());
+ assertEquals("This", ai1.iterator().next().getCoveredText());
+
+ Type type2 = cas.getTypeSystem().getType("my.package.two.Two.Type2");
+ AnnotationIndex<AnnotationFS> ai2 = cas.getAnnotationIndex(type2);
+ assertEquals(1, ai2.size());
+ assertEquals("This", ai2.iterator().next().getCoveredText());
+
+ Type type3 = cas.getTypeSystem().getType("my.package.three.Three.Type3");
+ AnnotationIndex<AnnotationFS> ai3 = cas.getAnnotationIndex(type3);
+ assertEquals(1, ai3.size());
+ assertEquals("This", ai3.iterator().next().getCoveredText());
+
+ cas.release();
+ }
+
+}
Added: uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml?rev=1696150&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml (added)
+++ uima/ruta/trunk/ruta-maven-plugin/src/it/multimodule/pom.xml Sun Aug 16 15:19:58 2015
@@ -0,0 +1,37 @@
+<!--
+ 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.
+-->
+<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>
+
+ <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>
+ <modules>
+ <module>additional</module>
+ <module>main</module>
+ </modules>
+</project>
\ No newline at end of file