This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/430-Resolving-type-system-imports-through-SPIs-slows-things-down-too-much
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to
refs/heads/refactoring/430-Resolving-type-system-imports-through-SPIs-slows-things-down-too-much
by this push:
new 154f50bd2 Issue #430: Resolving type system imports through SPIs slows
things down too much
154f50bd2 is described below
commit 154f50bd23dcdace9ec6df99ad61778e1e02df5b
Author: Richard Eckart de Castilho <[email protected]>
AuthorDate: Fri Dec 20 10:17:17 2024 +0100
Issue #430: Resolving type system imports through SPIs slows things down
too much
- uimaFIT will now use the UIMA Framework classloader to discover
ValidationChecks, so the uimaj-core bundle needs to declare that SPI in its
OSGi metadata
- Fix copy/paste issue in SerialFormat JavaDoc
---
uimaj-core/pom.xml | 3 ++-
.../src/main/java/org/apache/uima/cas/SerialFormat.java | 14 +++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
index 23678f471..3fd53c81b 100644
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@ -216,7 +216,8 @@
osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.spi.TypeSystemProvider)";cardinality:=multiple;resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.spi.TypeSystemDescriptionProvider)";cardinality:=multiple;resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.spi.TypePrioritiesProvider)";cardinality:=multiple;resolution:=optional,
-
osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.spi.FsIndexCollectionProvider)";cardinality:=multiple;resolution:=optional
+
osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.spi.FsIndexCollectionProvider)";cardinality:=multiple;resolution:=optional,
+
osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.fit.validation.ValidationCheck)";cardinality:=multiple;resolution:=optional
</Require-Capability>
</instructions>
</configuration>
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
b/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
index 98c37f012..090a56103 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
@@ -29,12 +29,12 @@ public enum SerialFormat {
UNKNOWN(""),
/**
- * XML-serialized CAS
+ * XML-serialized CAS, using XML version 1.0
*/
XCAS("xcas"),
/**
- * XML-serialized CAS
+ * XML-serialized CAS, using XML version 1.0
*/
XMI("xmi"),
@@ -64,7 +64,7 @@ public enum SerialFormat {
SERIALIZED("scas"),
/**
- * Java-serialized CAS with type system and index definitions The Typs
System and Index Definition
+ * Java-serialized CAS with type system and index definitions The Type
System and Index Definition
* replaces the CAS's when deserializing.
*/
SERIALIZED_TSI("scas"),
@@ -95,22 +95,22 @@ public enum SerialFormat {
COMPRESSED_TSI("bcas"),
/**
- * XML-serialized CAS, using xml version 1.1
+ * XML-serialized CAS, using XML version 1.1
*/
XCAS_1_1("xcas"),
/**
- * XML-serialized CAS, using xml version 1.1
+ * XML-serialized CAS, using XML version 1.1
*/
XMI_1_1("xmi"),
/**
- * XML-serialized CAS, using xml version 1.1 - pretty-printed
+ * XML-serialized CAS, using XML version 1.0 - pretty-printed
*/
XMI_PRETTY("xmi"),
/**
- * XML-serialized CAS, using xml version 1.1 - pretty-printed
+ * XML-serialized CAS, using XML version 1.1 - pretty-printed
*/
XMI_1_1_PRETTY("xmi"),;
