diff --git a/.classpath b/.classpath
index bca3c47a5c26825d88fc12753400182cfcfc854f..ae636211a8ed7aecc375aa7bed5c97e2a54b35c4 100644
--- a/.classpath
+++ b/.classpath
@@ -1,41 +1,240 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/webapp/WEB-INF">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/webapp/WEB-INF" including="aggregator.properties" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <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">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgcrud-client/2.6.0/tgcrud-client-2.6.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.11/cxf-rt-frontend-jaxws-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.11/cxf-api-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.1/woodstox-core-asl-4.2.1.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.1.0/xmlschema-core-2.1.0.jar">
+ <attributes>
+ <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">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3.jar" sourcepath="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.11/cxf-rt-core-2.7.11.jar">
+ <attributes>
+ <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">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.11/cxf-rt-bindings-soap-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.11/cxf-rt-databinding-jaxb-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.11/cxf-rt-bindings-xml-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.11/cxf-rt-frontend-simple-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.11/cxf-rt-ws-addr-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.11/cxf-rt-ws-policy-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.0.3/neethi-3.0.3.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.11/cxf-rt-transports-http-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/namespaces/metadata-core-jaxb/1.2.0/metadata-core-jaxb-1.2.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgsearch-client/3.6.2/tgsearch-client-3.6.2.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.11/cxf-rt-frontend-jaxrs-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.2.RELEASE/spring-core-3.2.2.RELEASE.jar">
+ <attributes>
+ <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">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.3.3/jettison-1.3.3.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.3.3/jettison-1.3.3-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/tgsearch-api/3.6.2/tgsearch-api-3.6.2.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/info/textgrid/middleware/confclient/1.4.0/confclient-1.4.0.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/net/sf/saxon/Saxon-HE/9.5.1-5/Saxon-HE-9.5.1-5.jar">
+ <attributes>
+ <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">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/51.1/icu4j-51.1.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4.jar" sourcepath="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-management/2.7.11/cxf-rt-management-2.7.11.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.2.RELEASE/spring-web-3.2.2.RELEASE.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.2.2.RELEASE/spring-aop-3.2.2.RELEASE.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.2.RELEASE/spring-beans-3.2.2.RELEASE.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.2.RELEASE/spring-context-3.2.2.RELEASE.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.2.2.RELEASE/spring-expression-3.2.2.RELEASE.jar">
+ <attributes>
+ <attribute value="/WEB-INF/lib" name="org.eclipse.jst.component.dependency"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/idpf/epubcheck/4.0.0-alpha11/epubcheck-4.0.0-alpha11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.5/commons-compress-1.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/daisy/libs/jing/20120724.0.0/jing-20120724.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar"/>
+ <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/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"/>
+ </attributes>
+ </classpathentry>
+</classpath>
\ No newline at end of file
diff --git a/.project b/.project
index 1d0ba7966df3f4531eb5665b12d3659fbe49dd51..9a8bf1e0f9f6232118a068a0b6e9a032b8c8f704 100644
--- a/.project
+++ b/.project
@@ -1,42 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
+ <name>aggregator-1.4.13</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>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 08ebfcac01a7bf0ebbfce0dbec3c235c43d260a3..084b9417a60948995e7df60ba7589861532750ab 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,7 +14,27 @@ The TextGrid Aggregator is the export and conversion tool for data from the Text
api
config
+
Up-To-Date short usage
----------------------
+https://textgridlab.org/1.0/aggregator/help
+
+
+Sources
+-------
+See aggregator_sources_
+
+
+Bugtracking
+-----------
+See aggregator_bugtracking_
+
+
+License
+-------
+See LICENCE_
+
-http://textgrid-esx2.gwdg.de/1.0/aggregator/help
+.. _LICENCE: https://projects.gwdg.de/projects/aggregator/repository/revisions/master/entry/LICENSE.txt
+.. _aggregator_sources: https://projects.gwdg.de/projects/aggregator/repository
+.. _aggregator_bugtracking: https://projects.gwdg.de/projects/tg/work_packages