From e7c72fc7ecbc9211a6f97c7869ba3439cf4fa33f Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sun, 3 Jun 2012 01:45:42 +0200 Subject: [PATCH] =?utf8?q?Benennung=20und=20Ordnung=20der=20Beispiel-Modul?= =?utf8?q?e=20=C3=BCberarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- examples/jsp/catalog.xml | 4 ++++ .../jsp}/jetty.sh | 0 examples/jsp/pom.xml | 17 +++++++++++++++++ .../jsp}/src/main/resources/config.xml | 0 .../jsp}/src/main/resources/log4j.xml | 0 .../jsp}/src/main/webapp/WEB-INF/c.tld | 0 .../jsp}/src/main/webapp/WEB-INF/included.jsp | 0 .../main/webapp/WEB-INF/views/simple-page.jsp | 0 .../jsp}/src/main/webapp/WEB-INF/web.xml | 0 .../jsp}/src/main/webapp/default.css | 0 .../jsp}/src/main/webapp/index.html | 0 .../jsp}/src/main/webapp/page-with-forward.jsp | 0 .../jsp}/src/main/webapp/page-with-include.jsp | 0 .../jsp}/src/main/webapp/simple-page.jsp | 0 .../cachecontrol/examples/jsp/JspTest.java | 0 .../jsp}/tomcat.sh | 0 {cachecontrol-example-jsp => examples}/pom.xml | 14 +++++++++----- pom.xml | 2 +- 18 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 examples/jsp/catalog.xml rename {cachecontrol-example-jsp => examples/jsp}/jetty.sh (100%) create mode 100644 examples/jsp/pom.xml rename {cachecontrol-example-jsp => examples/jsp}/src/main/resources/config.xml (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/resources/log4j.xml (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/WEB-INF/c.tld (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/WEB-INF/included.jsp (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/WEB-INF/views/simple-page.jsp (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/WEB-INF/web.xml (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/default.css (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/index.html (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/page-with-forward.jsp (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/page-with-include.jsp (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/main/webapp/simple-page.jsp (100%) rename {cachecontrol-example-jsp => examples/jsp}/src/test/java/de/halbekunst/cachecontrol/examples/jsp/JspTest.java (100%) rename {cachecontrol-example-jsp => examples/jsp}/tomcat.sh (100%) rename {cachecontrol-example-jsp => examples}/pom.xml (92%) diff --git a/examples/jsp/catalog.xml b/examples/jsp/catalog.xml new file mode 100644 index 00000000..218f47c2 --- /dev/null +++ b/examples/jsp/catalog.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/cachecontrol-example-jsp/jetty.sh b/examples/jsp/jetty.sh similarity index 100% rename from cachecontrol-example-jsp/jetty.sh rename to examples/jsp/jetty.sh diff --git a/examples/jsp/pom.xml b/examples/jsp/pom.xml new file mode 100644 index 00000000..d9f3c6a2 --- /dev/null +++ b/examples/jsp/pom.xml @@ -0,0 +1,17 @@ + + + + 4.0.0 + + + de.halbekunst + juplo-examples + 2.0-SNAPSHOT + + + ${pom.parent.artifactId}-jsp + war + Juplo - Examples: JSP-Pages + + diff --git a/cachecontrol-example-jsp/src/main/resources/config.xml b/examples/jsp/src/main/resources/config.xml similarity index 100% rename from cachecontrol-example-jsp/src/main/resources/config.xml rename to examples/jsp/src/main/resources/config.xml diff --git a/cachecontrol-example-jsp/src/main/resources/log4j.xml b/examples/jsp/src/main/resources/log4j.xml similarity index 100% rename from cachecontrol-example-jsp/src/main/resources/log4j.xml rename to examples/jsp/src/main/resources/log4j.xml diff --git a/cachecontrol-example-jsp/src/main/webapp/WEB-INF/c.tld b/examples/jsp/src/main/webapp/WEB-INF/c.tld similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/WEB-INF/c.tld rename to examples/jsp/src/main/webapp/WEB-INF/c.tld diff --git a/cachecontrol-example-jsp/src/main/webapp/WEB-INF/included.jsp b/examples/jsp/src/main/webapp/WEB-INF/included.jsp similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/WEB-INF/included.jsp rename to examples/jsp/src/main/webapp/WEB-INF/included.jsp diff --git a/cachecontrol-example-jsp/src/main/webapp/WEB-INF/views/simple-page.jsp b/examples/jsp/src/main/webapp/WEB-INF/views/simple-page.jsp similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/WEB-INF/views/simple-page.jsp rename to examples/jsp/src/main/webapp/WEB-INF/views/simple-page.jsp diff --git a/cachecontrol-example-jsp/src/main/webapp/WEB-INF/web.xml b/examples/jsp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/WEB-INF/web.xml rename to examples/jsp/src/main/webapp/WEB-INF/web.xml diff --git a/cachecontrol-example-jsp/src/main/webapp/default.css b/examples/jsp/src/main/webapp/default.css similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/default.css rename to examples/jsp/src/main/webapp/default.css diff --git a/cachecontrol-example-jsp/src/main/webapp/index.html b/examples/jsp/src/main/webapp/index.html similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/index.html rename to examples/jsp/src/main/webapp/index.html diff --git a/cachecontrol-example-jsp/src/main/webapp/page-with-forward.jsp b/examples/jsp/src/main/webapp/page-with-forward.jsp similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/page-with-forward.jsp rename to examples/jsp/src/main/webapp/page-with-forward.jsp diff --git a/cachecontrol-example-jsp/src/main/webapp/page-with-include.jsp b/examples/jsp/src/main/webapp/page-with-include.jsp similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/page-with-include.jsp rename to examples/jsp/src/main/webapp/page-with-include.jsp diff --git a/cachecontrol-example-jsp/src/main/webapp/simple-page.jsp b/examples/jsp/src/main/webapp/simple-page.jsp similarity index 100% rename from cachecontrol-example-jsp/src/main/webapp/simple-page.jsp rename to examples/jsp/src/main/webapp/simple-page.jsp diff --git a/cachecontrol-example-jsp/src/test/java/de/halbekunst/cachecontrol/examples/jsp/JspTest.java b/examples/jsp/src/test/java/de/halbekunst/cachecontrol/examples/jsp/JspTest.java similarity index 100% rename from cachecontrol-example-jsp/src/test/java/de/halbekunst/cachecontrol/examples/jsp/JspTest.java rename to examples/jsp/src/test/java/de/halbekunst/cachecontrol/examples/jsp/JspTest.java diff --git a/cachecontrol-example-jsp/tomcat.sh b/examples/jsp/tomcat.sh similarity index 100% rename from cachecontrol-example-jsp/tomcat.sh rename to examples/jsp/tomcat.sh diff --git a/cachecontrol-example-jsp/pom.xml b/examples/pom.xml similarity index 92% rename from cachecontrol-example-jsp/pom.xml rename to examples/pom.xml index 1b78cb5e..28a64a6b 100644 --- a/cachecontrol-example-jsp/pom.xml +++ b/examples/pom.xml @@ -10,16 +10,20 @@ 2.0-SNAPSHOT - ${pom.parent.artifactId}-cachecontrol-example-jsp - war - Juplo - CacheControl - Examples: JSP-Page + juplo-examples + pom + Juplo - Examples + + + jsp + ${pom.parent.groupId} - ${pom.parent.artifactId}-cachecontrol + juplo-cachecontrol ${pom.parent.version} runtime @@ -77,7 +81,7 @@ ${pom.parent.groupId} - ${pom.parent.artifactId}-test + juplo-test ${pom.parent.version} diff --git a/pom.xml b/pom.xml index 624e53dc..97cb6a2e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ test cachecontrol - cachecontrol-example-jsp + examples -- 2.20.1