diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties index 638a05cb..955121c7 100644 Binary files a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties and b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/build.properties differ diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.properties b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.properties index 2a7b215b..89e8e9ab 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.properties +++ b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.properties @@ -1,6 +1,7 @@ maven.xdoc.date=left -#cactus.src.mergewebxml = src/conf/cactus-web.xml -maven.eclipse.classpath.include=src/test-cactus +maven.docs.src=${basedir}/src/site/xdoc +#cactus.src.mergewebxml = src/main/config/cactus-web.xml +maven.eclipse.classpath.include=src/test-cactus/java cactus.is.ear=true #cactus.src=${basedir}../../../src/test-cactus #cactus.src.dir=${basedir}../../../src/test-cactus diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml index 6a45c1b1..8ec9ff0a 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml +++ b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml @@ -33,8 +33,9 @@ - src/java - src/test + ear + src/main/java + src/test/java **/*Test.java @@ -45,7 +46,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/application/META-INF/application.xml b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/main/resources/META-INF/application.xml similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/application/META-INF/application.xml rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/main/resources/META-INF/application.xml diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/conf/app.properties b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/conf/app.properties rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/webapp2/WEB-INF/web.xml b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/main/webapp2/WEB-INF/web.xml similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/webapp2/WEB-INF/web.xml rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/main/webapp2/WEB-INF/web.xml diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test-cactus/example/ear/HttpUnitTest.java b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test-cactus/example/ear/HttpUnitTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/example/ear/AbstractTestCase.java b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/java/AbstractTestCase.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/example/ear/AbstractTestCase.java rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/java/AbstractTestCase.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/example/ear/AppTest.java b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/java/AppTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/example/ear/AppTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/java/AppTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/example/ear/NaughtyTest.java b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/java/NaughtyTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/example/ear/NaughtyTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/ears/ear/src/test/java/NaughtyTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties index 638a05cb..955121c7 100644 Binary files a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties and b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties differ diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss index 687af2ed..65d468ee 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss +++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/build.properties.jboss @@ -3,7 +3,7 @@ cactus.home.jboss3x=C:/j2ee/jboss-3.2.3_jetty-4.2.14 # Specify the XDoclet properties for the descriptor maven.xdoclet.ejbdoclet.jboss.0=true maven.xdoclet.ejbdoclet.jboss.0.Version=3.2 -maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge +maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table" maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody" maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/maven.xml b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/maven.xml index 0d3b6d3c..f9417415 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/maven.xml +++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/maven.xml @@ -1,5 +1,5 @@ - + diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties index 85392ff3..30d24de4 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties +++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.properties @@ -1,11 +1,12 @@ maven.xdoc.date=left +maven.docs.src=${basedir}/src/site/xdoc maven.ejb.src=${maven.build.dir}/xdoclet/ejb -maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus +maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus/java maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true maven.xdoclet.ejbdoclet.utilobject.0.includeGUID=true maven.xdoclet.ejbdoclet.dataobject.0=true maven.xdoclet.ejbdoclet.entityfacade.0=true maven.xdoclet.ejbdoclet.valueobject.0=true maven.xdoclet.ejbdoclet.deploymentdescriptor.0.validateXML=true -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = src/main/config/cactus-web.xml cactus.is.ear=true diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml index b50b58dc..213a47c0 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml +++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml @@ -90,8 +90,9 @@ - src/java - src/test + ejb + src/main/java + src/test/java **/*Test.java @@ -102,7 +103,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/conf/cactus-web.xml b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/java/example/ejb/ExampleBean.java b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/java/example/ejb/ExampleBean.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/java/example/ejb/ExampleBean.java rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/java/example/ejb/ExampleBean.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/java/example/ejb/ExampleFacadeBean.java b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/java/example/ejb/ExampleFacadeBean.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/java/example/ejb/ExampleFacadeBean.java rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/java/example/ejb/ExampleFacadeBean.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/conf/app.properties b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/conf/app.properties rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/webapp/WEB-INF/web.xml b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/webapp/WEB-INF/web.xml rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/main/webapp/WEB-INF/web.xml diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test-cactus/example/ejb/SanityWithCactusTest.java b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test-cactus/java/example/ejb/SanityWithCactusTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test-cactus/example/ejb/SanityWithCactusTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test-cactus/java/example/ejb/SanityWithCactusTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test/example/ejb/SanityTest.java b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test/java/example/ejb/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test/example/ejb/SanityTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/src/test/java/example/ejb/SanityTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties index a4afe3d2..955121c7 100644 Binary files a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties and b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties differ diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss index a4afe3d2..955121c7 100644 Binary files a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss and b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/build.properties.jboss differ diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml index 84d32f30..4cd86f4c 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml +++ b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/maven.xml @@ -1,5 +1,5 @@ - + diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.properties b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.properties index 1f41da45..8ad9c14d 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.properties +++ b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.properties @@ -1,10 +1,11 @@ maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge +maven.xdoclet.webdoclet.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge +maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml index 859dc665..04f44cf2 100644 --- a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml +++ b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml @@ -123,8 +123,9 @@ - src/java - src/test + war + src/main/java + src/test/java **/*Test.java @@ -135,7 +136,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/conf/cactus-web.xml b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/java/example/web/EjbServlet.java b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/java/example/web/EjbServlet.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/java/example/web/EjbServlet.java rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/java/example/web/EjbServlet.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/java/example/web/HelloWorldServlet.java b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/java/example/web/HelloWorldServlet.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/java/example/web/HelloWorldServlet.java rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/java/example/web/HelloWorldServlet.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/conf/app.properties b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/conf/app.properties rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/webapp/sample.jsp b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/webapp/sample.jsp similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/webapp/sample.jsp rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/main/webapp/sample.jsp diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/example/web/HelloWorldServletTest.java b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/java/example/web/HelloWorldServletTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/example/web/HelloWorldServletTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/java/example/web/HelloWorldServletTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/example/web/HttpUnitTest.java b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/java/example/web/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/example/web/HttpUnitTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test-cactus/java/example/web/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test/example/web/SanityTest.java b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test/java/example/web/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test/example/web/SanityTest.java rename to genapp/src/plugin-resources/complex/template-resources/components/wars/web/src/test/java/example/web/SanityTest.java diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.properties b/genapp/src/plugin-resources/ejb/template-resources/project.properties index 08a13904..0d36b366 100644 --- a/genapp/src/plugin-resources/ejb/template-resources/project.properties +++ b/genapp/src/plugin-resources/ejb/template-resources/project.properties @@ -15,6 +15,7 @@ # ------------------------------------------------------------------- maven.xdoc.date=left +maven.docs.src=${basedir}/src/site/xdoc maven.ejb.src=${maven.build.dir}/xdoclet/ejb maven.eclipse.classpath.include=${maven.build.dir}/xdoclet/ejbdoclet,src/test-cactus maven.xdoclet.ejbdoclet.utilobject.0.cacheHomes=true diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.xml b/genapp/src/plugin-resources/ejb/template-resources/project.xml index c2a89567..8c1d5402 100644 --- a/genapp/src/plugin-resources/ejb/template-resources/project.xml +++ b/genapp/src/plugin-resources/ejb/template-resources/project.xml @@ -165,8 +165,8 @@ ejb turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -177,7 +177,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/ejb/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/ejb/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/java/ExampleBean.java b/genapp/src/plugin-resources/ejb/template-resources/src/main/java/ExampleBean.java similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/java/ExampleBean.java rename to genapp/src/plugin-resources/ejb/template-resources/src/main/java/ExampleBean.java diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/java/ExampleFacadeBean.java b/genapp/src/plugin-resources/ejb/template-resources/src/main/java/ExampleFacadeBean.java similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/java/ExampleFacadeBean.java rename to genapp/src/plugin-resources/ejb/template-resources/src/main/java/ExampleFacadeBean.java diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/ejb/template-resources/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/conf/app.properties rename to genapp/src/plugin-resources/ejb/template-resources/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/webapp/WEB-INF/web.xml b/genapp/src/plugin-resources/ejb/template-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/webapp/WEB-INF/web.xml rename to genapp/src/plugin-resources/ejb/template-resources/src/main/webapp/WEB-INF/web.xml diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/test-cactus/SanityWithCactusTest.java b/genapp/src/plugin-resources/ejb/template-resources/src/test-cactus/java/SanityWithCactusTest.java similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/test-cactus/SanityWithCactusTest.java rename to genapp/src/plugin-resources/ejb/template-resources/src/test-cactus/java/SanityWithCactusTest.java diff --git a/genapp/src/plugin-resources/ejb/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/ejb/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/ejb/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/ejb/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/ejb/template.properties b/genapp/src/plugin-resources/ejb/template.properties index 54a3bb90..871ce98d 100644 --- a/genapp/src/plugin-resources/ejb/template.properties +++ b/genapp/src/plugin-resources/ejb/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml maven.genapp.default.package=example.ejb diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss index a4afe3d2..955121c7 100644 Binary files a/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/struts-jstl/template-resources/build.properties.jboss differ diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties b/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties index f2fe747e..35b9bacd 100644 --- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties +++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties @@ -15,23 +15,24 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus,src/conf +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java,src/main/config maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge +maven.xdoclet.webdoclet.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.strutsconfigxml.0=true maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1 maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge +maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.strutsvalidationxml.0=true maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.jbosswebxml.0=true maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge +maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@ maven.xdoclet.webdoclet.fileset.0.include=**/*.java maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml index 39bf26c1..ef2b0aa1 100644 --- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml +++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml @@ -267,8 +267,8 @@ war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -279,7 +279,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/java/InputAction.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/java/InputAction.java similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/java/InputAction.java rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/java/InputAction.java diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlet-mappings.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/servlet-mappings.xml similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlet-mappings.xml rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/servlet-mappings.xml diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlets.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/servlets.xml similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/servlets.xml rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/servlets.xml diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-forms.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/struts-forms.xml similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-forms.xml rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/struts-forms.xml diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-message-resources.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/struts-message-resources.xml similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/merge/struts-message-resources.xml rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/merge/struts-message-resources.xml diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/ApplicationResources.properties b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/resources/ApplicationResources.properties similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/conf/ApplicationResources.properties rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/resources/ApplicationResources.properties diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/webapp/WEB-INF/jsp/input.jsp b/genapp/src/plugin-resources/struts-jstl/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/webapp/WEB-INF/jsp/input.jsp rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/HttpUnitTest.java rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/StrutsTest.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/java/StrutsTest.java similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/StrutsTest.java rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/test-cactus/java/StrutsTest.java diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/struts-jstl/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/struts-jstl/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/struts-jstl/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/struts-jstl/template.properties b/genapp/src/plugin-resources/struts-jstl/template.properties index 87d82079..d65c4b4a 100644 --- a/genapp/src/plugin-resources/struts-jstl/template.properties +++ b/genapp/src/plugin-resources/struts-jstl/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties,project.properties maven.genapp.default.package=example.web diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts-validation/template-resources/build.properties.jboss index 936f4802..cb2cdfba 100644 Binary files a/genapp/src/plugin-resources/struts-validation/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/struts-validation/template-resources/build.properties.jboss differ diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/maven.xml b/genapp/src/plugin-resources/struts-validation/template-resources/maven.xml index 73bbfb59..37157c69 100644 --- a/genapp/src/plugin-resources/struts-validation/template-resources/maven.xml +++ b/genapp/src/plugin-resources/struts-validation/template-resources/maven.xml @@ -17,7 +17,7 @@ */ --> - + diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/project.properties b/genapp/src/plugin-resources/struts-validation/template-resources/project.properties index e086a626..834e21de 100644 --- a/genapp/src/plugin-resources/struts-validation/template-resources/project.properties +++ b/genapp/src/plugin-resources/struts-validation/template-resources/project.properties @@ -15,23 +15,24 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus,src/conf +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java,src/main/config maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge +maven.xdoclet.webdoclet.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.strutsconfigxml.0=true maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1 maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge +maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.strutsvalidationxml.0=true maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.strutsvalidationxml.0.mergeDir=src/merge +maven.xdoclet.webdoclet.strutsvalidationxml.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.jbosswebxml.0=true maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge +maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.fileset.0.include=**/*.java maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/project.xml b/genapp/src/plugin-resources/struts-validation/template-resources/project.xml index e065be3e..3ca2b49c 100644 --- a/genapp/src/plugin-resources/struts-validation/template-resources/project.xml +++ b/genapp/src/plugin-resources/struts-validation/template-resources/project.xml @@ -265,9 +265,10 @@ + war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -278,7 +279,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/java/InputAction.java b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/java/InputAction.java similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/java/InputAction.java rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/java/InputAction.java diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/merge/servlet-mappings.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/servlet-mappings.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/merge/servlet-mappings.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/servlet-mappings.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/merge/servlets.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/servlets.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/merge/servlets.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/servlets.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/merge/struts-forms.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/struts-forms.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/merge/struts-forms.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/struts-forms.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/merge/struts-message-resources.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/struts-message-resources.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/merge/struts-message-resources.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/struts-message-resources.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/merge/struts-plugins.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/struts-plugins.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/merge/struts-plugins.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/struts-plugins.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/merge/validation-global.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/validation-global.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/merge/validation-global.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/merge/validation-global.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/conf/ApplicationResources.properties b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/resources/ApplicationResources.properties similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/conf/ApplicationResources.properties rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/resources/ApplicationResources.properties diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/webapp/WEB-INF/jsp/input.jsp b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/webapp/WEB-INF/jsp/input.jsp rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/webapp/WEB-INF/validator-rules.xml b/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/webapp/WEB-INF/validator-rules.xml rename to genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/HttpUnitTest.java rename to genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/StrutsTest.java b/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/StrutsTest.java rename to genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java diff --git a/genapp/src/plugin-resources/struts-validation/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/struts-validation/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/struts-validation/template.properties b/genapp/src/plugin-resources/struts-validation/template.properties index afd112ac..b935d9f2 100644 --- a/genapp/src/plugin-resources/struts-validation/template.properties +++ b/genapp/src/plugin-resources/struts-validation/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties maven.genapp.default.package=example.web diff --git a/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss b/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss index a4afe3d2..955121c7 100644 Binary files a/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss differ diff --git a/genapp/src/plugin-resources/struts/template-resources/project.properties b/genapp/src/plugin-resources/struts/template-resources/project.properties index 2ae0a3b1..557ab305 100644 --- a/genapp/src/plugin-resources/struts/template-resources/project.properties +++ b/genapp/src/plugin-resources/struts/template-resources/project.properties @@ -15,22 +15,23 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus,src/conf +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java,src/main/config maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge +maven.xdoclet.webdoclet.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.strutsconfigxml.0=true maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1 maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge +maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.strutsvalidationxml.0=true maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.jbosswebxml.0=true maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge +maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@ maven.xdoclet.webdoclet.fileset.0.include=**/*.java -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml index 2fe4b1b4..2da836b9 100644 --- a/genapp/src/plugin-resources/struts/template-resources/project.xml +++ b/genapp/src/plugin-resources/struts/template-resources/project.xml @@ -249,8 +249,8 @@ war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -261,7 +261,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/struts/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/struts/template-resources/src/java/InputAction.java b/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/java/InputAction.java rename to genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/servlet-mappings.xml b/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/merge/servlet-mappings.xml rename to genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/servlets.xml b/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/merge/servlets.xml rename to genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-forms.xml b/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/merge/struts-forms.xml rename to genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml diff --git a/genapp/src/plugin-resources/struts/template-resources/src/merge/struts-message-resources.xml b/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/merge/struts-message-resources.xml rename to genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml diff --git a/genapp/src/plugin-resources/struts/template-resources/src/conf/ApplicationResources.properties b/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/conf/ApplicationResources.properties rename to genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties diff --git a/genapp/src/plugin-resources/struts/template-resources/src/webapp/WEB-INF/jsp/input.jsp b/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/webapp/WEB-INF/jsp/input.jsp rename to genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp diff --git a/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/test-cactus/HttpUnitTest.java rename to genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/StrutsTest.java b/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/test-cactus/StrutsTest.java rename to genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java diff --git a/genapp/src/plugin-resources/struts/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/struts/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/struts/template.properties b/genapp/src/plugin-resources/struts/template.properties index 87d82079..d65c4b4a 100644 --- a/genapp/src/plugin-resources/struts/template.properties +++ b/genapp/src/plugin-resources/struts/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties,project.properties maven.genapp.default.package=example.web diff --git a/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss b/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss index 0743db8e..ae2d7582 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss +++ b/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss @@ -19,7 +19,7 @@ cactus.home.jboss3x=C:/j2ee/jboss-3.2.3_jetty-4.2.14 # Specify the XDoclet properties for the descriptor maven.xdoclet.ejbdoclet.jboss.0=true maven.xdoclet.ejbdoclet.jboss.0.Version=3.2 -maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge +maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table" maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody" maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF diff --git a/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat b/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat index 5c76c63c..01965f80 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat +++ b/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat @@ -19,7 +19,7 @@ cactus.home.tomcat5x=C:/program files/Apache Group/Tomcat 5.5 # Specify the XDoclet properties for the descriptor maven.xdoclet.ejbdoclet.jboss.0=true maven.xdoclet.ejbdoclet.jboss.0.Version=3.2 -maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge +maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table" maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody" maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF diff --git a/genapp/src/plugin-resources/tapestry/template-resources/project.properties b/genapp/src/plugin-resources/tapestry/template-resources/project.properties index 14fe961c..5ec66468 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/project.properties +++ b/genapp/src/plugin-resources/tapestry/template-resources/project.properties @@ -15,14 +15,15 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus,src/conf +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java,src/main/config maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge +maven.xdoclet.webdoclet.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.jbosswebxml.0=true maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge +maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.fileset.0.include=**/*.java -cactus.src.mergewebxml=src/conf/cactus-web.xml +cactus.src.mergewebxml=src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/tapestry/template-resources/project.xml b/genapp/src/plugin-resources/tapestry/template-resources/project.xml index 36c8f1ac..feca6184 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/project.xml +++ b/genapp/src/plugin-resources/tapestry/template-resources/project.xml @@ -276,8 +276,8 @@ war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -288,7 +288,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml similarity index 97% rename from genapp/src/plugin-resources/tapestry/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml index 128d61fa..11edd1f9 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/conf/cactus-web.xml +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml @@ -1,23 +1,23 @@ - - - - - - - + + + + + + + diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/java/Home.java b/genapp/src/plugin-resources/tapestry/template-resources/src/main/java/Home.java similarity index 97% rename from genapp/src/plugin-resources/tapestry/template-resources/src/java/Home.java rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/java/Home.java index 2712d666..d19678c1 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/java/Home.java +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/java/Home.java @@ -1,25 +1,25 @@ -/* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package @PACKAGE@; - -import java.util.Date; -import org.apache.tapestry.html.BasePage; - -public class Home extends BasePage { - public Date getCurrentDate() { - return new Date(); - } +/* + * Copyright 2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package @PACKAGE@; + +import java.util.Date; +import org.apache.tapestry.html.BasePage; + +public class Home extends BasePage { + public Date getCurrentDate() { + return new Date(); + } } \ No newline at end of file diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/filter-mappings.xml b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/filter-mappings.xml similarity index 96% rename from genapp/src/plugin-resources/tapestry/template-resources/src/merge/filter-mappings.xml rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/filter-mappings.xml index e19382b2..d9dca13e 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/filter-mappings.xml +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/filter-mappings.xml @@ -1,4 +1,4 @@ - - redirect - / - + + redirect + / + diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/filters.xml b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/filters.xml similarity index 96% rename from genapp/src/plugin-resources/tapestry/template-resources/src/merge/filters.xml rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/filters.xml index 1950a2a1..7b3a8be3 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/filters.xml +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/filters.xml @@ -1,4 +1,4 @@ - - redirect - org.apache.tapestry.RedirectFilter - + + redirect + org.apache.tapestry.RedirectFilter + diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/servlet-mappings.xml b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/servlet-mappings.xml similarity index 96% rename from genapp/src/plugin-resources/tapestry/template-resources/src/merge/servlet-mappings.xml rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/servlet-mappings.xml index b29b9344..c1e75802 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/servlet-mappings.xml +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/servlet-mappings.xml @@ -1,4 +1,4 @@ - - tapestry - /app - + + tapestry + /app + diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/servlets.xml b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/servlets.xml similarity index 97% rename from genapp/src/plugin-resources/tapestry/template-resources/src/merge/servlets.xml rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/servlets.xml index 499aa32e..b84d9350 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/merge/servlets.xml +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/merge/servlets.xml @@ -1,5 +1,5 @@ - - tapestry - org.apache.tapestry.ApplicationServlet - 0 - + + tapestry + org.apache.tapestry.ApplicationServlet + 0 + diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/conf/ApplicationResources.properties b/genapp/src/plugin-resources/tapestry/template-resources/src/main/resources/ApplicationResources.properties similarity index 97% rename from genapp/src/plugin-resources/tapestry/template-resources/src/conf/ApplicationResources.properties rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/resources/ApplicationResources.properties index 6e09bf37..1850f820 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/conf/ApplicationResources.properties +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/resources/ApplicationResources.properties @@ -1,17 +1,17 @@ -# ------------------------------------------------------------------- -# Copyright 2005 The Apache Software Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ------------------------------------------------------------------- - +# ------------------------------------------------------------------- +# Copyright 2005 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------------- + title.page=The title @PACKAGE@ \ No newline at end of file diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/Home.html b/genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/Home.html similarity index 96% rename from genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/Home.html rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/Home.html index 87b45489..fe89b33d 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/Home.html +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/Home.html @@ -1,32 +1,32 @@ - - - - - Hello World - - - - Welcome to your first Tapestry Application. - -

