diff --git a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java index 089a683d9fd..1ce83dfb208 100644 --- a/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java +++ b/inception/inception-curation/src/test/java/de/tudarmstadt/ukp/inception/curation/export/CuratedDocumentsExporterTest.java @@ -50,7 +50,6 @@ import de.tudarmstadt.ukp.clarin.webanno.export.model.ExportedProject; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; -import de.tudarmstadt.ukp.clarin.webanno.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageServiceImpl; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageBackupProperties; import de.tudarmstadt.ukp.inception.annotation.storage.config.CasStorageCachePropertiesImpl; @@ -60,6 +59,7 @@ import de.tudarmstadt.ukp.inception.export.DocumentImportExportServiceImpl; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; +import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.project.export.ProjectExportServiceImpl; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; diff --git a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java index 531d4f86af7..69dbd9b4396 100644 --- a/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java +++ b/inception/inception-export/src/main/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImpl.java @@ -90,7 +90,6 @@ import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; import de.tudarmstadt.ukp.clarin.webanno.support.logging.BaseLoggers; import de.tudarmstadt.ukp.clarin.webanno.support.logging.LogMessage; -import de.tudarmstadt.ukp.clarin.webanno.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.dkpro.core.api.metadata.type.DocumentMetaData; import de.tudarmstadt.ukp.dkpro.core.api.metadata.type.TagsetDescription; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; @@ -99,6 +98,7 @@ import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceAutoConfiguration; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties.CasDoctorOnImportPolicy; +import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import it.unimi.dsi.fastutil.ints.IntArrayList; diff --git a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java index 9a8ae4391ff..e1e3fef567b 100644 --- a/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java +++ b/inception/inception-export/src/test/java/de/tudarmstadt/ukp/inception/export/DocumentImportExportServiceImplTest.java @@ -76,7 +76,6 @@ import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument; import de.tudarmstadt.ukp.clarin.webanno.support.logging.Logging; -import de.tudarmstadt.ukp.clarin.webanno.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.dkpro.core.api.metadata.type.DocumentMetaData; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageServiceImpl; import de.tudarmstadt.ukp.inception.annotation.storage.CasStorageSession; @@ -86,6 +85,7 @@ import de.tudarmstadt.ukp.inception.annotation.storage.driver.filesystem.FileSystemCasStorageDriver; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServiceProperties; import de.tudarmstadt.ukp.inception.export.config.DocumentImportExportServicePropertiesImpl; +import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport; import de.tudarmstadt.ukp.inception.schema.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.service.AnnotationSchemaServiceImpl; diff --git a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/package-info.java b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/package-info.java deleted file mode 100644 index ce8b812ff5c..00000000000 --- a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Technische Universität Darmstadt under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The Technische Universität Darmstadt - * 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. - * - * 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. - */ - -/** - * Support for (de)serializing the CAS to/from XMI files. - * - * @since 1.1.0 - */ -package de.tudarmstadt.ukp.clarin.webanno.xmi; diff --git a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/BinaryCasFormatSupport.java b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/BinaryCasFormatSupport.java similarity index 95% rename from inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/BinaryCasFormatSupport.java rename to inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/BinaryCasFormatSupport.java index afa9721e7d0..9b72dc08c88 100644 --- a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/BinaryCasFormatSupport.java +++ b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/BinaryCasFormatSupport.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.xmi; +package de.tudarmstadt.ukp.inception.io.xmi; import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription; import static org.apache.uima.fit.factory.CollectionReaderFactory.createReaderDescription; @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.Project; -import de.tudarmstadt.ukp.clarin.webanno.xmi.config.UimaFormatsAutoConfiguration; +import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsAutoConfiguration; /** *
diff --git a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/UimaInlineXmlFormatSupport.java b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/UimaInlineXmlFormatSupport.java similarity index 97% rename from inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/UimaInlineXmlFormatSupport.java rename to inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/UimaInlineXmlFormatSupport.java index d672caa704a..d48a3ef9cdc 100644 --- a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/UimaInlineXmlFormatSupport.java +++ b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/UimaInlineXmlFormatSupport.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.xmi; +package de.tudarmstadt.ukp.inception.io.xmi; import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription; diff --git a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/XmiFormatSupport.java b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/XmiFormatSupport.java similarity index 95% rename from inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/XmiFormatSupport.java rename to inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/XmiFormatSupport.java index f00ad21b1d4..758eb4e0cf3 100644 --- a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/XmiFormatSupport.java +++ b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/XmiFormatSupport.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.xmi; +package de.tudarmstadt.ukp.inception.io.xmi; import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription; import static org.apache.uima.fit.factory.CollectionReaderFactory.createReaderDescription; @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.Project; -import de.tudarmstadt.ukp.clarin.webanno.xmi.config.UimaFormatsAutoConfiguration; +import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsAutoConfiguration; /** *
diff --git a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/XmiXml11FormatSupport.java b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/XmiXml11FormatSupport.java similarity index 95% rename from inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/XmiXml11FormatSupport.java rename to inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/XmiXml11FormatSupport.java index 7164e1eb790..7cdfe7065e1 100644 --- a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/XmiXml11FormatSupport.java +++ b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/XmiXml11FormatSupport.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.tudarmstadt.ukp.clarin.webanno.xmi; +package de.tudarmstadt.ukp.inception.io.xmi; import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription; import static org.apache.uima.fit.factory.CollectionReaderFactory.createReaderDescription; @@ -30,7 +30,7 @@ import de.tudarmstadt.ukp.clarin.webanno.api.format.FormatSupport; import de.tudarmstadt.ukp.clarin.webanno.model.Project; -import de.tudarmstadt.ukp.clarin.webanno.xmi.config.UimaFormatsAutoConfiguration; +import de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsAutoConfiguration; /** *
diff --git a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/config/UimaFormatsAutoConfiguration.java b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/config/UimaFormatsAutoConfiguration.java
similarity index 86%
rename from inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/config/UimaFormatsAutoConfiguration.java
rename to inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/config/UimaFormatsAutoConfiguration.java
index e1263146668..1672feb7fc7 100644
--- a/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/clarin/webanno/xmi/config/UimaFormatsAutoConfiguration.java
+++ b/inception/inception-io-xmi/src/main/java/de/tudarmstadt/ukp/inception/io/xmi/config/UimaFormatsAutoConfiguration.java
@@ -15,16 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.clarin.webanno.xmi.config;
+package de.tudarmstadt.ukp.inception.io.xmi.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import de.tudarmstadt.ukp.clarin.webanno.xmi.BinaryCasFormatSupport;
-import de.tudarmstadt.ukp.clarin.webanno.xmi.UimaInlineXmlFormatSupport;
-import de.tudarmstadt.ukp.clarin.webanno.xmi.XmiFormatSupport;
-import de.tudarmstadt.ukp.clarin.webanno.xmi.XmiXml11FormatSupport;
+import de.tudarmstadt.ukp.inception.io.xmi.BinaryCasFormatSupport;
+import de.tudarmstadt.ukp.inception.io.xmi.UimaInlineXmlFormatSupport;
+import de.tudarmstadt.ukp.inception.io.xmi.XmiFormatSupport;
+import de.tudarmstadt.ukp.inception.io.xmi.XmiXml11FormatSupport;
@Configuration
public class UimaFormatsAutoConfiguration
diff --git a/inception/inception-io-xmi/src/main/resources/META-INF/spring.factories b/inception/inception-io-xmi/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 7f3e2b7c9b2..00000000000
--- a/inception/inception-io-xmi/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-de.tudarmstadt.ukp.clarin.webanno.xmi.config.UimaFormatsAutoConfiguration
\ No newline at end of file
diff --git a/inception/inception-io-xmi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/inception/inception-io-xmi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000000..e99ca2decff
--- /dev/null
+++ b/inception/inception-io-xmi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+de.tudarmstadt.ukp.inception.io.xmi.config.UimaFormatsAutoConfiguration
diff --git a/inception/inception-io-xml/src/main/resources/desc/type/XmlStructure.xml b/inception/inception-io-xml/src/main/resources/desc/type/XmlStructure.xml
index 20aee100293..fcb5edaffac 100644
--- a/inception/inception-io-xml/src/main/resources/desc/type/XmlStructure.xml
+++ b/inception/inception-io-xml/src/main/resources/desc/type/XmlStructure.xml
@@ -1,673 +1,123 @@