Author: wsmoak
Date: Wed May 31 21:02:16 2006
New Revision: 410734
URL: http://svn.apache.org/viewvc?rev=410734&view=rev
Log:
Update the Shale Blank archetype structure, version and dependencies.
Added:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
- copied, changed from r410437,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml
Removed:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/
Modified:
struts/sandbox/trunk/archetypes/shale-blank/README.txt
struts/sandbox/trunk/archetypes/shale-blank/pom.xml
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
Modified: struts/sandbox/trunk/archetypes/shale-blank/README.txt
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/README.txt?rev=410734&r1=410733&r2=410734&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/README.txt (original)
+++ struts/sandbox/trunk/archetypes/shale-blank/README.txt Wed May 31 21:02:16
2006
@@ -4,34 +4,45 @@
This directory contains the Shale Blank Archetype for Maven 2.
-To build and install the archetype in your local repository:
-
- $ svn co http://svn.apache.org/repos/asf/struts/sandbox/trunk/archetypes
- $ cd archetypes/shale-blank
- $ mvn install
-
To use the archetype to create a blank project:
$ cd ~/projects
- $ mvn archetype:create
- -DarchetypeGroupId=struts
- -DarchetypeArtifactId=struts-archetype-shale-blank
- -DarchetypeVersion=1.0.1-SNAPSHOT
- -DgroupId=com.example
- -DpackageName=com.example.projectname
- -DartifactId=projectname
+ $ mvn archetype:create \
+ -DarchetypeGroupId=org.apache.struts.shale \
+ -DarchetypeArtifactId=struts-archetype-shale-blank \
+ -DarchetypeVersion=1.0-SNAPSHOT \
+ -DgroupId=com.example \
+ -DpackageName=com.example.projectname \
+ -DartifactId=projectname \
+
-DremoteRepositories=http://people.apache.org/maven-snapshot-repository
-To build your new webapp:
+ You will then need to move src/main/resources/Bundle.properties into the
+ proper package structure under src/main/resources.
+
+To build your new webapp and install it in your local Maven repository:
$ cd projectname
- $ mvn package
+ $ mvn install
-To start Tomcat 5.5 and deploy your webapp:
+To start Tomcat and deploy your new webapp:
- $ mvn cargo:start
+ Modify pom.xml to provide the path to a local Tomcat 5.x installation:
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ ...
+ <home>c:/java/apache-tomcat-5.5.17</home>
+
+ $ mvn package cargo:start
Open a browser and visit http://localhost:8080/projectname
+To build and install the archetype in your local repository:
+
+ $ svn co http://svn.apache.org/repos/asf/struts/sandbox/trunk/archetypes
+ $ cd archetypes/shale-blank
+ $ mvn install
+
Prerequisites
-------------
@@ -40,19 +51,7 @@
Cargo Configuration
-------------------
- The Cargo plugin is configured to download Apache Tomcat 5.5.15.
-
- To use a locally installed version, in pom.xml,
- 1. Uncomment the <home> element and change the path
- 2. Remove the <zipUrlInstaller> section.
-
-Other Issues
-------------
-
-
-FAQs
-----
-
-Q:
+ The Cargo plugin can be configured to download Apache Tomcat 5.5.17 by
+ (in pom.xml) removing the <home> element and uncommenting the
+ <zipUrlInstaller> section.
-A:
Modified: struts/sandbox/trunk/archetypes/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/pom.xml?rev=410734&r1=410733&r2=410734&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/shale-blank/pom.xml (original)
+++ struts/sandbox/trunk/archetypes/shale-blank/pom.xml Wed May 31 21:02:16 2006
@@ -3,10 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-parent</artifactId>
+ <version>2</version>
+ </parent>
+
+ <groupId>org.apache.struts.shale</groupId>
<artifactId>struts-archetype-shale-blank</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Shale Blank Archetype</name>
<build>
Modified:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml?rev=410734&r1=410733&r2=410734&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/META-INF/archetype.xml
Wed May 31 21:02:16 2006
@@ -22,12 +22,25 @@
<id>shale-blank</id>
<sources>
<source>src/main/java/WelcomeBean.java</source>
- <source>src/main/resources/Bundle.properties</source>
+
+ <!-- package.html does not get included in the archetype jar
+ despite being in target/classes after mvn install -->
+ <!--source>src/main/java/package.html</source-->
+
+ <!-- The next line causes an error with 'mvn archetype:create':
+ Embedded error: Template 'src/main/resources/Bundle.properties'
+ not in directory 'src/main/java' -->
+ <!--source>src/main/resources/Bundle.properties</source-->
+
</sources>
<testSources>
<source>src/test/java/WelcomeBeanTestCase.java</source>
</testSources>
<resources>
+ <!-- See above, but here, Bundle.properties
+ do not get placed in the package structure -->
+ <resource>src/main/resources/Bundle.properties</resource>
+
<resource>src/main/java/overview.html</resource>
<resource>src/main/webapp/index.jsp</resource>
<resource>src/main/webapp/messages.jspf</resource>
@@ -35,7 +48,7 @@
<resource>src/main/webapp/WEB-INF/chain-config.xml</resource>
<resource>src/main/webapp/WEB-INF/dialog-config.xml</resource>
<resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- <resource>src/main/webapp-filtered/WEB-INF/web.xml</resource>
+ <resource>src/main/webapp/WEB-INF/web.xml</resource>
</resources>
</archetype>
Modified:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml?rev=410734&r1=410733&r2=410734&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/pom.xml
Wed May 31 21:02:16 2006
@@ -10,14 +10,6 @@
<name>Shale Blank Archetype</name>
<url>http://struts.apache.org/struts-shale</url>
- <repositories>
- <repository>
- <id>apache-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -27,15 +19,15 @@
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
@@ -53,15 +45,15 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.shale</groupId>
<artifactId>shale-core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -70,39 +62,38 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>0.1</version>
- <configuration>
- <container>
- <containerId>tomcat5x</containerId>
- <!--home>C:/java/apache-tomcat-5.5.15</home-->
- <zipUrlInstaller>
-
<url>http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.zip</url>
-
<installDir>${project.build.directory}/tomcat-zip</installDir>
- </zipUrlInstaller>
- </container>
- <configuration>
- <dir>${project.build.directory}/tomcat</dir>
- </configuration>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources/</directory>
- </resource>
- <resource>
- <directory>src/main/webapp-filtered</directory>
- <targetPath>../${artifactId}/</targetPath>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>c:/java/apache-tomcat-5.5.17</home>
+ <!--zipUrlInstaller>
+
<url>http://mirrors.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.zip</url>
+
<installDir>${project.build.directory}/tomcat-zip</installDir>
+ </zipUrlInstaller-->
+ <log>target/tomcat5x.log</log>
+ <output>target/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>target/tomcat5x</home>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
<finalName>${artifactId}</finalName>
</build>
+
+ <!-- Remove before releasing the archetype. This is only necessary when
+ using snapshot dependencies that can't be retrieved from the
+ central Maven repo -->
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ </repository>
+ </repositories>
- <properties>
- <state.saving.method>client</state.saving.method>
- </properties>
</project>
Copied:
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(from r410437,
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?p2=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml&p1=struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml&r1=410437&r2=410734&rev=410734&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp-filtered/WEB-INF/web.xml
(original)
+++
struts/sandbox/trunk/archetypes/shale-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Wed May 31 21:02:16 2006
@@ -26,7 +26,7 @@
<!-- Select JSF State Saving Mode -->
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>${state.saving.method}</param-value>
+ <param-value>client</param-value>
</context-param>
<!-- JSF Configuration Resources (comma-separated list) -->
