diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml index 46e9fd02..be3cdc55 100644 --- 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/ruta-core/src/main/java/org/apache/uima/ruta/type/spi/RutaTypeSystemDescriptionProvider.java b/ruta-core/src/main/java/org/apache/uima/ruta/type/spi/RutaTypeSystemProvider.java similarity index 91% rename from ruta-core/src/main/java/org/apache/uima/ruta/type/spi/RutaTypeSystemDescriptionProvider.java rename to ruta-core/src/main/java/org/apache/uima/ruta/type/spi/RutaTypeSystemProvider.java index 377a04a4..68e47cac 100644 --- a/ruta-core/src/main/java/org/apache/uima/ruta/type/spi/RutaTypeSystemDescriptionProvider.java +++ b/ruta-core/src/main/java/org/apache/uima/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 new file mode 100644 index 00000000..9574e352 --- /dev/null +++ b/ruta-core/src/main/resources/META-INF/services/org.apache.uima.spi.TypeSystemProvider @@ -0,0 +1 @@ +org.apache.uima.ruta.type.spi.RutaTypeSystemProvider