diff --git a/pom.xml b/pom.xml
index a2c49cc6768f6eea134e4d1896031244be59e788..fc7b801c1a9efb8920359aba22beeae6492ecc10 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.16-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>TextGrid Aggregator Service</name>
@@ -22,25 +22,39 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java-source.version>1.7</java-source.version>
- <java-target.version>1.8</java-target.version>
+ <java-source-version>1.7</java-source-version>
+ <java-target-version>1.7</java-target-version>
<commons-io-version>2.4</commons-io-version>
<link-rewriter-version>0.4.1-RELEASE</link-rewriter-version>
<saxon-version>9.5.1-5</saxon-version> <!-- XXX mind dependency from epubcheck -->
<cxf-version>2.7.18</cxf-version>
- <confclient-version>4.1.0</confclient-version>
- <tgsearch-version>4.0.1</tgsearch-version>
+ <confclient-version>4.1.0</confclient-version>
+ <tgsearch-version>4.0.1</tgsearch-version>
<tgcrud-version>2.6.0</tgcrud-version>
- <!-- TG-crud client configuration is not working with newest crud, I'll just fix it tomorroe! -->
- <!--tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version-->
+ <!-- TG-crud client configuration is not working with newest crud, I'll
+ just fix it tomorrow! -->
+ <!--tgcrud-version>11.3.0-TG-RELEASE</tgcrud-version -->
<guava-version>15.0</guava-version>
<junit-version>4.13.2</junit-version>
- <servlet-api.version>3.1.0</servlet-api.version>
+ <servlet-api-version>3.1.0</servlet-api-version>
<spring-version>3.2.6.RELEASE</spring-version>
- <git-commit-id-plugin.version>2.1.15</git-commit-id-plugin.version>
- <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
- <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
- <!-- The following properties are used for configuring the web service
+ <git-commit-id-plugin-version>2.1.15</git-commit-id-plugin-version>
+ <maven-compiler-plugin-version>3.9.0</maven-compiler-plugin-version>
+ <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
+ <maven-failsafe-plugin-version>2.8.1</maven-failsafe-plugin-version>
+ <maven-site-plugin-version>3.4</maven-site-plugin-version>
+ <tomcat6-maven-plugin-version>2.1</tomcat6-maven-plugin-version>
+ <build-helper-maven-plugin-version>1.5</build-helper-maven-plugin-version>
+ <maven-surefire-plugin-version>2.14</maven-surefire-plugin-version>
+ <maven-war-plugin-version>2.3</maven-war-plugin-version>
+ <maven-project-info-reports-plugin>2.8</maven-project-info-reports-plugin>
+ <sphinx-maven-plugin-version>1.0.3</sphinx-maven-plugin-version>
+ <icu4j-version>51.1</icu4j-version>
+ <vafer-version>1.4</vafer-version>
+ <epubcheck-version>4.0.0-alpha11</epubcheck-version>
+ <xmlunit-version>1.5</xmlunit-version>
+ <lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
+ <!-- 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://textgridlab.org/1.0/confserv</aggregator.textgridrep.default>
@@ -76,7 +90,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
- </repositories>
+ </repositories>
<distributionManagement>
<snapshotRepository>
@@ -161,23 +175,23 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${servlet-api.version}</version>
+ <version>${servlet-api-version}</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>51.1</version>
+ <version>${icu4j-version}</version>
</dependency>
<dependency>
<groupId>org.idpf</groupId>
<artifactId>epubcheck</artifactId>
- <version>4.0.0-alpha11</version>
+ <version>${epubcheck-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.5</version>
+ <version>${xmlunit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -188,7 +202,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>${tomcat6-maven-plugin-version}</version>
<executions>
<execution>
<id>default-cli</id>
@@ -206,16 +220,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
+ <version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>${java-source.version}</source>
- <target>${java-target.version}</target>
+ <source>${java-source-version}</source>
+ <target>${java-target-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>${maven-eclipse-plugin.version}</version>
+ <version>${maven-eclipse-plugin-version}</version>
<configuration>
<projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
<wtpmanifest>true</wtpmanifest>
@@ -223,12 +237,12 @@
<wtpversion>2.0</wtpversion>
</configuration>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
+ <version>${lifecycle-mapping-version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
@@ -261,7 +275,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <version>${git-commit-id-plugin.version}</version>
+ <version>${git-commit-id-plugin-version}</version>
<executions>
<execution>
<goals>
@@ -283,15 +297,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
<configuration>
- <source>${java-source.version}</source>
- <target>${java-target.version}</target>
+ <source>${java-source-version}</source>
+ <target>${java-target-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>${build-helper-maven-plugin-version}</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -326,6 +341,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
+ <version>${tomcat6-maven-plugin-version}</version>
<executions>
<execution>
<id>start-tomcat</id>
@@ -355,7 +371,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.8.1</version>
+ <version>${maven-failsafe-plugin-version}</version>
<executions>
<execution>
<id>integration-test</id>
@@ -379,7 +395,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.14</version>
+ <version>${maven-surefire-plugin-version}</version>
<configuration>
<systemPropertyVariables>
<webapp.directory>${project.basedir}/src/main/webapp</webapp.directory>
@@ -389,7 +405,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>${maven-war-plugin-version}</version>
<configuration>
<webResources>
<resource>
@@ -407,13 +423,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
+ <version>${maven-site-plugin-version}</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-project-info-reports-plugin}</version>
<reportSets>
<reportSet>
<reports />
@@ -423,7 +439,7 @@
<plugin>
<groupId>org.tomdz.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
- <version>1.0.3</version>
+ <version>${sphinx-maven-plugin-version}</version>
<configuration>
<sourceDirectory>${basedir}/docs</sourceDirectory>
</configuration>
@@ -489,7 +505,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.8.1</version>
+ <version>${maven-failsafe-plugin-version}</version>
<executions>
<execution>
<id>integration-test</id>
@@ -528,7 +544,7 @@
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
- <version>1.4</version>
+ <version>${vafer-version}</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/src/main/java/info/textgrid/services/aggregator/util/StylesheetManager.java b/src/main/java/info/textgrid/services/aggregator/util/StylesheetManager.java
index 49ec07ab1f89b903c19bd36e08f84568d4abf510..aab61732b7844fd02a79882be659a7876040dff4 100644
--- a/src/main/java/info/textgrid/services/aggregator/util/StylesheetManager.java
+++ b/src/main/java/info/textgrid/services/aggregator/util/StylesheetManager.java
@@ -144,6 +144,10 @@ public XsltExecutable getStylesheet(final URI uri,
if (forceLoad)
stylesheets.invalidate(uri);
+
+ System.out.println(" ## "+ uri);
+
+
return stylesheets.get(uri, new StylesheetLoader(uri, sid));
} catch (final ExecutionException e) {
final Throwable cause = e.getCause();
diff --git a/src/main/webapp/tei-stylesheets b/src/main/webapp/tei-stylesheets
index 1616df8470d0805356d6dc2b4926c81bec37a554..c1e614184e313aad200cfbdb6af27320d5009e38 160000
--- a/src/main/webapp/tei-stylesheets
+++ b/src/main/webapp/tei-stylesheets
@@ -1 +1 @@
-Subproject commit 1616df8470d0805356d6dc2b4926c81bec37a554
+Subproject commit c1e614184e313aad200cfbdb6af27320d5009e38