diff --git a/.classpath b/.classpath
index aa5166e40e8e1436cb92625816a89b1becb00f1f..e38e8103ac2fa7ecddd5b550e49e8d5c4f0f721a 100644
--- a/.classpath
+++ b/.classpath
@@ -19,7 +19,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar" sourcepath="M2_REPO/com/google/guava/guava/15.0/guava-15.0-sources.jar">
+ <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -64,7 +64,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-sources.jar">
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -79,7 +79,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.13/jaxb-impl-2.1.13.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.13/jaxb-impl-2.1.13-sources.jar">
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.13/jaxb-impl-2.1.13.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -144,7 +144,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -174,7 +174,7 @@
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="M2_REPO/info/textgrid/utils/link-rewriter-core/0.4.1-RELEASE/link-rewriter-core-0.4.1-RELEASE.jar" sourcepath="M2_REPO/info/textgrid/utils/link-rewriter-core/0.4.1-RELEASE/link-rewriter-core-0.4.1-RELEASE-sources.jar">
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/utils/link-rewriter-core/0.4.1-RELEASE/link-rewriter-core-0.4.1-RELEASE.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
</attributes>
@@ -231,7 +231,7 @@
<classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.9.12/jackson-core-asl-1.9.12.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.9.12/jackson-mapper-asl-1.9.12.jar"/>
<classpathentry kind="var" path="M2_REPO/org/javatuples/javatuples/1.2/javatuples-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.5/xmlunit-1.5.jar" sourcepath="M2_REPO/xmlunit/xmlunit/1.5/xmlunit-1.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.5/xmlunit-1.5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.11/cxf-rt-rs-security-cors-2.7.11.jar">
<attributes>
<attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
diff --git a/.project b/.project
index 0f3ca5d147321fbd881a1f4e6f0f5b745d378949..cbf1984ff0285eba8457adce15615ca9d0ddacc8 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator-1.4.14-SNAPSHOT</name>
+ <name>aggregator-1.4.16-SNAPSHOT</name>
<comment>The TextGrid Aggregator is a service that can walk aggregations (including editions and collections) and export the objects therein to various formats, e.g., HTML, TEI corpus, EPUB, and ZIP. It can also be used to transform single files (it is the component that is responsible for HTML rendering of TEI objects in TextGrid) and export search results as ZIP files. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
diff --git a/Jenkinsfile b/Jenkinsfile_OLD
similarity index 100%
rename from Jenkinsfile
rename to Jenkinsfile_OLD
diff --git a/pom.xml b/pom.xml
index be7a67a9a35fcb55dd5f3d1aa720c9ee73ed2101..7b6fdde30b04876a22d5b31d8b18d456a2f0d595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.services</groupId>
<artifactId>aggregator</artifactId>
- <version>1.4.15-SNAPSHOT</version>
+ <version>1.4.16-SNAPSHOT</version>
<packaging>war</packaging>
<name>TextGrid Aggregator Service</name>
@@ -16,7 +16,7 @@
<email>thorsten.vitt@uni-wuerzburg.de</email>
<url>http://www.thorstenvitt.de/</url>
<organization>Universität Würzburg</organization>
- <organizationUrl>http://www.germanistik.uni-wuerzburg.de/lehrstuehle/computerphilologie</organizationUrl>
+ <organizationUrl>https://www.germanistik.uni-wuerzburg.de/lehrstuehle/computerphilologie/</organizationUrl>
</developer>
</developers>
@@ -36,8 +36,8 @@
<!-- The following properties are used for configuring the web service
and can be overridden in profiles -->
<aggregator.endpoint.published>http://localhost:13000/aggregator</aggregator.endpoint.published>
- <aggregator.textgridrep.default>https://www.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
- <aggregator.textgridrep.dev>https://www.textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
+ <aggregator.textgridrep.default>https://textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
+ <aggregator.textgridrep.dev>https://dev.textgridlab.org/1…0/confserv</aggregator.textgridrep.dev>
<aggregator.classifier />
</properties>
@@ -441,12 +441,12 @@
</build>
<profiles>
<profile>
- <id>esx1</id>
+ <id>dev</id>
<properties>
- <aggregator.endpoint.published>http://textgrid-esx1.gwdg.de/1.0/aggregator</aggregator.endpoint.published>
- <aggregator.textgridrep.default>http://textgrid-esx1.gwdg.de/1.0/confserv</aggregator.textgridrep.default>
- <aggregator.textgridrep.dev>https://textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
- <aggregator.classifier>esx1</aggregator.classifier>
+ <aggregator.endpoint.published>https://dev.textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
+ <aggregator.textgridrep.default>https://dev.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
+ <aggregator.textgridrep.dev>https://dev.textgridlab.org/1.0/confserv</aggregator.textgridrep.dev>
+ <aggregator.classifier>dev</aggregator.classifier>
</properties>
</profile>
<profile>
@@ -463,10 +463,10 @@
<profile>
<id>testserver</id>
<properties>
- <aggregator.endpoint.published>http://test.textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
- <aggregator.textgridrep.default>http://test.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
- <aggregator.textgridrep.dev>https://textgridlab.org/dev/confserv</aggregator.textgridrep.dev>
- <aggregator.classifier>esx1</aggregator.classifier>
+ <aggregator.endpoint.published>https://test.textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
+ <aggregator.textgridrep.default>https://test.textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
+ <aggregator.textgridrep.dev>https://dev.textgridlab.org/1.0/confserv</aggregator.textgridrep.dev>
+ <aggregator.classifier>dev</aggregator.classifier>
</properties>
</profile>
<profile>
@@ -557,17 +557,17 @@
<description>The TextGrid Aggregator is a service that can walk aggregations (including editions and collections) and export the objects therein to various formats, e.g., HTML, TEI corpus, EPUB, and ZIP. It can also be used to transform single files (it is the component that is responsible for HTML rendering of TEI objects in TextGrid) and export search results as ZIP files.</description>
<inceptionYear>2012</inceptionYear>
<scm>
- <url>https://projects.gwdg.de/projects/aggregator/repository</url>
- <connection>scm:git:git://projects.gwdg.de/dariah-de/tg/textgrid-services/aggregator.git</connection>
- <developerConnection>scm:git:ssh://git:@projects.gwdg.de/dariah-de/tg/textgrid-services/aggregator.git</developerConnection>
+ <url>https://gitlab.gwdg.de/dariah-de/dariah-de-aggragator-services</url>
+ <connection>scm:git:git://gitlab.gwdg.de:dariah-de/dariah-de-aggragator-services.git</connection>
+ <developerConnection>scm:git:ssh://git:@gitlab.gwdg.de:dariah-de/dariah-de-aggragator-services.git</developerConnection>
</scm>
<issueManagement>
- <system>OpenProjects</system>
- <url>https://projects.gwdg.de/projects/tg</url>
+ <system>Gitlab</system>
+ <url>https://gitlab.gwdg.de/dariah-de/dariah-de-aggragator-services/issues</url>
</issueManagement>
<ciManagement>
- <system>Jenkins</system>
- <url>http://dev.digital-humanities.de/ci/job/Aggregator/</url>
+ <system>Gitlab</system>
+ <url>https://gitlab.gwdg.de/dariah-de/dariah-de-aggragator-services/pipelines</url>
</ciManagement>
- <url>https://projects.gwdg.de/projects/aggregator</url>
+ <url>https://gitlab.gwdg.de/dariah-de/dariah-de-aggragator-services</url>
</project>