Author: ltheussl Date: Tue Jan 3 14:01:06 2006 New Revision: 365753 URL: http://svn.apache.org/viewcvs?rev=365753&view=rev Log: PR: MPGENAPP-21 (part) Make generated structure comply with maven standards (default template)
Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java (with props) maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/resources/ Removed: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/conf/ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/java/ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/AbstractTestCase.java maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/AppTest.java maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/NaughtyTest.java Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.properties maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.xml maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template.properties maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/maven.xml maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/template.properties maven/maven-1/plugins/trunk/genapp/xdocs/properties.xml Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt Tue Jan 3 14:01:06 2006 @@ -0,0 +1,13 @@ +Copyright 2001-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. Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/LICENSE.txt ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.properties URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.properties?rev=365753&r1=365752&r2=365753&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.properties (original) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.properties Tue Jan 3 14:01:06 2006 @@ -14,5 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- +maven.docs.src=${basedir}/src/site/xdoc + maven.xdoc.date=left -## maven.xdoc.version=${pom.currentVersion} \ No newline at end of file +## maven.xdoc.version=${pom.currentVersion} Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.xml?rev=365753&r1=365752&r2=365753&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.xml (original) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/project.xml Tue Jan 3 14:01:06 2006 @@ -81,9 +81,10 @@ <!-- build information for the project --> <build> + <defaultGoal>jar</defaultGoal> <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress> - <sourceDirectory>src/java</sourceDirectory> - <unitTestSourceDirectory>src/test</unitTestSourceDirectory> + <sourceDirectory>src/main/java</sourceDirectory> + <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> <unitTest> <includes> <include>**/*Test.java</include> @@ -94,11 +95,30 @@ </unitTest> <resources> <resource> - <directory>src/conf</directory> + <directory>src/main/resources</directory> <includes> <include>*.properties</include> </includes> </resource> </resources> </build> + + <reports> + <report>maven-license-plugin</report> + <!-- + <report>maven-faq-plugin</report> + <report>maven-jdepend-plugin</report> + <report>maven-checkstyle-plugin</report> + <report>maven-changes-plugin</report> + <report>maven-changelog-plugin</report> + <report>maven-developer-activity-plugin</report> + <report>maven-file-activity-plugin</report> + <report>maven-javadoc-plugin</report> + <report>maven-jxr-plugin</report> + <report>maven-junit-report-plugin</report> + <report>maven-linkcheck-plugin</report> + <report>maven-tasklist-plugin</report> + --> + </reports> + </project> Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java Tue Jan 3 14:01:06 2006 @@ -0,0 +1,15 @@ +package @PACKAGE@; + +/** + * Hello world! + * + * @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a> + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/java/App.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties Tue Jan 3 14:01:06 2006 @@ -0,0 +1,18 @@ +# ------------------------------------------------------------------- +# Copyright 2001-2004 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. +# ------------------------------------------------------------------- + +# Sample app properties. +foo=bar Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/main/resources/app.properties ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml Tue Jan 3 14:01:06 2006 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<document> + + <properties> + <title>@NAME@</title> + <!--<author email="[EMAIL PROTECTED]">John Doe</author>--> + </properties> + + <!-- An optional head, the description is used for the sitemap. --> + <!-- + <head> + <meta name="keywords" content="List of keywords"/> + <meta name="description" content="The description"/> + </head> + --> + + <body> + + <section name="@NAME@"> + <p> + @NAME@ is an extremely cool application. + </p> + <!-- + <subsection name="A subsection"> + </subsection> + --> + </section> + + </body> + +</document> Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/index.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml Tue Jan 3 14:01:06 2006 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="@NAME@"> + + <title>@NAME@</title> + + <body> + + <!-- + <breadcrumbs> + <item name="Home" href="/index.html"/> + </breadcrumbs> + --> + + <links> + <item name="Home" href="/index.html"/> + </links> + + <!-- An optional sitemap --> + <!-- <sitemap/> --> + + <!-- A navigation menu --> + <menu name="Documentation"> + <item name="Home" href="/index.html"/> + <!-- + <item name="A submenu" href="/submenu/index.html" collapse="true"> + <item name="FAQ" href="/faq.html"/> + </item> + --> + </menu> + + <!-- A Google search field --> + <!-- <search/> --> + + <!-- Additional powered-by logos --> + <!-- + <powered-by> + </powered-by> + --> + + <!-- footer will be placed above the (c) --> + <!-- + <footer> + </footer> + --> + + </body> +</project> Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/site/xdoc/navigation.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java Tue Jan 3 14:01:06 2006 @@ -0,0 +1,40 @@ +package @PACKAGE@; + +import java.io.File; + +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Abstract base class for test cases. + * + * @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a> + */ +public abstract class AbstractTestCase + extends TestCase +{ + /** + * Basedir for all file I/O. Important when running tests from + * the reactor. + */ + public String basedir = System.getProperty("basedir"); + + /** + * Constructor. + */ + public AbstractTestCase(String testName) + { + super(testName); + } + + /** + * Get test input file. + * + * @param path Path to test input file. + */ + public String getTestFile(String path) + { + return new File(basedir,path).getAbsolutePath(); + } +} + Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AbstractTestCase.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java Tue Jan 3 14:01:06 2006 @@ -0,0 +1,40 @@ +package @PACKAGE@; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a> + */ +public class AppTest + extends AbstractTestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertEquals( "maven kicks ass", "maven kicks ass" ); + } +} Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/AppTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java?rev=365753&view=auto ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java (added) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java Tue Jan 3 14:01:06 2006 @@ -0,0 +1,40 @@ +package @PACKAGE@; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a> + */ +public class NaughtyTest + extends AbstractTestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public NaughtyTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( NaughtyTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + // Crash and burn! + } +} Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template-resources/src/test/java/NaughtyTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template.properties URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template.properties?rev=365753&r1=365752&r2=365753&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template.properties (original) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/default/template.properties Tue Jan 3 14:01:06 2006 @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=java,test -maven.genapp.filter=project.xml +maven.genapp.repackage=main/java,test/java +maven.genapp.filter=project.xml,**/index.xml,**/navigation.xml maven.genapp.default.package=example.app Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/maven.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/maven.xml?rev=365753&r1=365752&r2=365753&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/maven.xml (original) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/maven.xml Tue Jan 3 14:01:06 2006 @@ -29,8 +29,8 @@ <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src"> <ant:fileset dir="${maven.genapp.template.dir}/template-resources/src"/> </ant:move> - <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src/my_java"> - <ant:fileset dir="${maven.genapp.template.dir}/template-resources/my_src/java"/> + <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src/main/my_java"> + <ant:fileset dir="${maven.genapp.template.dir}/template-resources/my_src/main/java"/> </ant:move> <ant:move todir="${maven.genapp.template.dir}/template-resources/my_src/my_test"> <ant:fileset dir="${maven.genapp.template.dir}/template-resources/my_src/test"/> @@ -46,7 +46,7 @@ <assert:assertFileExists file="${maven.genapp.basedir}/project.xml"/> <assert:assertFileExists file="${maven.genapp.basedir}/project.properties"/> <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}"/> - <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}/${myJava}"/> + <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}/main/${myJava}"/> <assert:assertFileExists file="${maven.genapp.basedir}/${mySrc}/${myTest}"/> </goal> </project> Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/template.properties URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/template.properties?rev=365753&r1=365752&r2=365753&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/template.properties (original) +++ maven/maven-1/plugins/trunk/genapp/src/plugin-test/nonStandardDirsTest/template.properties Tue Jan 3 14:01:06 2006 @@ -14,7 +14,7 @@ # limitations under the License. # ------------------------------------------------------------------- -maven.genapp.repackage=my_java,my_test +maven.genapp.repackage=main/my_java,my_test/java maven.genapp.filter=project.xml maven.genapp.default.package=example.app Modified: maven/maven-1/plugins/trunk/genapp/xdocs/properties.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/xdocs/properties.xml?rev=365753&r1=365752&r2=365753&view=diff ============================================================================== --- maven/maven-1/plugins/trunk/genapp/xdocs/properties.xml (original) +++ maven/maven-1/plugins/trunk/genapp/xdocs/properties.xml Tue Jan 3 14:01:06 2006 @@ -43,7 +43,7 @@ into the new project after they have been filtered. The filtering replaces placeholders with properties (see below). </td> - <td>java,test</td> + <td>project.xml,**/index.xml,**/navigation.xml</td> </tr> <tr> <td>maven.genapp.param</td> @@ -62,7 +62,7 @@ defined with the property maven.genapp.template.package. The files are not only copied, but also filtered. </td> - <td>project.xml</td> + <td>main/java,test/java</td> </tr> <tr> <td>maven.genapp.template</td> @@ -111,7 +111,7 @@ Base directory for the <code>maven.genapp.repackage</code> property. </td> <td> - ${src} + <code>src</code> </td> </tr> </table>