Author: wsmoak
Date: Sun Aug 27 00:15:00 2006
New Revision: 437316
URL: http://svn.apache.org/viewvc?rev=437316&view=rev
Log:
The released archetype version number will match the Struts version it uses, so
set it to 1.3.5-SNAPSHOT now, and release as struts-archetype-blank 1.3.5.
Complete the Tiles configuration, but leave it commented out.
STR-2899
Modified:
struts/maven/trunk/struts-archetype-blank/README.txt
struts/maven/trunk/struts-archetype-blank/pom.xml
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: struts/maven/trunk/struts-archetype-blank/README.txt
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-archetype-blank/README.txt?rev=437316&r1=437315&r2=437316&view=diff
==============================================================================
--- struts/maven/trunk/struts-archetype-blank/README.txt (original)
+++ struts/maven/trunk/struts-archetype-blank/README.txt Sun Aug 27 00:15:00
2006
@@ -10,10 +10,12 @@
$ mvn archetype:create \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts-archetype-blank \
- -DarchetypeVersion=1.0-SNAPSHOT \
+ -DarchetypeVersion=<version> \
-DgroupId=com.example \
-DpackageName=com.example.projectname \
- -DartifactId=my-webapp \
+ -DartifactId=projectname
+
+ If <version> ends in -SNAPSHOT, use the snapshot repo:
-DremoteRepositories=http://people.apache.org/maven-snapshot-repository
To build your new webapp:
Modified: struts/maven/trunk/struts-archetype-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-archetype-blank/pom.xml?rev=437316&r1=437315&r2=437316&view=diff
==============================================================================
--- struts/maven/trunk/struts-archetype-blank/pom.xml (original)
+++ struts/maven/trunk/struts-archetype-blank/pom.xml Sun Aug 27 00:15:00 2006
@@ -6,11 +6,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-master</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>3</version>
</parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts-archetype-blank</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.3.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts Archetypes - Blank</name>
Modified:
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/pom.xml?rev=437316&r1=437315&r2=437316&view=diff
==============================================================================
---
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/pom.xml
Sun Aug 27 00:15:00 2006
@@ -25,28 +25,28 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-taglib</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.3.5</version>
</dependency>
<!--dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-tiles</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.3.5</version>
</dependency-->
<!--dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-extras</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.3.5</version>
</dependency-->
<!--dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-el</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.3.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -81,17 +81,16 @@
</plugins>
</build>
- <!-- Remove this section before releasing the archetype.
- It is only required when using snapshots that can't be retrieved
- from the default central Maven repository. -->
+ <!-- Uncomment in order to use Apache's Maven 2 snapshot repository
<repositories>
<repository>
<id>apache.snapshots</id>
<name>Apache Maven Repository (Snapshots and Test Builds)</name>
<url>http://cvs.apache.org/maven-snapshot-repository</url>
- <releases><enabled>true</enabled></releases>
+ <releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
</repositories>
+ -->
</project>
Modified:
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml?rev=437316&r1=437315&r2=437316&view=diff
==============================================================================
---
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
Sun Aug 27 00:15:00 2006
@@ -138,8 +138,10 @@
Paths found in Tiles definitions are relative to the main context.
- To use this plugin, uncomment the struts-tiles dependency in pom.xml
- directory then uncomment the plugin definition below.
+ To use this plugin, uncomment the following:
+ - the struts-tiles dependency in pom.xml,
+ - the chainConfig init-param in web.xml, and
+ - the the plugin definition below.
-->
<!--
Modified:
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=437316&r1=437315&r2=437316&view=diff
==============================================================================
---
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
struts/maven/trunk/struts-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Sun Aug 27 00:15:00 2006
@@ -15,6 +15,12 @@
<param-name>config</param-name>
<param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
+ <!--
+ <init-param>
+ <param-name>chainConfig</param-name>
+ <param-value>org/apache/struts/tiles/chain-config.xml</param-value>
+ </init-param>
+ -->
<load-on-startup>2</load-on-startup>
</servlet>
