diff --git a/.gitmodules b/.gitmodules
index 365c24fdd1edb3e60a57a0af48f29a52dae34725..8c7200c62baf9b47a394eae4039bb002074a29bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "tei-stylesheets"]
- path = src/main/webapp/WEB-INF/tei-stylesheets
+ path = src/main/webapp/tei-stylesheets
url = https://github.com/TEIC/Stylesheets.git
diff --git a/src/main/java/info/textgrid/services/aggregator/Help.java b/src/main/java/info/textgrid/services/aggregator/Help.java
index f4706082780c2957019e265901bcea1dfda30053..9e665164489351ba0872a97d44bb87f878eeea70 100644
--- a/src/main/java/info/textgrid/services/aggregator/Help.java
+++ b/src/main/java/info/textgrid/services/aggregator/Help.java
@@ -45,7 +45,7 @@ public void write(final OutputStream output) throws IOException,
try {
final XsltTransformer transformer = stylesheetManager
.getStylesheet(
- URI.create("/WEB-INF/stylesheets/wadl_documentation-2009-02.xsl"),
+ URI.create("/stylesheets/wadl_documentation-2009-02.xsl"),
Optional.<String> absent(), false, false).load();
final Serializer serializer = stylesheetManager.xsltProcessor
.newSerializer(output);
diff --git a/src/main/java/info/textgrid/services/aggregator/Version.java b/src/main/java/info/textgrid/services/aggregator/Version.java
index 4b27f7e6eec686c72facc0d54d4922fc7b05d132..b0a1108a524f1948f26471b0cb57813725e58df7 100644
--- a/src/main/java/info/textgrid/services/aggregator/Version.java
+++ b/src/main/java/info/textgrid/services/aggregator/Version.java
@@ -110,7 +110,7 @@ public void write(final OutputStream outputStream)
out.printf("<p>Using TG-crud version: <strong>%s</strong>\n",
repository.getCRUDService().getVersion());
- final URL xslVersionURL = stylesheetManager.resolveInternalPath("/WEB-INF/tei-stylesheets/VERSION");
+ final URL xslVersionURL = stylesheetManager.resolveInternalPath("/tei-stylesheets/VERSION");
final InputStream xslVersionStream = xslVersionURL.openStream();
final String xslVersion = CharStreams.toString(new InputStreamReader(xslVersionStream));
out.printf("<p>Using TEI stylesheets version: <strong>%s</strong>\n", xslVersion);
diff --git a/src/main/java/info/textgrid/services/aggregator/epub/EPUBSerializer.java b/src/main/java/info/textgrid/services/aggregator/epub/EPUBSerializer.java
index dbcf622bc971ba8241d647c97a1ef702bed38213..7dbae503768164c315fcd63b2fafc326d5df02e3 100644
--- a/src/main/java/info/textgrid/services/aggregator/epub/EPUBSerializer.java
+++ b/src/main/java/info/textgrid/services/aggregator/epub/EPUBSerializer.java
@@ -46,9 +46,9 @@ public class EPUBSerializer extends CorpusBasedExporter implements
StreamingOutput {
private static final URI EPUB_XSL = URI
- .create("/WEB-INF/stylesheets/epub.xsl");
- private static final URI GROUP_XSL = URI.create("/WEB-INF/stylesheets/corpus2groups.xsl");
- private static final URI EPUB_AGG_XSL = URI.create("/WEB-INF/stylesheets/epub-agg.xsl");
+ .create("/stylesheets/epub.xsl");
+ private static final URI GROUP_XSL = URI.create("/stylesheets/corpus2groups.xsl");
+ private static final URI EPUB_AGG_XSL = URI.create("/stylesheets/epub-agg.xsl");
private static final Logger logger = Logger.getLogger(EPUBSerializer.class
.getCanonicalName());
diff --git a/src/main/java/info/textgrid/services/aggregator/html/HTMLWriter.java b/src/main/java/info/textgrid/services/aggregator/html/HTMLWriter.java
index 7f1b4081565b0355451faa1eeb236ebbcf66a11e..7634714d139471a0350d15d21622e153a523cff8 100644
--- a/src/main/java/info/textgrid/services/aggregator/html/HTMLWriter.java
+++ b/src/main/java/info/textgrid/services/aggregator/html/HTMLWriter.java
@@ -75,9 +75,9 @@
*
*/
public class HTMLWriter extends CorpusBasedExporter implements StreamingOutput {
- private static final URI TO_HTML_XSL = URI.create("/WEB-INF/stylesheets/db2xhtml.xsl");
- private static final URI EXTRACT_BODY_XSL = URI.create("/WEB-INF/stylesheets/extractbody.xsl");
- private static final URI SIMULATE_XSL = URI.create("/WEB-INF/stylesheets/frame.xsl");
+ private static final URI TO_HTML_XSL = URI.create("/stylesheets/db2xhtml.xsl");
+ private static final URI EXTRACT_BODY_XSL = URI.create("/stylesheets/extractbody.xsl");
+ private static final URI SIMULATE_XSL = URI.create("/stylesheets/frame.xsl");
private Optional<URI> explicitStylesheetURI = Optional.absent();
private boolean refreshStylesheet = false;
diff --git a/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java b/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java
index bbb127b092d9e96feabba85f0b5cf2405df93fda..4a9bfd43d23be044e9fa9016bf82ef3dd78419f7 100644
--- a/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java
+++ b/src/main/java/info/textgrid/services/aggregator/pdf/PDF.java
@@ -51,7 +51,7 @@
"this service is deployed.")
public class PDF extends AbstractExporter {
- private static final URI TO_PDF_XSL = URI.create("/WEB-INF/tei-stylesheets/latex/latex.xsl");
+ private static final URI TO_PDF_XSL = URI.create("/tei-stylesheets/latex/latex.xsl");
final Logger logger = Logger
.getLogger("info.textgrid.services.aggregator.pdf");
diff --git a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
index 5004a351c73e065b10aed17960dd04ac638aac8c..b1511869c7570f584f28f038e2d7d4c101a3de8f 100644
--- a/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
+++ b/src/main/java/info/textgrid/services/aggregator/zip/ZipResult.java
@@ -181,10 +181,10 @@ public Transformation(String targetFormat, String stylesheet) {
.<String, Transformation> builder()
.put("text",
new Transformation("text/plain",
- "/WEB-INF/tei-stylesheets/txt/tei-to-text.xsl"))
+ "/tei-stylesheets/txt/tei-to-text.xsl"))
.put("html",
new Transformation("text/html",
- "/WEB-INF/stylesheets/db2xhtml.xsl")).build();
+ "/stylesheets/db2xhtml.xsl")).build();
private void setupTransform(String transform) {
if (transform == null || transform.isEmpty())
diff --git a/src/main/webapp/WEB-INF/stylesheets/corpus2groups.xsl b/src/main/webapp/stylesheets/corpus2groups.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/corpus2groups.xsl
rename to src/main/webapp/stylesheets/corpus2groups.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/db2xhtml.xsl b/src/main/webapp/stylesheets/db2xhtml.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/db2xhtml.xsl
rename to src/main/webapp/stylesheets/db2xhtml.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/epub-agg.xsl b/src/main/webapp/stylesheets/epub-agg.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/epub-agg.xsl
rename to src/main/webapp/stylesheets/epub-agg.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/epub.xsl b/src/main/webapp/stylesheets/epub.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/epub.xsl
rename to src/main/webapp/stylesheets/epub.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/extractbody.xsl b/src/main/webapp/stylesheets/extractbody.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/extractbody.xsl
rename to src/main/webapp/stylesheets/extractbody.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/frame.xsl b/src/main/webapp/stylesheets/frame.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/frame.xsl
rename to src/main/webapp/stylesheets/frame.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/preview.xsl b/src/main/webapp/stylesheets/preview.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/preview.xsl
rename to src/main/webapp/stylesheets/preview.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/tghtml-common.xsl b/src/main/webapp/stylesheets/tghtml-common.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/tghtml-common.xsl
rename to src/main/webapp/stylesheets/tghtml-common.xsl
diff --git a/src/main/webapp/WEB-INF/stylesheets/wadl_documentation-2009-02.xsl b/src/main/webapp/stylesheets/wadl_documentation-2009-02.xsl
similarity index 100%
rename from src/main/webapp/WEB-INF/stylesheets/wadl_documentation-2009-02.xsl
rename to src/main/webapp/stylesheets/wadl_documentation-2009-02.xsl
diff --git a/src/main/webapp/WEB-INF/tei-stylesheets b/src/main/webapp/tei-stylesheets
similarity index 100%
rename from src/main/webapp/WEB-INF/tei-stylesheets
rename to src/main/webapp/tei-stylesheets
diff --git a/src/test/java/info/textgrid/services/aggregator/StylesheetManagerTest.java b/src/test/java/info/textgrid/services/aggregator/StylesheetManagerTest.java
index 20bd8fb2e8112187809f5477c0a157be3cf0e4e6..8d69a41cd6430e8413ff623f3aa1bd994ec551e8 100644
--- a/src/test/java/info/textgrid/services/aggregator/StylesheetManagerTest.java
+++ b/src/test/java/info/textgrid/services/aggregator/StylesheetManagerTest.java
@@ -18,7 +18,7 @@
public class StylesheetManagerTest {
- private static URI INTERNAL_XSL = URI.create("/WEB-INF/tei-stylesheets/html/html.xsl");
+ private static URI INTERNAL_XSL = URI.create("/tei-stylesheets/html/html.xsl");
private StylesheetManager manager;
@Before