From a6e0e65cce68acb20abc6ca935471611a740c342 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Thu, 23 Aug 2012 22:20:53 +0200 Subject: [PATCH] =?utf8?q?Projekt=20von=20de.halbekunst.juplo=20nach=20de.?= =?utf8?q?juplo=20verschoben=20und=20aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../jsp/jetty.sh | 0 .../jsp}/pom.xml | 10 +- .../jsp}/src/main/resources/config.xml | 2 +- .../jsp}/src/main/resources/log4j.xml | 2 +- .../jsp/src/main/webapp/WEB-INF/c.tld | 0 .../jsp/src/main/webapp/WEB-INF/included.jsp | 0 .../jsp/src/main/webapp/WEB-INF/web.xml | 4 +- .../jsp/src/main/webapp/faulty-page.jsp | 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 .../juplo/accelerator}/examples/JspTest.java | 4 +- .../jsp/tomcat.sh | 0 {examples => accelerator-examples}/pom.xml | 106 +++++++-- .../servlet/jetty.sh | 0 .../servlet}/pom.xml | 10 +- .../accelerator}/examples/FaultyServlet.java | 2 +- .../servlet/src/main/resources/config.xml | 2 +- .../servlet/src/main/resources/log4j.xml | 2 +- .../servlet/src/main/webapp/WEB-INF/web.xml | 8 +- .../servlet/src/main/webapp/index.html | 0 .../accelerator}/examples/ServletTest.java | 4 +- .../servlet/tomcat.sh | 0 .../spring/jetty.sh | 0 .../spring/pom.xml | 10 +- .../examples/spring/FaultyController.java | 12 +- .../examples/spring/SpringController.java | 8 +- .../spring/src/main/resources/config.xml | 4 +- .../spring/src/main/resources/log4j.xml | 2 +- .../webapp/WEB-INF/views/controller-view.jsp | 0 .../main/webapp/WEB-INF/views/faulty-page.jsp | 0 .../src/main/webapp/WEB-INF/views/index.jsp | 0 .../main/webapp/WEB-INF/views/spring-page.jsp | 0 .../spring/src/main/webapp/WEB-INF/web.xml | 4 +- .../spring/src/main/webapp/index.jsp | 0 .../accelerator}/examples/SpringMVCTest.java | 4 +- .../spring/tomcat.sh | 0 .../static/jetty.sh | 0 .../static/pom.xml | 10 +- .../static}/src/main/resources/config.xml | 2 +- .../static}/src/main/resources/log4j.xml | 2 +- .../static/src/main/webapp/WEB-INF/web.xml | 4 +- .../static/src/main/webapp/index.html | 0 .../static/src/main/webapp/static/page.html | 0 .../src/main/webapp/static/stylesheets.css | 0 .../accelerator}/examples/StaticTest.java | 4 +- .../eclipse/jetty/servlet/DefaultServlet.java | 0 accelerator/pom.xml | 211 ++++++++++++++++++ .../juplo/accelerator}/AcceleratorFilter.java | 2 +- .../de/juplo/accelerator}/CacheControl.java | 18 +- .../accelerator}/CacheControlInterceptor.java | 6 +- .../juplo/accelerator}/CacheMethodHandle.java | 2 +- .../java/de/juplo/accelerator}/Headers.java | 2 +- .../accelerator}/annotations/Accepts.java | 2 +- .../annotations/AdditionalHeaders.java | 2 +- .../annotations/CacheControl.java | 2 +- .../annotations/CacheSeconds.java | 2 +- .../accelerator}/annotations/Cacheable.java | 2 +- .../juplo/accelerator}/annotations/ETag.java | 2 +- .../annotations/LastModified.java | 2 +- .../servletunit/ServletUnitHttpResponse.java | 0 .../accelerator}/ParameterGuessingTest.java | 4 +- .../juplo/accelerator}/RequestSizeTest.java | 6 +- .../de/juplo/accelerator}/TestServlet.java | 4 +- .../src/test/resources/config.xml | 2 +- .../src/test/resources/log4j.xml | 2 +- .../src/test/resources/web.xml | 4 +- cachecontrol/pom.xml | 92 -------- examples/jsp/catalog.xml | 5 - maven-plugins/hibernate4/pom.xml | 172 ++++++++++++++ .../plugins/hibernate4}/Hbm2DdlMojo.java | 2 +- {maven => maven-plugins}/pom.xml | 11 +- maven/hibernate4-maven-plugin/pom.xml | 45 ---- percentcodec/pom.xml | 166 ++++++++++++++ .../de/juplo/percentcodec}/PercentCodec.java | 2 +- .../juplo/percentcodec}/PercentCodecTest.java | 3 +- .../src/test/resources/log4j.xml | 0 pom.xml | 137 ++---------- test/pom.xml | 72 ------ testingtools/pom.xml | 184 +++++++++++++++ .../de/juplo/testingtools}/HttpTestCase.java | 2 +- .../LoggingHttpServletResponseFilter.java | 2 +- .../LoggingHttpServletResponseWrapper.java | 2 +- .../WebContextTestExecutionListener.java | 2 +- utils/pom.xml | 61 ----- 86 files changed, 935 insertions(+), 524 deletions(-) rename {examples => accelerator-examples}/jsp/jetty.sh (100%) rename {examples/servlet => accelerator-examples/jsp}/pom.xml (59%) rename {examples/static => accelerator-examples/jsp}/src/main/resources/config.xml (94%) rename {examples/static => accelerator-examples/jsp}/src/main/resources/log4j.xml (94%) rename {examples => accelerator-examples}/jsp/src/main/webapp/WEB-INF/c.tld (100%) rename {examples => accelerator-examples}/jsp/src/main/webapp/WEB-INF/included.jsp (100%) rename {examples => accelerator-examples}/jsp/src/main/webapp/WEB-INF/web.xml (86%) rename {examples => accelerator-examples}/jsp/src/main/webapp/faulty-page.jsp (100%) rename {examples => accelerator-examples}/jsp/src/main/webapp/index.html (100%) rename {examples => accelerator-examples}/jsp/src/main/webapp/page-with-forward.jsp (100%) rename {examples => accelerator-examples}/jsp/src/main/webapp/page-with-include.jsp (100%) rename {examples => accelerator-examples}/jsp/src/main/webapp/simple-page.jsp (100%) rename {examples/jsp/src/test/java/de/halbekunst/cachecontrol => accelerator-examples/jsp/src/test/java/de/juplo/accelerator}/examples/JspTest.java (92%) rename {examples => accelerator-examples}/jsp/tomcat.sh (100%) rename {examples => accelerator-examples}/pom.xml (56%) rename {examples => accelerator-examples}/servlet/jetty.sh (100%) rename {examples/jsp => accelerator-examples/servlet}/pom.xml (59%) rename {examples/servlet/src/main/java/de/halbekunst/cachecontrol => accelerator-examples/servlet/src/main/java/de/juplo/accelerator}/examples/FaultyServlet.java (96%) rename {examples => accelerator-examples}/servlet/src/main/resources/config.xml (96%) rename {examples => accelerator-examples}/servlet/src/main/resources/log4j.xml (94%) rename {examples => accelerator-examples}/servlet/src/main/webapp/WEB-INF/web.xml (84%) rename {examples => accelerator-examples}/servlet/src/main/webapp/index.html (100%) rename {examples/servlet/src/test/java/de/halbekunst/cachecontrol => accelerator-examples/servlet/src/test/java/de/juplo/accelerator}/examples/ServletTest.java (86%) rename {examples => accelerator-examples}/servlet/tomcat.sh (100%) rename {examples => accelerator-examples}/spring/jetty.sh (100%) rename {examples => accelerator-examples}/spring/pom.xml (79%) rename {examples/spring/src/main/java/de/halbekunst/juplo => accelerator-examples/spring/src/main/java/de/juplo/accelerator}/examples/spring/FaultyController.java (73%) rename {examples/spring/src/main/java/de/halbekunst/juplo => accelerator-examples/spring/src/main/java/de/juplo/accelerator}/examples/spring/SpringController.java (88%) rename {examples => accelerator-examples}/spring/src/main/resources/config.xml (93%) rename {examples => accelerator-examples}/spring/src/main/resources/log4j.xml (94%) rename {examples => accelerator-examples}/spring/src/main/webapp/WEB-INF/views/controller-view.jsp (100%) rename {examples => accelerator-examples}/spring/src/main/webapp/WEB-INF/views/faulty-page.jsp (100%) rename {examples => accelerator-examples}/spring/src/main/webapp/WEB-INF/views/index.jsp (100%) rename {examples => accelerator-examples}/spring/src/main/webapp/WEB-INF/views/spring-page.jsp (100%) rename {examples => accelerator-examples}/spring/src/main/webapp/WEB-INF/web.xml (90%) rename {examples => accelerator-examples}/spring/src/main/webapp/index.jsp (100%) rename {examples/spring/src/test/java/de/halbekunst/cachecontrol => accelerator-examples/spring/src/test/java/de/juplo/accelerator}/examples/SpringMVCTest.java (87%) rename {examples => accelerator-examples}/spring/tomcat.sh (100%) rename {examples => accelerator-examples}/static/jetty.sh (100%) rename {examples => accelerator-examples}/static/pom.xml (70%) rename {examples/jsp => accelerator-examples/static}/src/main/resources/config.xml (94%) rename {examples/jsp => accelerator-examples/static}/src/main/resources/log4j.xml (94%) rename {examples => accelerator-examples}/static/src/main/webapp/WEB-INF/web.xml (88%) rename {examples => accelerator-examples}/static/src/main/webapp/index.html (100%) rename {examples => accelerator-examples}/static/src/main/webapp/static/page.html (100%) rename {examples => accelerator-examples}/static/src/main/webapp/static/stylesheets.css (100%) rename {examples/static/src/test/java/de/halbekunst/cachecontrol => accelerator-examples/static/src/test/java/de/juplo/accelerator}/examples/StaticTest.java (86%) rename {examples => accelerator-examples}/static/src/test/java/org/eclipse/jetty/servlet/DefaultServlet.java (100%) create mode 100644 accelerator/pom.xml rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/AcceleratorFilter.java (99%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/CacheControl.java (97%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/CacheControlInterceptor.java (92%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/CacheMethodHandle.java (92%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/Headers.java (95%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/Accepts.java (95%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/AdditionalHeaders.java (86%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/CacheControl.java (95%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/CacheSeconds.java (97%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/Cacheable.java (96%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/ETag.java (98%) rename {cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol => accelerator/src/main/java/de/juplo/accelerator}/annotations/LastModified.java (97%) rename {cachecontrol => accelerator}/src/test/java/com/meterware/servletunit/ServletUnitHttpResponse.java (100%) rename {cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol => accelerator/src/test/java/de/juplo/accelerator}/ParameterGuessingTest.java (99%) rename {cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol => accelerator/src/test/java/de/juplo/accelerator}/RequestSizeTest.java (98%) rename {test/src/main/java/de/halbekunst/juplo/test => accelerator/src/test/java/de/juplo/accelerator}/TestServlet.java (97%) rename {cachecontrol => accelerator}/src/test/resources/config.xml (94%) rename {cachecontrol => accelerator}/src/test/resources/log4j.xml (94%) rename {cachecontrol => accelerator}/src/test/resources/web.xml (82%) delete mode 100644 cachecontrol/pom.xml delete mode 100644 examples/jsp/catalog.xml create mode 100644 maven-plugins/hibernate4/pom.xml rename {maven/hibernate4-maven-plugin/src/main/java/de/halbekunst => maven-plugins/hibernate4/src/main/java/de/juplo/plugins/hibernate4}/Hbm2DdlMojo.java (99%) rename {maven => maven-plugins}/pom.xml (69%) delete mode 100644 maven/hibernate4-maven-plugin/pom.xml create mode 100644 percentcodec/pom.xml rename {utils/src/main/java/de/halbekunst/juplo/utils => percentcodec/src/main/java/de/juplo/percentcodec}/PercentCodec.java (99%) rename {utils/src/test/java/de/halbekunst/juplo/utils => percentcodec/src/test/java/de/juplo/percentcodec}/PercentCodecTest.java (98%) rename {utils => percentcodec}/src/test/resources/log4j.xml (100%) delete mode 100644 test/pom.xml create mode 100644 testingtools/pom.xml rename {test/src/main/java/de/halbekunst/juplo/test => testingtools/src/main/java/de/juplo/testingtools}/HttpTestCase.java (98%) rename {test/src/main/java/de/halbekunst/juplo/test => testingtools/src/main/java/de/juplo/testingtools}/LoggingHttpServletResponseFilter.java (97%) rename {test/src/main/java/de/halbekunst/juplo/test => testingtools/src/main/java/de/juplo/testingtools}/LoggingHttpServletResponseWrapper.java (99%) rename {test/src/main/java/de/halbekunst/juplo/test => testingtools/src/main/java/de/juplo/testingtools}/WebContextTestExecutionListener.java (98%) delete mode 100644 utils/pom.xml diff --git a/examples/jsp/jetty.sh b/accelerator-examples/jsp/jetty.sh similarity index 100% rename from examples/jsp/jetty.sh rename to accelerator-examples/jsp/jetty.sh diff --git a/examples/servlet/pom.xml b/accelerator-examples/jsp/pom.xml similarity index 59% rename from examples/servlet/pom.xml rename to accelerator-examples/jsp/pom.xml index 313fe7c1..dc99eb68 100644 --- a/examples/servlet/pom.xml +++ b/accelerator-examples/jsp/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - de.halbekunst - juplo-examples - 2.0-SNAPSHOT + de.juplo + juplo-accelerator-examples + 0.1-SNAPSHOT - juplo-examples-servlet + juplo-accelerator-examples-jsp war - Juplo - Examples: Servlet + Juplo - Accelerator-Examples: JSP-Pages diff --git a/examples/static/src/main/resources/config.xml b/accelerator-examples/jsp/src/main/resources/config.xml similarity index 94% rename from examples/static/src/main/resources/config.xml rename to accelerator-examples/jsp/src/main/resources/config.xml index e414ce93..a04b130c 100644 --- a/examples/static/src/main/resources/config.xml +++ b/accelerator-examples/jsp/src/main/resources/config.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/examples/static/src/main/resources/log4j.xml b/accelerator-examples/jsp/src/main/resources/log4j.xml similarity index 94% rename from examples/static/src/main/resources/log4j.xml rename to accelerator-examples/jsp/src/main/resources/log4j.xml index d3414bdb..b1e35f82 100644 --- a/examples/static/src/main/resources/log4j.xml +++ b/accelerator-examples/jsp/src/main/resources/log4j.xml @@ -9,7 +9,7 @@ - + diff --git a/examples/jsp/src/main/webapp/WEB-INF/c.tld b/accelerator-examples/jsp/src/main/webapp/WEB-INF/c.tld similarity index 100% rename from examples/jsp/src/main/webapp/WEB-INF/c.tld rename to accelerator-examples/jsp/src/main/webapp/WEB-INF/c.tld diff --git a/examples/jsp/src/main/webapp/WEB-INF/included.jsp b/accelerator-examples/jsp/src/main/webapp/WEB-INF/included.jsp similarity index 100% rename from examples/jsp/src/main/webapp/WEB-INF/included.jsp rename to accelerator-examples/jsp/src/main/webapp/WEB-INF/included.jsp diff --git a/examples/jsp/src/main/webapp/WEB-INF/web.xml b/accelerator-examples/jsp/src/main/webapp/WEB-INF/web.xml similarity index 86% rename from examples/jsp/src/main/webapp/WEB-INF/web.xml rename to accelerator-examples/jsp/src/main/webapp/WEB-INF/web.xml index c5661f84..938240c7 100644 --- a/examples/jsp/src/main/webapp/WEB-INF/web.xml +++ b/accelerator-examples/jsp/src/main/webapp/WEB-INF/web.xml @@ -22,12 +22,12 @@ accelerator - de.halbekunst.juplo.cachecontrol.AcceleratorFilter + de.juplo.accelerator.AcceleratorFilter logger - de.halbekunst.juplo.test.LoggingHttpServletResponseFilter + de.juplo.testingtools.LoggingHttpServletResponseFilter diff --git a/examples/jsp/src/main/webapp/faulty-page.jsp b/accelerator-examples/jsp/src/main/webapp/faulty-page.jsp similarity index 100% rename from examples/jsp/src/main/webapp/faulty-page.jsp rename to accelerator-examples/jsp/src/main/webapp/faulty-page.jsp diff --git a/examples/jsp/src/main/webapp/index.html b/accelerator-examples/jsp/src/main/webapp/index.html similarity index 100% rename from examples/jsp/src/main/webapp/index.html rename to accelerator-examples/jsp/src/main/webapp/index.html diff --git a/examples/jsp/src/main/webapp/page-with-forward.jsp b/accelerator-examples/jsp/src/main/webapp/page-with-forward.jsp similarity index 100% rename from examples/jsp/src/main/webapp/page-with-forward.jsp rename to accelerator-examples/jsp/src/main/webapp/page-with-forward.jsp diff --git a/examples/jsp/src/main/webapp/page-with-include.jsp b/accelerator-examples/jsp/src/main/webapp/page-with-include.jsp similarity index 100% rename from examples/jsp/src/main/webapp/page-with-include.jsp rename to accelerator-examples/jsp/src/main/webapp/page-with-include.jsp diff --git a/examples/jsp/src/main/webapp/simple-page.jsp b/accelerator-examples/jsp/src/main/webapp/simple-page.jsp similarity index 100% rename from examples/jsp/src/main/webapp/simple-page.jsp rename to accelerator-examples/jsp/src/main/webapp/simple-page.jsp diff --git a/examples/jsp/src/test/java/de/halbekunst/cachecontrol/examples/JspTest.java b/accelerator-examples/jsp/src/test/java/de/juplo/accelerator/examples/JspTest.java similarity index 92% rename from examples/jsp/src/test/java/de/halbekunst/cachecontrol/examples/JspTest.java rename to accelerator-examples/jsp/src/test/java/de/juplo/accelerator/examples/JspTest.java index a7331b63..5000a9c5 100644 --- a/examples/jsp/src/test/java/de/halbekunst/cachecontrol/examples/JspTest.java +++ b/accelerator-examples/jsp/src/test/java/de/juplo/accelerator/examples/JspTest.java @@ -1,7 +1,7 @@ -package de.halbekunst.cachecontrol.examples; +package de.juplo.accelerator.examples; -import de.halbekunst.juplo.test.HttpTestCase; import com.meterware.httpunit.WebResponse; +import de.juplo.testingtools.HttpTestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/jsp/tomcat.sh b/accelerator-examples/jsp/tomcat.sh similarity index 100% rename from examples/jsp/tomcat.sh rename to accelerator-examples/jsp/tomcat.sh diff --git a/examples/pom.xml b/accelerator-examples/pom.xml similarity index 56% rename from examples/pom.xml rename to accelerator-examples/pom.xml index 1905f525..fcd9e1d9 100644 --- a/examples/pom.xml +++ b/accelerator-examples/pom.xml @@ -4,15 +4,24 @@ 4.0.0 - - de.halbekunst - juplo - 2.0-SNAPSHOT - - - juplo-examples + de.juplo + juplo-accelerator-examples + Juplo - Accelerator-Examples + 0.1-SNAPSHOT pom - Juplo - Examples + http://www.juplo.de/accelerator-examples + + + 2.0.6 + + + + + kai + Kai Moritz + kai@juplo.de + + jsp @@ -21,15 +30,32 @@ spring - + + + UTF-8 + + 1.6.11 + 1.3.2 + 6.0.29 + 1.0 + 1.2 + 4.8.1 + 1.0 + 0.1-SNAPSHOT + 1.2.16 + 2.5 + slf4j-log4j12 + 1.6.1 + 3.0.6.RELEASE + + - ${pom.parent.groupId} - juplo-cachecontrol - ${pom.parent.version} + de.juplo + juplo-accelerator + ${juplo-accelerator.version} - javax.servlet @@ -37,7 +63,6 @@ ${jstl.version} runtime - org.springframework @@ -70,7 +95,6 @@ ${aspectj.version} runtime - org.slf4j @@ -78,12 +102,11 @@ ${slf4j.version} runtime - - ${pom.parent.groupId} - juplo-test - ${pom.parent.version} + de.juplo + juplo-testingtools + ${juplo-testingtools.version} org.apache.tomcat @@ -91,15 +114,23 @@ ${jasper.version} test - + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + utf8 + true + + org.mortbay.jetty jetty-maven-plugin - ${jetty.version} @@ -135,4 +166,37 @@ + + + + maven-changes-plugin + + + maven-checkstyle-plugin + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + maven-javadoc-plugin + + + maven-jxr-plugin + + + maven-pmd-plugin + + true + 1.5 + + + + maven-surefire-report-plugin + 2.7.2 + + + + diff --git a/examples/servlet/jetty.sh b/accelerator-examples/servlet/jetty.sh similarity index 100% rename from examples/servlet/jetty.sh rename to accelerator-examples/servlet/jetty.sh diff --git a/examples/jsp/pom.xml b/accelerator-examples/servlet/pom.xml similarity index 59% rename from examples/jsp/pom.xml rename to accelerator-examples/servlet/pom.xml index 7eaed0bd..92a5e6fc 100644 --- a/examples/jsp/pom.xml +++ b/accelerator-examples/servlet/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - de.halbekunst - juplo-examples - 2.0-SNAPSHOT + de.juplo + juplo-accelerator-examples + 0.1-SNAPSHOT - juplo-examples-jsp + juplo-accelerator-examples-servlet war - Juplo - Examples: JSP-Pages + Juplo - Accelerator-Examples: Servlet diff --git a/examples/servlet/src/main/java/de/halbekunst/cachecontrol/examples/FaultyServlet.java b/accelerator-examples/servlet/src/main/java/de/juplo/accelerator/examples/FaultyServlet.java similarity index 96% rename from examples/servlet/src/main/java/de/halbekunst/cachecontrol/examples/FaultyServlet.java rename to accelerator-examples/servlet/src/main/java/de/juplo/accelerator/examples/FaultyServlet.java index bc382db9..d9eee5fb 100644 --- a/examples/servlet/src/main/java/de/halbekunst/cachecontrol/examples/FaultyServlet.java +++ b/accelerator-examples/servlet/src/main/java/de/juplo/accelerator/examples/FaultyServlet.java @@ -1,4 +1,4 @@ -package de.halbekunst.cachecontrol.examples; +package de.juplo.accelerator.examples; import java.io.IOException; import javax.servlet.ServletOutputStream; diff --git a/examples/servlet/src/main/resources/config.xml b/accelerator-examples/servlet/src/main/resources/config.xml similarity index 96% rename from examples/servlet/src/main/resources/config.xml rename to accelerator-examples/servlet/src/main/resources/config.xml index b7a4892e..cab80423 100644 --- a/examples/servlet/src/main/resources/config.xml +++ b/accelerator-examples/servlet/src/main/resources/config.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/examples/servlet/src/main/resources/log4j.xml b/accelerator-examples/servlet/src/main/resources/log4j.xml similarity index 94% rename from examples/servlet/src/main/resources/log4j.xml rename to accelerator-examples/servlet/src/main/resources/log4j.xml index d3414bdb..b1e35f82 100644 --- a/examples/servlet/src/main/resources/log4j.xml +++ b/accelerator-examples/servlet/src/main/resources/log4j.xml @@ -9,7 +9,7 @@ - + diff --git a/examples/servlet/src/main/webapp/WEB-INF/web.xml b/accelerator-examples/servlet/src/main/webapp/WEB-INF/web.xml similarity index 84% rename from examples/servlet/src/main/webapp/WEB-INF/web.xml rename to accelerator-examples/servlet/src/main/webapp/WEB-INF/web.xml index dc503d07..994a904e 100644 --- a/examples/servlet/src/main/webapp/WEB-INF/web.xml +++ b/accelerator-examples/servlet/src/main/webapp/WEB-INF/web.xml @@ -22,12 +22,12 @@ accelerator - de.halbekunst.juplo.cachecontrol.AcceleratorFilter + de.juplo.accelerator.AcceleratorFilter logger - de.halbekunst.juplo.test.LoggingHttpServletResponseFilter + de.juplo.testingtools.LoggingHttpServletResponseFilter @@ -56,11 +56,11 @@ test-servlet - de.halbekunst.juplo.test.TestServlet + de.juplo.testintools.TestServlet faulty-servlet - de.halbekunst.cachecontrol.examples.FaultyServlet + de.juplo.accelerator.examples.FaultyServlet diff --git a/examples/servlet/src/main/webapp/index.html b/accelerator-examples/servlet/src/main/webapp/index.html similarity index 100% rename from examples/servlet/src/main/webapp/index.html rename to accelerator-examples/servlet/src/main/webapp/index.html diff --git a/examples/servlet/src/test/java/de/halbekunst/cachecontrol/examples/ServletTest.java b/accelerator-examples/servlet/src/test/java/de/juplo/accelerator/examples/ServletTest.java similarity index 86% rename from examples/servlet/src/test/java/de/halbekunst/cachecontrol/examples/ServletTest.java rename to accelerator-examples/servlet/src/test/java/de/juplo/accelerator/examples/ServletTest.java index 32b13e11..77592ab0 100644 --- a/examples/servlet/src/test/java/de/halbekunst/cachecontrol/examples/ServletTest.java +++ b/accelerator-examples/servlet/src/test/java/de/juplo/accelerator/examples/ServletTest.java @@ -1,6 +1,6 @@ -package de.halbekunst.cachecontrol.examples; +package de.juplo.accelerator.examples; -import de.halbekunst.juplo.test.HttpTestCase; +import de.juplo.testingtools.HttpTestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/servlet/tomcat.sh b/accelerator-examples/servlet/tomcat.sh similarity index 100% rename from examples/servlet/tomcat.sh rename to accelerator-examples/servlet/tomcat.sh diff --git a/examples/spring/jetty.sh b/accelerator-examples/spring/jetty.sh similarity index 100% rename from examples/spring/jetty.sh rename to accelerator-examples/spring/jetty.sh diff --git a/examples/spring/pom.xml b/accelerator-examples/spring/pom.xml similarity index 79% rename from examples/spring/pom.xml rename to accelerator-examples/spring/pom.xml index b6924e41..4eddbc9a 100644 --- a/examples/spring/pom.xml +++ b/accelerator-examples/spring/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - de.halbekunst - juplo-examples - 2.0-SNAPSHOT + de.juplo + juplo-accelerator-examples + 0.1-SNAPSHOT - juplo-examples-spring + juplo-accelerator-examples-spring war - Juplo - Examples: Spring-MVC + Juplo - Accelerator-Examples: Spring-MVC diff --git a/examples/spring/src/main/java/de/halbekunst/juplo/examples/spring/FaultyController.java b/accelerator-examples/spring/src/main/java/de/juplo/accelerator/examples/spring/FaultyController.java similarity index 73% rename from examples/spring/src/main/java/de/halbekunst/juplo/examples/spring/FaultyController.java rename to accelerator-examples/spring/src/main/java/de/juplo/accelerator/examples/spring/FaultyController.java index 21ec8236..58c45c66 100644 --- a/examples/spring/src/main/java/de/halbekunst/juplo/examples/spring/FaultyController.java +++ b/accelerator-examples/spring/src/main/java/de/juplo/accelerator/examples/spring/FaultyController.java @@ -1,12 +1,8 @@ -package de.halbekunst.juplo.examples.spring; +package de.juplo.accelerator.examples.spring; -import de.halbekunst.juplo.cachecontrol.annotations.CacheSeconds; -import de.halbekunst.juplo.cachecontrol.annotations.Cacheable; -import de.halbekunst.juplo.cachecontrol.annotations.LastModified; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; +import de.juplo.accelerator.annotations.CacheSeconds; +import de.juplo.accelerator.annotations.Cacheable; +import de.juplo.accelerator.annotations.LastModified; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/examples/spring/src/main/java/de/halbekunst/juplo/examples/spring/SpringController.java b/accelerator-examples/spring/src/main/java/de/juplo/accelerator/examples/spring/SpringController.java similarity index 88% rename from examples/spring/src/main/java/de/halbekunst/juplo/examples/spring/SpringController.java rename to accelerator-examples/spring/src/main/java/de/juplo/accelerator/examples/spring/SpringController.java index 2ce8f4e3..66716587 100644 --- a/examples/spring/src/main/java/de/halbekunst/juplo/examples/spring/SpringController.java +++ b/accelerator-examples/spring/src/main/java/de/juplo/accelerator/examples/spring/SpringController.java @@ -1,8 +1,8 @@ -package de.halbekunst.juplo.examples.spring; +package de.juplo.accelerator.examples.spring; -import de.halbekunst.juplo.cachecontrol.annotations.CacheSeconds; -import de.halbekunst.juplo.cachecontrol.annotations.Cacheable; -import de.halbekunst.juplo.cachecontrol.annotations.LastModified; +import de.juplo.accelerator.annotations.CacheSeconds; +import de.juplo.accelerator.annotations.Cacheable; +import de.juplo.accelerator.annotations.LastModified; import java.util.Date; import java.util.HashMap; import java.util.Map; diff --git a/examples/spring/src/main/resources/config.xml b/accelerator-examples/spring/src/main/resources/config.xml similarity index 93% rename from examples/spring/src/main/resources/config.xml rename to accelerator-examples/spring/src/main/resources/config.xml index f77073c1..fc1de60e 100644 --- a/examples/spring/src/main/resources/config.xml +++ b/accelerator-examples/spring/src/main/resources/config.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> - + @@ -30,7 +30,7 @@ - + diff --git a/examples/spring/src/main/resources/log4j.xml b/accelerator-examples/spring/src/main/resources/log4j.xml similarity index 94% rename from examples/spring/src/main/resources/log4j.xml rename to accelerator-examples/spring/src/main/resources/log4j.xml index 13ec197b..b6030f96 100644 --- a/examples/spring/src/main/resources/log4j.xml +++ b/accelerator-examples/spring/src/main/resources/log4j.xml @@ -9,7 +9,7 @@ - + diff --git a/examples/spring/src/main/webapp/WEB-INF/views/controller-view.jsp b/accelerator-examples/spring/src/main/webapp/WEB-INF/views/controller-view.jsp similarity index 100% rename from examples/spring/src/main/webapp/WEB-INF/views/controller-view.jsp rename to accelerator-examples/spring/src/main/webapp/WEB-INF/views/controller-view.jsp diff --git a/examples/spring/src/main/webapp/WEB-INF/views/faulty-page.jsp b/accelerator-examples/spring/src/main/webapp/WEB-INF/views/faulty-page.jsp similarity index 100% rename from examples/spring/src/main/webapp/WEB-INF/views/faulty-page.jsp rename to accelerator-examples/spring/src/main/webapp/WEB-INF/views/faulty-page.jsp diff --git a/examples/spring/src/main/webapp/WEB-INF/views/index.jsp b/accelerator-examples/spring/src/main/webapp/WEB-INF/views/index.jsp similarity index 100% rename from examples/spring/src/main/webapp/WEB-INF/views/index.jsp rename to accelerator-examples/spring/src/main/webapp/WEB-INF/views/index.jsp diff --git a/examples/spring/src/main/webapp/WEB-INF/views/spring-page.jsp b/accelerator-examples/spring/src/main/webapp/WEB-INF/views/spring-page.jsp similarity index 100% rename from examples/spring/src/main/webapp/WEB-INF/views/spring-page.jsp rename to accelerator-examples/spring/src/main/webapp/WEB-INF/views/spring-page.jsp diff --git a/examples/spring/src/main/webapp/WEB-INF/web.xml b/accelerator-examples/spring/src/main/webapp/WEB-INF/web.xml similarity index 90% rename from examples/spring/src/main/webapp/WEB-INF/web.xml rename to accelerator-examples/spring/src/main/webapp/WEB-INF/web.xml index 4f26f015..683aa66d 100644 --- a/examples/spring/src/main/webapp/WEB-INF/web.xml +++ b/accelerator-examples/spring/src/main/webapp/WEB-INF/web.xml @@ -22,12 +22,12 @@ accelerator - de.halbekunst.juplo.cachecontrol.AcceleratorFilter + de.juplo.accelerator.AcceleratorFilter logger - de.halbekunst.juplo.test.LoggingHttpServletResponseFilter + de.juplo.testingtools.LoggingHttpServletResponseFilter diff --git a/examples/spring/src/main/webapp/index.jsp b/accelerator-examples/spring/src/main/webapp/index.jsp similarity index 100% rename from examples/spring/src/main/webapp/index.jsp rename to accelerator-examples/spring/src/main/webapp/index.jsp diff --git a/examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java b/accelerator-examples/spring/src/test/java/de/juplo/accelerator/examples/SpringMVCTest.java similarity index 87% rename from examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java rename to accelerator-examples/spring/src/test/java/de/juplo/accelerator/examples/SpringMVCTest.java index f90d16e6..f2ab9f1e 100644 --- a/examples/spring/src/test/java/de/halbekunst/cachecontrol/examples/SpringMVCTest.java +++ b/accelerator-examples/spring/src/test/java/de/juplo/accelerator/examples/SpringMVCTest.java @@ -1,7 +1,7 @@ -package de.halbekunst.cachecontrol.examples; +package de.juplo.accelerator.examples; -import de.halbekunst.juplo.test.HttpTestCase; import com.meterware.httpunit.WebResponse; +import de.juplo.testingtools.HttpTestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/spring/tomcat.sh b/accelerator-examples/spring/tomcat.sh similarity index 100% rename from examples/spring/tomcat.sh rename to accelerator-examples/spring/tomcat.sh diff --git a/examples/static/jetty.sh b/accelerator-examples/static/jetty.sh similarity index 100% rename from examples/static/jetty.sh rename to accelerator-examples/static/jetty.sh diff --git a/examples/static/pom.xml b/accelerator-examples/static/pom.xml similarity index 70% rename from examples/static/pom.xml rename to accelerator-examples/static/pom.xml index 5cf0634f..a4af6bac 100644 --- a/examples/static/pom.xml +++ b/accelerator-examples/static/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - de.halbekunst - juplo-examples - 2.0-SNAPSHOT + de.juplo + juplo-accelerator-examples + 0.1-SNAPSHOT - juplo-examples-static + juplo-accelerator-examples-static war - Juplo - Examples: Static Content + Juplo - Accelerator-Examples: Static Content diff --git a/examples/jsp/src/main/resources/config.xml b/accelerator-examples/static/src/main/resources/config.xml similarity index 94% rename from examples/jsp/src/main/resources/config.xml rename to accelerator-examples/static/src/main/resources/config.xml index e414ce93..a04b130c 100644 --- a/examples/jsp/src/main/resources/config.xml +++ b/accelerator-examples/static/src/main/resources/config.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/examples/jsp/src/main/resources/log4j.xml b/accelerator-examples/static/src/main/resources/log4j.xml similarity index 94% rename from examples/jsp/src/main/resources/log4j.xml rename to accelerator-examples/static/src/main/resources/log4j.xml index d3414bdb..b1e35f82 100644 --- a/examples/jsp/src/main/resources/log4j.xml +++ b/accelerator-examples/static/src/main/resources/log4j.xml @@ -9,7 +9,7 @@ - + diff --git a/examples/static/src/main/webapp/WEB-INF/web.xml b/accelerator-examples/static/src/main/webapp/WEB-INF/web.xml similarity index 88% rename from examples/static/src/main/webapp/WEB-INF/web.xml rename to accelerator-examples/static/src/main/webapp/WEB-INF/web.xml index 2df85a54..5edc75fd 100644 --- a/examples/static/src/main/webapp/WEB-INF/web.xml +++ b/accelerator-examples/static/src/main/webapp/WEB-INF/web.xml @@ -22,12 +22,12 @@ accelerator - de.halbekunst.juplo.cachecontrol.AcceleratorFilter + de.juplo.accelerator.AcceleratorFilter logger - de.halbekunst.juplo.test.LoggingHttpServletResponseFilter + de.juplo.testingtools.LoggingHttpServletResponseFilter diff --git a/examples/static/src/main/webapp/index.html b/accelerator-examples/static/src/main/webapp/index.html similarity index 100% rename from examples/static/src/main/webapp/index.html rename to accelerator-examples/static/src/main/webapp/index.html diff --git a/examples/static/src/main/webapp/static/page.html b/accelerator-examples/static/src/main/webapp/static/page.html similarity index 100% rename from examples/static/src/main/webapp/static/page.html rename to accelerator-examples/static/src/main/webapp/static/page.html diff --git a/examples/static/src/main/webapp/static/stylesheets.css b/accelerator-examples/static/src/main/webapp/static/stylesheets.css similarity index 100% rename from examples/static/src/main/webapp/static/stylesheets.css rename to accelerator-examples/static/src/main/webapp/static/stylesheets.css diff --git a/examples/static/src/test/java/de/halbekunst/cachecontrol/examples/StaticTest.java b/accelerator-examples/static/src/test/java/de/juplo/accelerator/examples/StaticTest.java similarity index 86% rename from examples/static/src/test/java/de/halbekunst/cachecontrol/examples/StaticTest.java rename to accelerator-examples/static/src/test/java/de/juplo/accelerator/examples/StaticTest.java index e66a5087..f27fec4c 100644 --- a/examples/static/src/test/java/de/halbekunst/cachecontrol/examples/StaticTest.java +++ b/accelerator-examples/static/src/test/java/de/juplo/accelerator/examples/StaticTest.java @@ -1,7 +1,7 @@ -package de.halbekunst.cachecontrol.examples; +package de.juplo.accelerator.examples; -import de.halbekunst.juplo.test.HttpTestCase; import com.meterware.httpunit.WebResponse; +import de.juplo.testingtools.HttpTestCase; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/static/src/test/java/org/eclipse/jetty/servlet/DefaultServlet.java b/accelerator-examples/static/src/test/java/org/eclipse/jetty/servlet/DefaultServlet.java similarity index 100% rename from examples/static/src/test/java/org/eclipse/jetty/servlet/DefaultServlet.java rename to accelerator-examples/static/src/test/java/org/eclipse/jetty/servlet/DefaultServlet.java diff --git a/accelerator/pom.xml b/accelerator/pom.xml new file mode 100644 index 00000000..fd36da9b --- /dev/null +++ b/accelerator/pom.xml @@ -0,0 +1,211 @@ + + + + 4.0.0 + + de.juplo + juplo-accelerator + Juplo - Accelerator + 0.1-SNAPSHOT + http://www.juplo.de/accelerator + + + 2.0.6 + + + + + kai + Kai Moritz + kai@juplo.de + + + + + + UTF-8 + + 1.6.11 + 1.0 + 4.8.1 + 1.0 + 1.2.16 + 2.5 + slf4j-log4j12 + 1.6.1 + 3.0.6.RELEASE + + + + + org.springframework + spring-webmvc + ${springframework.version} + provided + + + org.springframework + spring-aspects + ${springframework.version} + provided + + + org.springframework + spring-tx + ${springframework.version} + provided + + + org.aspectj + aspectjrt + ${aspectj.version} + provided + + + javax.servlet + servlet-api + ${servlet-api.version} + provided + + + javax.persistence + persistence-api + ${jpa.version} + provided + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + de.juplo + juplo-testingtools + ${juplo-testingtools.version} + test + + + junit + junit + ${junit.version} + test + + + org.slf4j + ${slf4j.binding} + ${slf4j.version} + test + + + + + + juplo.internal + Internal Release Repository + http://juplo.de/archiva/repository/internal/ + + + juplo.snapshots + Internal Snapshot Repository + http://juplo.de/archiva/repository/snapshots/ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + utf8 + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar + + + + + + org.codehaus.mojo + aspectj-maven-plugin + + 1.6 + + + org.springframework + spring-aspects + + + + + + + compile + + + + + + + + + + + maven-changes-plugin + + + maven-checkstyle-plugin + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + maven-javadoc-plugin + + + maven-jxr-plugin + + + maven-pmd-plugin + + true + 1.5 + + + + maven-surefire-report-plugin + 2.7.2 + + + + + diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java b/accelerator/src/main/java/de/juplo/accelerator/AcceleratorFilter.java similarity index 99% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java rename to accelerator/src/main/java/de/juplo/accelerator/AcceleratorFilter.java index 8e63222a..7b1e3062 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java +++ b/accelerator/src/main/java/de/juplo/accelerator/AcceleratorFilter.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol; +package de.juplo.accelerator; import java.io.IOException; import java.io.OutputStream; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java b/accelerator/src/main/java/de/juplo/accelerator/CacheControl.java similarity index 97% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java rename to accelerator/src/main/java/de/juplo/accelerator/CacheControl.java index 458979d9..f119b600 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java +++ b/accelerator/src/main/java/de/juplo/accelerator/CacheControl.java @@ -1,11 +1,11 @@ -package de.halbekunst.juplo.cachecontrol; - -import de.halbekunst.juplo.cachecontrol.AcceleratorFilter.AccelerationWrapper; -import de.halbekunst.juplo.cachecontrol.annotations.CacheSeconds; -import de.halbekunst.juplo.cachecontrol.annotations.Accepts; -import de.halbekunst.juplo.cachecontrol.annotations.AdditionalHeaders; -import de.halbekunst.juplo.cachecontrol.annotations.LastModified; -import de.halbekunst.juplo.cachecontrol.annotations.ETag; +package de.juplo.accelerator; + +import de.juplo.accelerator.AcceleratorFilter.AccelerationWrapper; +import de.juplo.accelerator.annotations.CacheSeconds; +import de.juplo.accelerator.annotations.Accepts; +import de.juplo.accelerator.annotations.AdditionalHeaders; +import de.juplo.accelerator.annotations.LastModified; +import de.juplo.accelerator.annotations.ETag; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Date; @@ -416,7 +416,7 @@ public class CacheControl { isETagMethodDefined = true; continue; } - if (annotation.annotationType().equals(de.halbekunst.juplo.cachecontrol.annotations.CacheControl.class)) { + if (annotation.annotationType().equals(de.juplo.accelerator.annotations.CacheControl.class)) { if (isCacheControlMethodDefined) throw new IllegalArgumentException("Die Annotation @CacheControl wurde in der Klasse " + handler.getClass().getSimpleName() + " mehrfach verwendet!"); cacheControlMethod = method; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java b/accelerator/src/main/java/de/juplo/accelerator/CacheControlInterceptor.java similarity index 92% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java rename to accelerator/src/main/java/de/juplo/accelerator/CacheControlInterceptor.java index c32183f6..10aaee1f 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java +++ b/accelerator/src/main/java/de/juplo/accelerator/CacheControlInterceptor.java @@ -1,7 +1,7 @@ -package de.halbekunst.juplo.cachecontrol; +package de.juplo.accelerator; -import de.halbekunst.juplo.cachecontrol.AcceleratorFilter.AccelerationWrapper; -import de.halbekunst.juplo.cachecontrol.annotations.Cacheable; +import de.juplo.accelerator.AcceleratorFilter.AccelerationWrapper; +import de.juplo.accelerator.annotations.Cacheable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheMethodHandle.java b/accelerator/src/main/java/de/juplo/accelerator/CacheMethodHandle.java similarity index 92% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheMethodHandle.java rename to accelerator/src/main/java/de/juplo/accelerator/CacheMethodHandle.java index a36196e6..96f529ba 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheMethodHandle.java +++ b/accelerator/src/main/java/de/juplo/accelerator/CacheMethodHandle.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol; +package de.juplo.accelerator; import java.util.Map; import javax.servlet.http.HttpServletRequest; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/Headers.java b/accelerator/src/main/java/de/juplo/accelerator/Headers.java similarity index 95% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/Headers.java rename to accelerator/src/main/java/de/juplo/accelerator/Headers.java index 6f7579a1..49f19fe1 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/Headers.java +++ b/accelerator/src/main/java/de/juplo/accelerator/Headers.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol; +package de.juplo.accelerator; /** * diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/Accepts.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/Accepts.java similarity index 95% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/Accepts.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/Accepts.java index 879cfd3e..2f44afc0 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/Accepts.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/Accepts.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/AdditionalHeaders.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/AdditionalHeaders.java similarity index 86% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/AdditionalHeaders.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/AdditionalHeaders.java index f8b92662..2f379208 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/AdditionalHeaders.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/AdditionalHeaders.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/CacheControl.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/CacheControl.java similarity index 95% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/CacheControl.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/CacheControl.java index ab5c4a36..6f7705db 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/CacheControl.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/CacheControl.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/CacheSeconds.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/CacheSeconds.java similarity index 97% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/CacheSeconds.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/CacheSeconds.java index e076e087..04036462 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/CacheSeconds.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/CacheSeconds.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/Cacheable.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/Cacheable.java similarity index 96% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/Cacheable.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/Cacheable.java index 7a1be267..a5960fc3 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/Cacheable.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/Cacheable.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/ETag.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/ETag.java similarity index 98% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/ETag.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/ETag.java index d2542dc8..81b6d16a 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/ETag.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/ETag.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/LastModified.java b/accelerator/src/main/java/de/juplo/accelerator/annotations/LastModified.java similarity index 97% rename from cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/LastModified.java rename to accelerator/src/main/java/de/juplo/accelerator/annotations/LastModified.java index be28e0ea..c5e86a34 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/annotations/LastModified.java +++ b/accelerator/src/main/java/de/juplo/accelerator/annotations/LastModified.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.cachecontrol.annotations; +package de.juplo.accelerator.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/cachecontrol/src/test/java/com/meterware/servletunit/ServletUnitHttpResponse.java b/accelerator/src/test/java/com/meterware/servletunit/ServletUnitHttpResponse.java similarity index 100% rename from cachecontrol/src/test/java/com/meterware/servletunit/ServletUnitHttpResponse.java rename to accelerator/src/test/java/com/meterware/servletunit/ServletUnitHttpResponse.java diff --git a/cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/ParameterGuessingTest.java b/accelerator/src/test/java/de/juplo/accelerator/ParameterGuessingTest.java similarity index 99% rename from cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/ParameterGuessingTest.java rename to accelerator/src/test/java/de/juplo/accelerator/ParameterGuessingTest.java index e7b64f68..342a8f2f 100644 --- a/cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/ParameterGuessingTest.java +++ b/accelerator/src/test/java/de/juplo/accelerator/ParameterGuessingTest.java @@ -1,7 +1,7 @@ -package de.halbekunst.juplo.cachecontrol; +package de.juplo.accelerator; import com.meterware.httpunit.WebResponse; -import de.halbekunst.juplo.test.HttpTestCase; +import de.juplo.testingtools.HttpTestCase; import java.net.URLEncoder; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/RequestSizeTest.java b/accelerator/src/test/java/de/juplo/accelerator/RequestSizeTest.java similarity index 98% rename from cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/RequestSizeTest.java rename to accelerator/src/test/java/de/juplo/accelerator/RequestSizeTest.java index 2b3fec85..6b94d2ba 100644 --- a/cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/RequestSizeTest.java +++ b/accelerator/src/test/java/de/juplo/accelerator/RequestSizeTest.java @@ -1,8 +1,8 @@ -package de.halbekunst.juplo.cachecontrol; +package de.juplo.accelerator; import com.meterware.httpunit.WebResponse; -import de.halbekunst.juplo.test.HttpTestCase; -import de.halbekunst.juplo.test.LoggingHttpServletResponseWrapper; +import de.juplo.testingtools.HttpTestCase; +import de.juplo.testingtools.LoggingHttpServletResponseWrapper; import java.net.URLEncoder; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/src/main/java/de/halbekunst/juplo/test/TestServlet.java b/accelerator/src/test/java/de/juplo/accelerator/TestServlet.java similarity index 97% rename from test/src/main/java/de/halbekunst/juplo/test/TestServlet.java rename to accelerator/src/test/java/de/juplo/accelerator/TestServlet.java index b2b29f44..769269c7 100644 --- a/test/src/main/java/de/halbekunst/juplo/test/TestServlet.java +++ b/accelerator/src/test/java/de/juplo/accelerator/TestServlet.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.test; +package de.juplo.accelerator; import java.io.IOException; import java.util.Map; @@ -8,6 +8,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,6 +16,7 @@ import org.slf4j.LoggerFactory; * * @author kai */ +@Ignore public class TestServlet extends HttpServlet { private final static Logger log = LoggerFactory.getLogger(TestServlet.class); diff --git a/cachecontrol/src/test/resources/config.xml b/accelerator/src/test/resources/config.xml similarity index 94% rename from cachecontrol/src/test/resources/config.xml rename to accelerator/src/test/resources/config.xml index f9e3e0fc..0b4ebb5e 100644 --- a/cachecontrol/src/test/resources/config.xml +++ b/accelerator/src/test/resources/config.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/cachecontrol/src/test/resources/log4j.xml b/accelerator/src/test/resources/log4j.xml similarity index 94% rename from cachecontrol/src/test/resources/log4j.xml rename to accelerator/src/test/resources/log4j.xml index 833d85c9..16e81f00 100644 --- a/cachecontrol/src/test/resources/log4j.xml +++ b/accelerator/src/test/resources/log4j.xml @@ -10,7 +10,7 @@ - + diff --git a/cachecontrol/src/test/resources/web.xml b/accelerator/src/test/resources/web.xml similarity index 82% rename from cachecontrol/src/test/resources/web.xml rename to accelerator/src/test/resources/web.xml index 4838a1a3..01ce9b79 100644 --- a/cachecontrol/src/test/resources/web.xml +++ b/accelerator/src/test/resources/web.xml @@ -5,7 +5,7 @@ accelerator - de.halbekunst.juplo.cachecontrol.AcceleratorFilter + de.juplo.accelerator.AcceleratorFilter @@ -15,7 +15,7 @@ test-servlet - de.halbekunst.juplo.test.TestServlet + de.juplo.accelerator.TestServlet diff --git a/cachecontrol/pom.xml b/cachecontrol/pom.xml deleted file mode 100644 index 686432ed..00000000 --- a/cachecontrol/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - 4.0.0 - - - de.halbekunst - juplo - 2.0-SNAPSHOT - - - ${pom.parent.artifactId}-cachecontrol - Juplo - CacheControl - - - - org.springframework - spring-webmvc - ${springframework.version} - provided - - - org.springframework - spring-aspects - ${springframework.version} - provided - - - org.springframework - spring-tx - ${springframework.version} - provided - - - org.aspectj - aspectjrt - ${aspectj.version} - provided - - - javax.servlet - servlet-api - ${servlet-api.version} - provided - - - javax.persistence - persistence-api - ${jpa.version} - provided - - - ${pom.parent.groupId} - ${pom.parent.artifactId}-test - ${pom.parent.version} - test - - - org.slf4j - ${slf4j.binding} - ${slf4j.version} - test - - - - - - - org.codehaus.mojo - aspectj-maven-plugin - - 1.6 - - - org.springframework - spring-aspects - - - - - - - compile - - - - - - - - diff --git a/examples/jsp/catalog.xml b/examples/jsp/catalog.xml deleted file mode 100644 index 94e80903..00000000 --- a/examples/jsp/catalog.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/maven-plugins/hibernate4/pom.xml b/maven-plugins/hibernate4/pom.xml new file mode 100644 index 00000000..a5f7e010 --- /dev/null +++ b/maven-plugins/hibernate4/pom.xml @@ -0,0 +1,172 @@ + + + + 4.0.0 + + de.juplo + hibernate4-maven-plugin + Juplo - Maven-Plugins: Hibernate 4 Maven Mojo + 1.0 + maven-plugin + http://www.juplo.de/maven-plugins/hibernate4 + + + 2.0.6 + + + + + kai + Kai Moritz + kai@juplo.de + + + + + + UTF-8 + + 4.1.5.SP1 + 3.0.4 + 1.0.1 + 1.0.2 + + + + + org.apache.maven + maven-core + ${maven.version} + + + org.codehaus.plexus + plexus-utils + + + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.hibernate + hibernate-core + ${hibernate-core.version} + + + org.jboss.logging + jboss-logging + + + + + net.sf.scannotation + scannotation + ${scannotation.version} + + + com.pyx4j + maven-plugin-log4j + ${maven-plugin-log4j.version} + + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-plugin-api + + + + + + + + juplo.internal + Internal Release Repository + http://juplo.de/archiva/repository/internal/ + + + juplo.snapshots + Internal Snapshot Repository + http://juplo.de/archiva/repository/snapshots/ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + utf8 + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar + + + + + + + + + + + maven-changes-plugin + + + maven-checkstyle-plugin + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + maven-javadoc-plugin + + + maven-jxr-plugin + + + maven-pmd-plugin + + true + 1.5 + + + + maven-surefire-report-plugin + 2.7.2 + + + + + diff --git a/maven/hibernate4-maven-plugin/src/main/java/de/halbekunst/Hbm2DdlMojo.java b/maven-plugins/hibernate4/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java similarity index 99% rename from maven/hibernate4-maven-plugin/src/main/java/de/halbekunst/Hbm2DdlMojo.java rename to maven-plugins/hibernate4/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index 5844ee5d..f2fd2320 100644 --- a/maven/hibernate4-maven-plugin/src/main/java/de/halbekunst/Hbm2DdlMojo.java +++ b/maven-plugins/hibernate4/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -1,4 +1,4 @@ -package de.halbekunst; +package de.juplo.plugins.hibernate4; /* * Copyright 2001-2005 The Apache Software Foundation. diff --git a/maven/pom.xml b/maven-plugins/pom.xml similarity index 69% rename from maven/pom.xml rename to maven-plugins/pom.xml index 76b05d62..84841728 100644 --- a/maven/pom.xml +++ b/maven-plugins/pom.xml @@ -4,16 +4,17 @@ 4.0.0 - de.halbekunst + de.juplo juplo - 2.0-SNAPSHOT + 1.0-SNAPSHOT - ${pom.parent.artifactId}-maven + maven-plugins pom Juplo - Maven-Plugins - hibernate4-maven-plugin + hibernate4 - \ No newline at end of file + + diff --git a/maven/hibernate4-maven-plugin/pom.xml b/maven/hibernate4-maven-plugin/pom.xml deleted file mode 100644 index 2c480b97..00000000 --- a/maven/hibernate4-maven-plugin/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - - de.halbekunst - juplo-maven - 2.0-SNAPSHOT - - - hibernate4-maven-plugin - maven-plugin - Juplo - Maven-Plugins: Hibernate 4 Maven Mojo - http://www.halbekunst.de - - - - org.apache.maven - maven-core - 3.0.4 - - - org.apache.maven - maven-plugin-api - 3.0.4 - - - org.hibernate - hibernate-core - 4.1.5.SP1 - - - net.sf.scannotation - scannotation - 1.0.2 - - - com.pyx4j - maven-plugin-log4j - 1.0.1 - - - - diff --git a/percentcodec/pom.xml b/percentcodec/pom.xml new file mode 100644 index 00000000..a0d7e56d --- /dev/null +++ b/percentcodec/pom.xml @@ -0,0 +1,166 @@ + + + + 4.0.0 + + de.juplo + juplo-percentcodec + Juplo - Percent-Codec + 1.0.1 + http://www.juplo.de/percentcodec + + + 2.0.6 + + + + + kai + Kai Moritz + kai@juplo.de + + + + + + UTF-8 + + 4.8.1 + 1.2.16 + 1.6.1 + + + + + junit + junit + ${junit.version} + test + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + log4j + log4j + + + test + + + log4j + log4j + ${log4j.version} + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + test + + + + + + juplo.internal + Internal Release Repository + http://juplo.de/archiva/repository/internal/ + + + juplo.snapshots + Internal Snapshot Repository + http://juplo.de/archiva/repository/snapshots/ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + utf8 + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar + + + + + + + + + + + maven-changes-plugin + + + maven-checkstyle-plugin + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + maven-javadoc-plugin + + + maven-jxr-plugin + + + maven-pmd-plugin + + true + 1.5 + + + + maven-surefire-report-plugin + 2.7.2 + + + + + diff --git a/utils/src/main/java/de/halbekunst/juplo/utils/PercentCodec.java b/percentcodec/src/main/java/de/juplo/percentcodec/PercentCodec.java similarity index 99% rename from utils/src/main/java/de/halbekunst/juplo/utils/PercentCodec.java rename to percentcodec/src/main/java/de/juplo/percentcodec/PercentCodec.java index d4c53ad1..1a23c097 100644 --- a/utils/src/main/java/de/halbekunst/juplo/utils/PercentCodec.java +++ b/percentcodec/src/main/java/de/juplo/percentcodec/PercentCodec.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.utils; +package de.juplo.percentcodec; import java.nio.charset.Charset; diff --git a/utils/src/test/java/de/halbekunst/juplo/utils/PercentCodecTest.java b/percentcodec/src/test/java/de/juplo/percentcodec/PercentCodecTest.java similarity index 98% rename from utils/src/test/java/de/halbekunst/juplo/utils/PercentCodecTest.java rename to percentcodec/src/test/java/de/juplo/percentcodec/PercentCodecTest.java index a06784e5..bec35fa3 100644 --- a/utils/src/test/java/de/halbekunst/juplo/utils/PercentCodecTest.java +++ b/percentcodec/src/test/java/de/juplo/percentcodec/PercentCodecTest.java @@ -1,5 +1,6 @@ -package de.halbekunst.juplo.utils; +package de.juplo.percentcodec; +import de.juplo.percentcodec.PercentCodec; import junit.framework.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/utils/src/test/resources/log4j.xml b/percentcodec/src/test/resources/log4j.xml similarity index 100% rename from utils/src/test/resources/log4j.xml rename to percentcodec/src/test/resources/log4j.xml diff --git a/pom.xml b/pom.xml index 8c63f411..ec6d8305 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 - de.halbekunst + de.juplo juplo - 2.0-SNAPSHOT + 1.0-SNAPSHOT Juplo pom - http://www.halbekunst.de + http://www.juplo.de 2.0.6 @@ -19,126 +19,36 @@ kai Kai Moritz - kai@ich-geh-kaputt.de + kai@juplo.de - test - cachecontrol - examples + testingtools + percentcodec + maven-plugins + accelerator + accelerator-examples - UTF-8 - - - 1.6.11 - 1.3.2 - 1.7.1 - 6.0.29 - 8.1.4.v20120524 - 1.0 - 1.2 - 4.8.1 - 1.2.16 - 2.5 - slf4j-log4j12 - 1.6.1 - 3.0.6.RELEASE - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - - junit - junit - ${junit.version} - test - - - - - - - - org.jboss.repository.maven - http://repository.jboss.org/maven2 - false - - - halbekunst.internal - Internal Release Repository - http://halbekunst.de/archiva/repository/internal/ - false - - - - halbekunst.internal + juplo.internal Internal Release Repository - http://halbekunst.de/archiva/repository/internal/ + http://juplo.de/archiva/repository/internal/ - halbekunst.snapshots + juplo.snapshots Internal Snapshot Repository - http://halbekunst.de/archiva/repository/snapshots/ + http://juplo.de/archiva/repository/snapshots/ - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - utf8 - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar - - - - - - - @@ -147,27 +57,6 @@ maven-checkstyle-plugin - - org.codehaus.mojo - cobertura-maven-plugin - 2.0 - - - maven-javadoc-plugin - - - maven-jxr-plugin - - - maven-pmd-plugin - - true - 1.5 - - - - maven-surefire-report-plugin - diff --git a/test/pom.xml b/test/pom.xml deleted file mode 100644 index 7c3a4b48..00000000 --- a/test/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - - de.halbekunst - juplo - 2.0-SNAPSHOT - - - ${pom.parent.artifactId}-test - Juplo - Test - - - - - - httpunit - httpunit - ${httpunit.version} - - - junit - junit - - - javax.servlet - servlet-api - - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${springframework.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - - org.springframework - spring-beans - ${springframework.version} - provided - - - org.springframework - spring-context - ${springframework.version} - provided - - - javax.servlet - servlet-api - ${servlet-api.version} - provided - - - - diff --git a/testingtools/pom.xml b/testingtools/pom.xml new file mode 100644 index 00000000..93e23930 --- /dev/null +++ b/testingtools/pom.xml @@ -0,0 +1,184 @@ + + + + 4.0.0 + + de.juplo + juplo-testingtools + Juplo - Testing-Tools + 1.0 + http://www.juplo.de/testingtools + + + 2.0.6 + + + + + kai + Kai Moritz + kai@juplo.de + + + + + + + UTF-8 + + 1.7.1 + 8.1.4.v20120524 + 4.8.1 + 2.5 + 1.6.1 + 3.0.6.RELEASE + + + + + + httpunit + httpunit + ${httpunit.version} + + + junit + junit + + + javax.servlet + servlet-api + + + + + junit + junit + ${junit.version} + + + org.springframework + spring-test + ${springframework.version} + provided + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + org.springframework + spring-beans + ${springframework.version} + provided + + + org.springframework + spring-context + ${springframework.version} + provided + + + javax.servlet + servlet-api + ${servlet-api.version} + provided + + + + + + juplo.internal + Internal Release Repository + http://juplo.de/archiva/repository/internal/ + + + juplo.snapshots + Internal Snapshot Repository + http://juplo.de/archiva/repository/snapshots/ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + utf8 + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + install + install + + sources + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar + + + + + + + + + + + maven-changes-plugin + + + maven-checkstyle-plugin + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0 + + + maven-javadoc-plugin + + + maven-jxr-plugin + + + maven-pmd-plugin + + true + 1.5 + + + + maven-surefire-report-plugin + 2.7.2 + + + + + diff --git a/test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java b/testingtools/src/main/java/de/juplo/testingtools/HttpTestCase.java similarity index 98% rename from test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java rename to testingtools/src/main/java/de/juplo/testingtools/HttpTestCase.java index 76c46468..a243bc32 100644 --- a/test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java +++ b/testingtools/src/main/java/de/juplo/testingtools/HttpTestCase.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.test; +package de.juplo.testingtools; import com.meterware.httpunit.WebResponse; import com.meterware.servletunit.InvocationContext; diff --git a/test/src/main/java/de/halbekunst/juplo/test/LoggingHttpServletResponseFilter.java b/testingtools/src/main/java/de/juplo/testingtools/LoggingHttpServletResponseFilter.java similarity index 97% rename from test/src/main/java/de/halbekunst/juplo/test/LoggingHttpServletResponseFilter.java rename to testingtools/src/main/java/de/juplo/testingtools/LoggingHttpServletResponseFilter.java index b9dad518..4181f205 100644 --- a/test/src/main/java/de/halbekunst/juplo/test/LoggingHttpServletResponseFilter.java +++ b/testingtools/src/main/java/de/juplo/testingtools/LoggingHttpServletResponseFilter.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.test; +package de.juplo.testingtools; import java.io.IOException; import javax.servlet.Filter; diff --git a/test/src/main/java/de/halbekunst/juplo/test/LoggingHttpServletResponseWrapper.java b/testingtools/src/main/java/de/juplo/testingtools/LoggingHttpServletResponseWrapper.java similarity index 99% rename from test/src/main/java/de/halbekunst/juplo/test/LoggingHttpServletResponseWrapper.java rename to testingtools/src/main/java/de/juplo/testingtools/LoggingHttpServletResponseWrapper.java index 075e6a79..eb6a0675 100644 --- a/test/src/main/java/de/halbekunst/juplo/test/LoggingHttpServletResponseWrapper.java +++ b/testingtools/src/main/java/de/juplo/testingtools/LoggingHttpServletResponseWrapper.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.test; +package de.juplo.testingtools; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/test/src/main/java/de/halbekunst/juplo/test/WebContextTestExecutionListener.java b/testingtools/src/main/java/de/juplo/testingtools/WebContextTestExecutionListener.java similarity index 98% rename from test/src/main/java/de/halbekunst/juplo/test/WebContextTestExecutionListener.java rename to testingtools/src/main/java/de/juplo/testingtools/WebContextTestExecutionListener.java index 68985c22..93095841 100644 --- a/test/src/main/java/de/halbekunst/juplo/test/WebContextTestExecutionListener.java +++ b/testingtools/src/main/java/de/juplo/testingtools/WebContextTestExecutionListener.java @@ -1,4 +1,4 @@ -package de.halbekunst.juplo.test; +package de.juplo.testingtools; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.Scope; diff --git a/utils/pom.xml b/utils/pom.xml deleted file mode 100644 index bb58b1fc..00000000 --- a/utils/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - - de.halbekunst - juplo - 1.0.1 - - - ${pom.parent.artifactId}-utils - Juplo - Utils - - - - junit - junit - ${junit.version} - test - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - log4j - log4j - - - test - - - log4j - log4j - ${log4j.version} - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - test - - - - -- 2.20.1