You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2023/01/27 10:23:19 UTC
[uima-ruta] branch refactoring/118-Merge-type-system-modules-into-core-module created (now 21b69e3a)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch refactoring/118-Merge-type-system-modules-into-core-module
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
at 21b69e3a Issue #118: Merge type system modules into core module
This branch includes the following new commits:
new 21b69e3a Issue #118: Merge type system modules into core module
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-ruta] 01/01: Issue #118: Merge type system modules into core module
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/118-Merge-type-system-modules-into-core-module
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 21b69e3a70cf8e454fa04591ae703ff2543a7d51
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Fri Jan 27 11:23:10 2023 +0100
Issue #118: Merge type system modules into core module
- Move content and build aspects of ruta-typesystem and ruta-base-type into ruta-core
- Remove ruta-typesystem and ruta-base-type
---
pom.xml | 14 --
ruta-basic-type/.gitignore | 1 -
ruta-basic-type/pom.xml | 97 --------------
ruta-core/pom.xml | 47 +++++--
.../java/org/apache/uima/ruta/type/RutaBasic.java | 0
.../META-INF/org.apache.uima.fit/types.txt | 0
.../apache/uima/ruta/engine/BasicTypeSystem.xml | 0
.../uima/ruta/engine/DefaultSeederTypeSystem.xml | 0
.../org/apache/uima/ruta/engine/HtmlTypeSystem.xml | 0
.../uima/ruta/engine/PlainTextTypeSystem.xml | 0
.../uima/ruta/engine/RutaBasicTypeSystem.xml | 0
.../uima/ruta/engine/RutaInternalTypeSystem.xml | 0
.../uima/ruta/engine/SourceDocumentInformation.xml | 0
ruta-typesystem/.gitignore | 1 -
ruta-typesystem/pom.xml | 143 ---------------------
15 files changed, 35 insertions(+), 268 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5dbcb5ce..d8b94557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,16 +55,6 @@
<!-- dependencies used during assembly -->
<dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-basic-type</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-typesystem</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>ruta-core</artifactId>
@@ -114,8 +104,6 @@
<modules>
<module>ruta-parent</module>
- <module>ruta-basic-type</module>
- <module>ruta-typesystem</module>
<module>ruta-core</module>
<module>ruta-core-ext</module>
@@ -154,7 +142,6 @@
<exclude>.github/**/*</exclude>
<!-- workaround https://issues.apache.org/jira/browse/RAT-97 -->
<exclude>example-projects/**</exclude>
- <exclude>ruta-basic-type/**</exclude>
<exclude>ruta-core/**</exclude>
<exclude>ruta-core-ext/**</exclude>
<exclude>ruta-docbook/**</exclude>
@@ -171,7 +158,6 @@
<exclude>ruta-maven-archetype/**</exclude>
<exclude>ruta-maven-plugin/**</exclude>
<exclude>ruta-parent/**</exclude>
- <exclude>ruta-typesystem/**</exclude>
</excludes>
</configuration>
</execution>
diff --git a/ruta-basic-type/.gitignore b/ruta-basic-type/.gitignore
deleted file mode 100644
index 3385916d..00000000
--- a/ruta-basic-type/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/META-INF/
diff --git a/ruta-basic-type/pom.xml b/ruta-basic-type/pom.xml
deleted file mode 100644
index e055e57b..00000000
--- a/ruta-basic-type/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>ruta-parent</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <relativePath>../ruta-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>ruta-basic-type</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache UIMA Ruta: ${project.artifactId}</name>
- <description>The RutaBasic type provided by ruta-core.</description>
- <url>${uimaWebsiteUrl}</url>
-
- <properties>
- <uimaScmProject>${project.artifactId}</uimaScmProject>
- </properties>
-
- <scm>
- <connection>scm:git:https://github.com/apache/uima-ruta/</connection>
- <developerConnection>scm:git:https://github.com/apache/uima-ruta/</developerConnection>
- <url>https://github.com/apache/uima-ruta/</url>
- <tag>HEAD</tag>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <version>${uimaVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>org.apache.uima.ruta.type</excludePackageNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes combine.children="append">
- <exclude>src/main/resources/META-INF/org.apache.uima.fit/*.txt</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index 65d6893a..7edee7ff 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -47,12 +47,6 @@
</scm>
<dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-typesystem</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
@@ -251,13 +245,7 @@
*
</Import-Package>
-->
- <Private-Package>
- org.apache.uima.ruta.engine;-split-package:=merge-first,
- org.apache.uima.ruta.type;-split-package:=merge-first,
- </Private-Package>
<Export-Package>
- org.apache.uima.ruta.engine;-split-package:=merge-first,
- org.apache.uima.ruta.type;-split-package:=merge-first,
org.apache.uima.ruta,
org.apache.uima.ruta.*
</Export-Package>
@@ -275,6 +263,41 @@
</instructions>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>jcasgen-maven-plugin</artifactId>
+ <version>${uimaVersion}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <!-- runs in phase process-resources by default -->
+ <configuration>
+ <!-- one or more ant-like file patterns identifying top level descriptors -->
+ <typeSystemIncludes>
+ <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml</typeSystemInclude>
+ <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml</typeSystemInclude>
+ <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/HtmlTypeSystem.xml</typeSystemInclude>
+ <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml</typeSystemInclude>
+ </typeSystemIncludes>
+ <limitToProject>true</limitToProject>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- Exclude generated jcas classes -->
+ <sourceFileExcludes>
+ <sourceFileExclude>**/org/apache/uima/ruta/type/*.java</sourceFileExclude>
+ </sourceFileExcludes>
+ </configuration>
+ </plugin>
<!-- generate java code for antlr grammars -->
<plugin>
diff --git a/ruta-basic-type/src/main/java/org/apache/uima/ruta/type/RutaBasic.java b/ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java
similarity index 100%
rename from ruta-basic-type/src/main/java/org/apache/uima/ruta/type/RutaBasic.java
rename to ruta-core/src/main/java/org/apache/uima/ruta/type/RutaBasic.java
diff --git a/ruta-typesystem/src/main/resources/META-INF/org.apache.uima.fit/types.txt b/ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt
similarity index 100%
rename from ruta-typesystem/src/main/resources/META-INF/org.apache.uima.fit/types.txt
rename to ruta-core/src/main/resources/META-INF/org.apache.uima.fit/types.txt
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/BasicTypeSystem.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicTypeSystem.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/BasicTypeSystem.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicTypeSystem.xml
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/HtmlTypeSystem.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlTypeSystem.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/HtmlTypeSystem.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlTypeSystem.xml
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaBasicTypeSystem.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/RutaBasicTypeSystem.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaBasicTypeSystem.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/RutaBasicTypeSystem.xml
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml
diff --git a/ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/SourceDocumentInformation.xml b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/SourceDocumentInformation.xml
similarity index 100%
rename from ruta-typesystem/src/main/resources/org/apache/uima/ruta/engine/SourceDocumentInformation.xml
rename to ruta-core/src/main/resources/org/apache/uima/ruta/engine/SourceDocumentInformation.xml
diff --git a/ruta-typesystem/.gitignore b/ruta-typesystem/.gitignore
deleted file mode 100644
index 3385916d..00000000
--- a/ruta-typesystem/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/META-INF/
diff --git a/ruta-typesystem/pom.xml b/ruta-typesystem/pom.xml
deleted file mode 100644
index aa3ad0b4..00000000
--- a/ruta-typesystem/pom.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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>ruta-parent</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <relativePath>../ruta-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>ruta-typesystem</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache UIMA Ruta: ${project.artifactId}</name>
- <description>The type systems provided by ruta-core.</description>
- <url>${uimaWebsiteUrl}</url>
-
- <properties>
- <uimaScmProject>${project.artifactId}</uimaScmProject>
- </properties>
-
- <scm>
- <connection>scm:git:https://github.com/apache/uima-ruta/</connection>
- <developerConnection>scm:git:https://github.com/apache/uima-ruta/</developerConnection>
- <url>https://github.com/apache/uima-ruta/</url>
- <tag>HEAD</tag>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ruta-basic-type</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <version>${uimaVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/org.apache.uima.fit/*.txt</exclude>
- <exclude>issuesFixed/**</exclude> <!-- generated -->
- <exclude>marker-file-identifying-*</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>jcasgen-maven-plugin</artifactId>
- <version>${uimaVersion}</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- <!-- runs in phase process-resources by default -->
- <configuration>
- <!-- one or more ant-like file patterns identifying top level descriptors -->
- <typeSystemIncludes>
- <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/RutaInternalTypeSystem.xml</typeSystemInclude>
- <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml</typeSystemInclude>
- <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/HtmlTypeSystem.xml</typeSystemInclude>
- <typeSystemInclude>src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml</typeSystemInclude>
- </typeSystemIncludes>
- <limitToProject>true</limitToProject>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Xmx650M</argLine>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- Exclude generated jcas classes -->
- <sourceFileExcludes>
- <sourceFileExclude>**/org/apache/uima/ruta/type/*.java</sourceFileExclude>
- </sourceFileExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file