Author: wsmoak
Date: Fri Apr 14 21:27:55 2006
New Revision: 394254
URL: http://svn.apache.org/viewcvs?rev=394254&view=rev
Log:
Update the archetype after recent changes in Struts Action, and remove the
Tiles dependency.
Removed:
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tiles-defs.xml
Modified:
struts/sandbox/trunk/archetypes/action-blank/README.txt
struts/sandbox/trunk/archetypes/action-blank/pom.xml
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/pom.xml
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/resources/MessageResources.properties
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: struts/sandbox/trunk/archetypes/action-blank/README.txt
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/README.txt?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/action-blank/README.txt (original)
+++ struts/sandbox/trunk/archetypes/action-blank/README.txt Fri Apr 14 21:27:55
2006
@@ -1,6 +1,6 @@
-Struts Action Blank Archetype
-=============================
+Struts Archetypes - Action Blank
+================================
This directory contains the Struts Action Blank Archetype for Maven 2.
@@ -14,9 +14,9 @@
$ cd ~/projects
$ mvn archetype:create
- -DarchetypeGroupId=struts
+ -DarchetypeGroupId=org.apache.struts.action
-DarchetypeArtifactId=struts-archetype-action-blank
- -DarchetypeVersion=1.3.0-SNAPSHOT
+ -DarchetypeVersion=1.3.2-SNAPSHOT
-DgroupId=com.example
-DpackageName=com.example.projectname
-DartifactId=my-webapp
@@ -24,41 +24,15 @@
To build your new webapp:
$ cd my-webapp
- $ mvn war:war
-
-
-Prerequisites
--------------
-
-In order to build the archetype (and the webapp created from it) you will need
-the Struts Action, Taglib and Tiles jars in your local Maven 2 repository.
-
-You can accomplish this by building the artifacts with Maven 2:
-
-$ svn co http://svn.apache.org/repos/asf/struts/current struts/current
-$ cd struts/current/build
-$ mvn install
-
-Alternately, download the nightly builds and install each file as follows:
-
- $ mvn install:install-file
- -Dfile=/path/to/struts-action-1.3.0-dev.jar
- -DgroupId=org.apache.struts
- -DartifactId=struts-action
- -Dversion=1.3.0-SNAPSHOT
- -Dpackaging=jar
- -DgeneratePom=true
-
-Repeat for Tiles and Taglib.
-
-
-Other Issues
-------------
-
+ $ mvn install
-FAQs
-----
+To start Tomcat and deploy your new webapp:
-Q:
+ 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.15</home>
-A:
+ $ mvn package cargo:start
Modified: struts/sandbox/trunk/archetypes/action-blank/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/pom.xml?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
--- struts/sandbox/trunk/archetypes/action-blank/pom.xml (original)
+++ struts/sandbox/trunk/archetypes/action-blank/pom.xml Fri Apr 14 21:27:55
2006
@@ -3,11 +3,10 @@
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>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-archetype-action-blank</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
- <name>Struts Action Blank Archetype</name>
+ <version>1.3.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Struts Archetypes - Action Blank</name>
</project>
-
Modified:
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml
Fri Apr 14 21:27:55 2006
@@ -5,7 +5,6 @@
<resource>src/main/webapp/index.jsp</resource>
<resource>src/main/webapp/pages/Welcome.jsp</resource>
<resource>src/main/webapp/WEB-INF/struts-config.xml</resource>
- <resource>src/main/webapp/WEB-INF/tiles-defs.xml</resource>
<resource>src/main/webapp/WEB-INF/validation.xml</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/resources/MessageResources.properties</resource>
Modified:
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/pom.xml?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/pom.xml
Fri Apr 14 21:27:55 2006
@@ -17,23 +17,40 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>struts</groupId>
- <artifactId>struts-action</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-taglib</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>struts</groupId>
<artifactId>struts-tiles</artifactId>
<version>1.3.0-SNAPSHOT</version>
- </dependency>
+ </dependency-->
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
- </build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>c:/java/apache-tomcat-5.5.15</home>
+ <log>target/tomcat5x.log</log>
+ <output>target/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>target/tomcat5x</home>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/resources/MessageResources.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/resources/MessageResources.properties?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/resources/MessageResources.properties
(original)
+++
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/resources/MessageResources.properties
Fri Apr 14 21:27:55 2006
@@ -26,4 +26,4 @@
# -- welcome --
welcome.title=Struts Blank Application
welcome.heading=Welcome!
-welcome.message=To get started on your own application, edit the skeleton
configuration files as needed, build with "mvn war:war", and you are on your
way! (You can find the MessageResources.properties file with this message in
the /src/main/resources folder.)
+welcome.message=To get started on your own application, edit the skeleton
configuration files as needed, build with "mvn install", and you are on your
way! (You can find the MessageResources.properties file with this message in
the /src/main/resources folder.)
Modified:
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml
Fri Apr 14 21:27:55 2006
@@ -8,8 +8,8 @@
This is a blank Struts configuration file with an example
welcome action/page and other commented sample elements.
- Tiles and the Struts Validator are configured using the factory defaults
- and are ready-to-use.
+ Struts Validator is configured using the factory defaults
+ and is ready-to-use.
NOTE: If you have a generator tool to create the corresponding Java
classes
for you, you could include the details in the "form-bean" declarations.
@@ -137,17 +137,19 @@
false : no validation
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.
+
+ -->
+ <!--
<plug-in className="org.apache.struts.tiles.TilesPlugin" >
- <!-- Path to XML definition file -->
<set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml" />
- <!-- Set Module-awareness to true -->
<set-property property="moduleAware" value="true" />
</plug-in>
-
+ -->
<!-- =================================================== Validator plugin -->
Modified:
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=394254&r1=394253&r2=394254&view=diff
==============================================================================
---
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Fri Apr 14 21:27:55 2006
@@ -15,10 +15,6 @@
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
