Merge pull request #187 from apache/feature/177-Consider-resource-man…

…ager-when-loading-type-descriptions Issue #177: Consider resource manager when loading type descriptions
apache · Nov 30, 2024 · a0b88e2 · a0b88e2
2 parents 508553a + ead84cb
commit a0b88e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
@@ -171,8 +171,7 @@
                   <exclude>src/main/resources/META-INF/org.apache.uima.fit/*.txt</exclude>
                   <exclude>input/**</exclude> <!-- temp test data -->
                   <exclude>TypeSystem.xml</exclude> <!-- temp test data -->
-                  <exclude>src/main/resources/META-INF/services/org.apache.uima.spi.JCasClassProvider</exclude>
-                  <exclude>src/main/resources/META-INF/services/org.apache.uima.spi.TypeSystemDescriptionProvider</exclude>
+                  <exclude>src/main/resources/META-INF/services/org.apache.uima.spi.TypeSystemProvider</exclude>
                 </excludes>
               </configuration>
             </execution>
@@ -243,8 +242,7 @@
               osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
             </Require-Capability>
             <Provide-Capability>
-              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.TypeSystemDescriptionProvider,
-              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.JCasClassProvider
+              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.TypeSystemProvider
             </Provide-Capability>
           </instructions>
         </configuration>

diff --git a/...pi/RutaTypeSystemDescriptionProvider.java → ...ruta/type/spi/RutaTypeSystemProvider.java b/...pi/RutaTypeSystemDescriptionProvider.java → ...ruta/type/spi/RutaTypeSystemProvider.java
@@ -20,9 +20,9 @@
 
 import org.apache.uima.spi.TypeSystemProvider_ImplBase;
 
-public class RutaTypeSystemDescriptionProvider extends TypeSystemProvider_ImplBase {
+public class RutaTypeSystemProvider extends TypeSystemProvider_ImplBase {
 
-  public RutaTypeSystemDescriptionProvider() {
+  public RutaTypeSystemProvider() {
     setTypeSystemLocations( //
             "/org/apache/uima/ruta/engine/BasicTypeSystem.xml", //
             "/org/apache/uima/ruta/engine/DefaultSeederTypeSystem.xml", //

diff --git a/ruta-core/src/main/resources/META-INF/services/org.apache.uima.spi.TypeSystemProvider b/ruta-core/src/main/resources/META-INF/services/org.apache.uima.spi.TypeSystemProvider
@@ -0,0 +1 @@
+org.apache.uima.ruta.type.spi.RutaTypeSystemProvider
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		org.apache.uima.ruta.type.spi.RutaTypeSystemProvider