diff --git a/.classpath b/.classpath
index f52d95d08d1172c6301bfd86284026bd9cfb1815..c16ad45725fc53a85e2b58aeb3cad7f81422a5ce 100644
--- a/.classpath
+++ b/.classpath
@@ -22,11 +22,6 @@
<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.6">
- <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"/>
@@ -38,5 +33,10 @@
<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="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/pom.xml b/pom.xml
index 608f499e7b52f7b0aa84123bf63c16a79d9a5387..c0f58def9eefc46b1639dfc2ae149b06accd6c38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,8 +209,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -285,8 +285,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -451,64 +451,6 @@
</resources>
</build>
<profiles>
- <profile>
- <id>wue</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <configuration>
- <url>http://wrzh075.rzhousing.uni-wuerzburg.de:8180/manager</url>
- <server>wrzh075</server>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <aggregator.endpoint.published>http://test1.digital-humanities.de/services/aggregator</aggregator.endpoint.published>
- <aggregator.classifier>wue</aggregator.classifier>
- </properties>
- </profile>
- <profile>
- <id>services</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <configuration>
- <url>http://services:8080/manager</url>
- <server>services</server>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <aggregator.endpoint.published>https://textgridlab.org/1.0/aggregator</aggregator.endpoint.published>
- <aggregator.classifier>services</aggregator.classifier>
- </properties>
- </profile>
- <profile>
- <id>tgbackend2</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <configuration>
- <url>http://tgbackend2.gwdg.de:8080/manager</url>
- <server>tgbackend2</server>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <aggregator.endpoint.published>http://textgridrep.de/beta-es/services/aggregator</aggregator.endpoint.published>
- <aggregator.textgridrep.default>http://tgbackend-2.gwdg.de/confserv</aggregator.textgridrep.default>
- <aggregator.classifier>tgbackend2</aggregator.classifier>
- </properties>
- </profile>
<profile>
<id>esx1</id>
<properties>
@@ -573,6 +515,9 @@
</profile>
<profile>
<id>textgrid.deb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -592,12 +537,12 @@
<type>directory</type>
<src>${project.build.directory}/${project.build.finalName}</src>
<mapper>
- <type>perm</type>
- <prefix>/var/textgrid/webapps/${artifactId}</prefix>
- <user>root</user>
- <group>tomcat7</group>
- <filemode>755</filemode>
- </mapper>
+ <type>perm</type>
+ <prefix>/var/textgrid/webapps/${project.artifactId}</prefix>
+ <user>root</user>
+ <group>tomcat7</group>
+ <filemode>755</filemode>
+ </mapper>
</data>
</dataSet>
</configuration>
@@ -611,8 +556,8 @@
<organization>
<name>TextGrid</name>
<url>http://www.textgrid.de/</url>
- </organization>
- <description>The TextGrid Aggregator is an experimental service that can walk aggregations (including editions and collections) and export the objects therein to various formats, e.g., TEI corpus, EPUB, and (experimentally) PDF.</description>
+ </organization>
+ <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>
@@ -620,12 +565,12 @@
<developerConnection>scm:git:ssh://git@git.projects.gwdg.de/aggregator.git</developerConnection>
</scm>
<issueManagement>
- <system>Jira</system>
- <url>https://pm.sub.uni-goettingen.de/</url>
+ <system>Redmine</system>
+ <url>https://projects.gwdg.de/projects/tg</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>http://dev.digital-humanities.de/ci/job/aggregator-git-2/</url>
+ <url>http://dev.digital-humanities.de/ci/job/Aggregator/</url>
</ciManagement>
<url>https://projects.gwdg.de/projects/aggregator</url>
</project>