Author: gseitz
Date: Wed May 12 21:25:56 2010
New Revision: 943697
URL: http://svn.apache.org/viewvc?rev=943697&view=rev
Log:
WICKET-2009: converted archetype to the new Archetype 2.0 format
Added:
wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/maven/
wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
Removed:
wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/archetype.xml
Modified:
wicket/trunk/archetypes/quickstart/pom.xml
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
wicket/trunk/pom.xml
Modified: wicket/trunk/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/pom.xml?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
--- wicket/trunk/archetypes/quickstart/pom.xml (original)
+++ wicket/trunk/archetypes/quickstart/pom.xml Wed May 12 21:25:56 2010
@@ -8,7 +8,7 @@
</parent>
<artifactId>wicket-archetype-quickstart</artifactId>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>Wicket Quickstart Archetype</name>
<build>
@@ -21,6 +21,17 @@
</includes>
</resource>
</resources>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
-
</project>
Added:
wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=943697&view=auto
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
(added)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
Wed May 12 21:25:56 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor name="quickstart">
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ <include>**/*.html</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="false" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="false" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
\ No newline at end of file
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
(original)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HomePage.java
Wed May 12 21:25:56 2010
@@ -1,6 +1,6 @@
-package ${packageName};
+package ${package};
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.WebPage;
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
(original)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
Wed May 12 21:25:56 2010
@@ -1,11 +1,11 @@
-package ${packageName};
+package ${package};
import org.apache.wicket.protocol.http.WebApplication;
/**
* Application object for your web application. If you want to run this
application without deploying, run the Start class.
*
- * @see ${packageName}.Start#main(String[])
+ * @see ${package}.Start#main(String[])
*/
public class WicketApplication extends WebApplication
{
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Wed May 12 21:25:56 2010
@@ -21,7 +21,7 @@
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
-
<param-value>${packageName}.WicketApplication</param-value>
+ <param-value>${package}.WicketApplication</param-value>
</init-param>
</filter>
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
(original)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/Start.java
Wed May 12 21:25:56 2010
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${package};
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
(original)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/TestHomePage.java
Wed May 12 21:25:56 2010
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${package};
import junit.framework.TestCase;
import org.apache.wicket.util.tester.WicketTester;
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=943697&r1=943696&r2=943697&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Wed May 12 21:25:56 2010
@@ -789,6 +789,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-5</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
