From df8b9a3c95e6976de0cc894ec4a3946423ae06a1 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Fri, 22 May 2015 21:57:57 +0200
Subject: [PATCH] Moved stylesheets out of the WEB-INF directory
---
.gitmodules | 2 +-
src/main/java/info/textgrid/services/aggregator/Help.java | 2 +-
.../java/info/textgrid/services/aggregator/Version.java | 2 +-
.../textgrid/services/aggregator/epub/EPUBSerializer.java | 6 +++---
.../info/textgrid/services/aggregator/html/HTMLWriter.java | 6 +++---
.../java/info/textgrid/services/aggregator/pdf/PDF.java | 2 +-
.../info/textgrid/services/aggregator/zip/ZipResult.java | 4 ++--
src/main/webapp/{WEB-INF => }/stylesheets/corpus2groups.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/db2xhtml.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/epub-agg.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/epub.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/extractbody.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/frame.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/preview.xsl | 0
src/main/webapp/{WEB-INF => }/stylesheets/tghtml-common.xsl | 0
.../stylesheets/wadl_documentation-2009-02.xsl | 0
src/main/webapp/{WEB-INF => }/tei-stylesheets | 0
.../textgrid/services/aggregator/StylesheetManagerTest.java | 2 +-
18 files changed, 13 insertions(+), 13 deletions(-)
rename src/main/webapp/{WEB-INF => }/stylesheets/corpus2groups.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/db2xhtml.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/epub-agg.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/epub.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/extractbody.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/frame.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/preview.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/tghtml-common.xsl (100%)
rename src/main/webapp/{WEB-INF => }/stylesheets/wadl_documentation-2009-02.xsl (100%)
rename src/main/webapp/{WEB-INF => }/tei-stylesheets (100%)
diff --git a/.gitmodules b/.gitmodules
index 365c24f..8c7200c 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 f470608..9e66516 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 4b27f7e..b0a1108 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 dbcf622..7dbae50 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 7f1b408..7634714 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 bbb127b..4a9bfd4 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 5004a35..b151186 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 20bd8fb..8d69a41 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
--
GitLab