The current date and time is: This Text Will Be Replaced

- -

Click here to refresh.

- - - + + + + + Hello World + + + + Welcome to your first Tapestry Application. + +

The current date and time is: This Text Will Be Replaced

+ +

Click here to refresh.

+ + + diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/Home.page b/genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/Home.page similarity index 100% rename from genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/Home.page rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/Home.page diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/helloworld.application b/genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/helloworld.application similarity index 100% rename from genapp/src/plugin-resources/tapestry/template-resources/src/webapp/WEB-INF/helloworld.application rename to genapp/src/plugin-resources/tapestry/template-resources/src/main/webapp/WEB-INF/helloworld.application diff --git a/genapp/src/plugin-resources/tapestry/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/tapestry/template-resources/src/test/java/SanityTest.java similarity index 90% rename from genapp/src/plugin-resources/tapestry/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/tapestry/template-resources/src/test/java/SanityTest.java index c0b5407f..4d3cdec4 100755 --- a/genapp/src/plugin-resources/tapestry/template-resources/src/test/SanityTest.java +++ b/genapp/src/plugin-resources/tapestry/template-resources/src/test/java/SanityTest.java @@ -1,30 +1,30 @@ -/* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package @PACKAGE@; - -import junit.framework.TestCase; - -/** - * This is a simple JUnit test case to ensure that the environment is okay. - * - * @author Archimedes Trajano - * @version $Id: SanityTest.java,v 1.1 2004/02/27 06:22:26 evenisse Exp $ - */ -public class SanityTest extends TestCase { - public void testSanity() { - assertEquals( "test", "test" ); - } -} +/* + * Copyright 2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package @PACKAGE@; + +import junit.framework.TestCase; + +/** + * This is a simple JUnit test case to ensure that the environment is okay. + * + * @author Archimedes Trajano + * @version $Id$ + */ +public class SanityTest extends TestCase { + public void testSanity() { + assertEquals( "test", "test" ); + } +} diff --git a/genapp/src/plugin-resources/tapestry/template.properties b/genapp/src/plugin-resources/tapestry/template.properties index 9dbdd598..7b8f5f29 100644 --- a/genapp/src/plugin-resources/tapestry/template.properties +++ b/genapp/src/plugin-resources/tapestry/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/webapp/WEB-INF/**/*.page,src/webapp/WEB-INF/**/*.application +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/webapp/WEB-INF/**/*.page,src/main/webapp/WEB-INF/**/*.application maven.genapp.default.package=example.web diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss b/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss index a4afe3d2..955121c7 100644 Binary files a/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/web-jstl/template-resources/build.properties.jboss differ diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.properties b/genapp/src/plugin-resources/web-jstl/template-resources/project.properties index 1f0b7f9e..ff10ada5 100644 --- a/genapp/src/plugin-resources/web-jstl/template-resources/project.properties +++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.properties @@ -15,13 +15,14 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.0.mergeDir=src/merge +maven.xdoclet.webdoclet.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF -maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge +maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@ maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml index 80e7397f..299bf21f 100644 --- a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml +++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml @@ -185,8 +185,8 @@ war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -197,7 +197,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/web-jstl/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/web-jstl/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/java/HelloWorldServlet.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/main/java/HelloWorldServlet.java similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/java/HelloWorldServlet.java rename to genapp/src/plugin-resources/web-jstl/template-resources/src/main/java/HelloWorldServlet.java diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/web-jstl/template-resources/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/conf/app.properties rename to genapp/src/plugin-resources/web-jstl/template-resources/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/webapp/sample.jsp b/genapp/src/plugin-resources/web-jstl/template-resources/src/main/webapp/sample.jsp similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/webapp/sample.jsp rename to genapp/src/plugin-resources/web-jstl/template-resources/src/main/webapp/sample.jsp diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HelloWorldServletTest.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/java/HelloWorldServletTest.java similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HelloWorldServletTest.java rename to genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/java/HelloWorldServletTest.java diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/HttpUnitTest.java rename to genapp/src/plugin-resources/web-jstl/template-resources/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/web-jstl/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/web-jstl/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/web-jstl/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/web-jstl/template.properties b/genapp/src/plugin-resources/web-jstl/template.properties index 48b10cd4..d4361062 100644 --- a/genapp/src/plugin-resources/web-jstl/template.properties +++ b/genapp/src/plugin-resources/web-jstl/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/webapp/*.jsp,project.properties +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/webapp/*.jsp,project.properties maven.genapp.default.package=example.web diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/project.properties b/genapp/src/plugin-resources/web-velocity/template-resources/project.properties index 8c468fea..697dc21a 100644 --- a/genapp/src/plugin-resources/web-velocity/template-resources/project.properties +++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.properties @@ -15,6 +15,7 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus -maven.war.webapp.dir=${maven.src.dir}/webapp/WEB-INF -cactus.src.mergewebxml = src/conf/cactus-web.xml +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java +maven.war.webapp.dir=${maven.build.dir}/webapp/WEB-INF +cactus.src.mergewebxml = src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml index 82c4de57..4b57362c 100644 --- a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml +++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml @@ -194,8 +194,8 @@ war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -206,7 +206,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/java/HelloWorld.java b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/java/HelloWorld.java similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/java/HelloWorld.java rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/java/HelloWorld.java diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/conf/app.properties rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/WEB-INF/toolbox.xml b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/WEB-INF/toolbox.xml similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/WEB-INF/toolbox.xml rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/WEB-INF/toolbox.xml diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/WEB-INF/velocity.properties b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/WEB-INF/velocity.properties similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/WEB-INF/velocity.properties rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/WEB-INF/velocity.properties diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/WEB-INF/web.xml b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/WEB-INF/web.xml rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/WEB-INF/web.xml diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/sample.vm b/genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/sample.vm similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/webapp/sample.vm rename to genapp/src/plugin-resources/web-velocity/template-resources/src/main/webapp/sample.vm diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/HelloWorldServletTest.java b/genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/java/HelloWorldServletTest.java similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/HelloWorldServletTest.java rename to genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/java/HelloWorldServletTest.java diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/HttpUnitTest.java rename to genapp/src/plugin-resources/web-velocity/template-resources/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/web-velocity/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/web-velocity/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/web-velocity/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/web-velocity/template.properties b/genapp/src/plugin-resources/web-velocity/template.properties index 39bf6180..6034bd98 100644 --- a/genapp/src/plugin-resources/web-velocity/template.properties +++ b/genapp/src/plugin-resources/web-velocity/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml maven.genapp.default.package=example.web diff --git a/genapp/src/plugin-resources/web/template-resources/build.properties.jboss b/genapp/src/plugin-resources/web/template-resources/build.properties.jboss index a4afe3d2..b82a453a 100644 Binary files a/genapp/src/plugin-resources/web/template-resources/build.properties.jboss and b/genapp/src/plugin-resources/web/template-resources/build.properties.jboss differ diff --git a/genapp/src/plugin-resources/web/template-resources/project.properties b/genapp/src/plugin-resources/web/template-resources/project.properties index cdbb5161..66f62499 100644 --- a/genapp/src/plugin-resources/web/template-resources/project.properties +++ b/genapp/src/plugin-resources/web/template-resources/project.properties @@ -15,7 +15,8 @@ # ------------------------------------------------------------------- maven.xdoc.date=left -maven.eclipse.classpath.include=src/test-cactus +maven.docs.src=${basedir}/src/site/xdoc +maven.eclipse.classpath.include=src/test-cactus/java maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet maven.xdoclet.webdoclet.0=true maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF @@ -23,4 +24,4 @@ maven.xdoclet.webdoclet.0.mergeDir=src/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@ -cactus.src.mergewebxml = src/conf/cactus-web.xml +cactus.src.mergewebxml = ${basedir}/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/web/template-resources/project.xml b/genapp/src/plugin-resources/web/template-resources/project.xml index 27f4f50d..de6aa0c7 100644 --- a/genapp/src/plugin-resources/web/template-resources/project.xml +++ b/genapp/src/plugin-resources/web/template-resources/project.xml @@ -166,8 +166,8 @@ war turbine-maven-dev@jakarta.apache.org - src/java - src/test + src/main/java + src/test/java **/*Test.java @@ -178,7 +178,7 @@ - src/conf + src/main/resources *.properties diff --git a/genapp/src/plugin-resources/web/template-resources/src/conf/cactus-web.xml b/genapp/src/plugin-resources/web/template-resources/src/main/config/cactus-web.xml similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/conf/cactus-web.xml rename to genapp/src/plugin-resources/web/template-resources/src/main/config/cactus-web.xml diff --git a/genapp/src/plugin-resources/web/template-resources/src/java/HelloWorldServlet.java b/genapp/src/plugin-resources/web/template-resources/src/main/java/HelloWorldServlet.java similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/java/HelloWorldServlet.java rename to genapp/src/plugin-resources/web/template-resources/src/main/java/HelloWorldServlet.java diff --git a/genapp/src/plugin-resources/web/template-resources/src/conf/app.properties b/genapp/src/plugin-resources/web/template-resources/src/main/resources/app.properties similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/conf/app.properties rename to genapp/src/plugin-resources/web/template-resources/src/main/resources/app.properties diff --git a/genapp/src/plugin-resources/web/template-resources/src/webapp/sample.jsp b/genapp/src/plugin-resources/web/template-resources/src/main/webapp/sample.jsp similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/webapp/sample.jsp rename to genapp/src/plugin-resources/web/template-resources/src/main/webapp/sample.jsp diff --git a/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HelloWorldServletTest.java b/genapp/src/plugin-resources/web/template-resources/src/test-cactus/java/HelloWorldServletTest.java similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/test-cactus/HelloWorldServletTest.java rename to genapp/src/plugin-resources/web/template-resources/src/test-cactus/java/HelloWorldServletTest.java diff --git a/genapp/src/plugin-resources/web/template-resources/src/test-cactus/HttpUnitTest.java b/genapp/src/plugin-resources/web/template-resources/src/test-cactus/java/HttpUnitTest.java similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/test-cactus/HttpUnitTest.java rename to genapp/src/plugin-resources/web/template-resources/src/test-cactus/java/HttpUnitTest.java diff --git a/genapp/src/plugin-resources/web/template-resources/src/test/SanityTest.java b/genapp/src/plugin-resources/web/template-resources/src/test/java/SanityTest.java similarity index 100% rename from genapp/src/plugin-resources/web/template-resources/src/test/SanityTest.java rename to genapp/src/plugin-resources/web/template-resources/src/test/java/SanityTest.java diff --git a/genapp/src/plugin-resources/web/template.properties b/genapp/src/plugin-resources/web/template.properties index 48b10cd4..d4361062 100644 --- a/genapp/src/plugin-resources/web/template.properties +++ b/genapp/src/plugin-resources/web/template.properties @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test,test-cactus -maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/webapp/*.jsp,project.properties +maven.genapp.repackage=main/java,test/java,test-cactus/java +maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/webapp/*.jsp,project.properties maven.genapp.default.package=example.web