Author: wsmoak
Date: Sun Dec 24 12:51:03 2006
New Revision: 490071
URL: http://svn.apache.org/viewvc?view=rev&rev=490071
Log:
Avoid filtering the .properties files, since there is currently no way to
escape the "expression" from Velocity template processing. (See ARCHETYPE-39)
Fix typo, update readme file.
Add additional dependencies to pom.xml and update version numbers.
Add additional files to archetype descriptor.
WW-1412
Modified:
struts/maven/trunk/struts2-archetype-blank/README.txt
struts/maven/trunk/struts2-archetype-blank/pom.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties
Modified: struts/maven/trunk/struts2-archetype-blank/README.txt
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/README.txt?view=diff&rev=490071&r1=490070&r2=490071
==============================================================================
--- struts/maven/trunk/struts2-archetype-blank/README.txt (original)
+++ struts/maven/trunk/struts2-archetype-blank/README.txt Sun Dec 24 12:51:03
2006
@@ -1,17 +1,6 @@
INFORMATION
===========
-- This is Struts 2's "Starter" Maven Archetype
-- To be used to create a simple webapp template that one could alter to meet
his/her needs.
-- The created template contains
- - sitemesh integration
- - a simple Struts action
- - a simple Struts action level validation
- - a simple Struts action alias level validation
- - a simple Struts global conversion
- - a simple Struts action level conversion
- - a simple Struts global resource bundle
- - a simple Struts action level resource bundle
-
+- This is Struts 2's "Blank" Maven Archetype
USAGE
=====
@@ -30,29 +19,17 @@
mvn archetype:create -DgroupId=com.myCompany.mySystem \
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
- -DarchetypeArtifactId=struts2-archetype-starter \
- -DarchetypeVersion=2.0.0-SNAPSHOT \
-
-DremoteRepositories=http://people.apache.org/maven-snapshot-repository
+ -DarchetypeArtifactId=struts2-archetype-blank \
+ -DarchetypeVersion=2.0.2-SNAPSHOT \
+
-DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
IMPORTANT:
==========
-- The generated template is a runnable webapp, some package renaming is
necessary if
-the Struts2 validation, conversion features is to work. In the case above, one
would
-need to rename the resources under
-
-src/main/resource/com/myComp/myApp/*
-
-to
-
-src/main/resource/com/myCompany/mySystem/*
-
-This is due to the fact that I can't find a way to change maven archetype
resource
-path dynamically. If anyone knows how kindly let us know
(dev@struts.apache.org).
-Tia
-
-
-
+- The generated template uses the 'example' package, regardless of what you
+specify during mvn archetype:create.
+Unfortunately, the Maven Archetype plugin does not currently provide a way to
+move resource files into a package structure.
- to compile, execute
mvn compile
@@ -67,8 +44,5 @@
mvn package
- to start it with jetty6 execute
- mvn jetty6:run
-
-
-
+ mvn jetty:run
Modified: struts/maven/trunk/struts2-archetype-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/pom.xml?view=diff&rev=490071&r1=490070&r2=490071
==============================================================================
--- struts/maven/trunk/struts2-archetype-blank/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-blank/pom.xml Sun Dec 24 12:51:03 2006
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Struts 2 Archetypes - Blank</name>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml?view=diff&rev=490071&r1=490070&r2=490071
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
Sun Dec 24 12:51:03 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
- <id>struts2-archetype-starter</id>
+ <id>struts2-archetype-blank</id>
<sources>
<source>src/main/java/example/ExampleSupport.java</source>
<source>src/main/java/example/HelloWorld.java</source>
@@ -9,15 +9,23 @@
</sources>
<resources>
<resource>src/main/resources/example/Login-validation.xml</resource>
- <resource>src/main/resources/example/package.properties</resource>
- <resource>src/main/resources/example/package_es.properties</resource>
+ <resource
filtered="false">src/main/resources/example/package.properties</resource>
+ <resource
filtered="false">src/main/resources/example/package_es.properties</resource>
<resource>src/main/resources/example.xml</resource>
<resource>src/main/resources/struts.xml</resource>
+ <resource>src/main/webapp/index.html</resource>
+ <resource>src/main/webapp/example/HelloWorld.jsp</resource>
+ <resource>src/main/webapp/example/Login.jsp</resource>
+ <resource>src/main/webapp/example/Menu.jsp</resource>
+ <resource>src/main/webapp/example/Missing.jsp</resource>
+ <resource>src/main/webapp/example/Register.jsp</resource>
+ <resource>src/main/webapp/example/Welcome.jsp</resource>
+ <resource>src/main/webapp/WEB-INF/web.xml</resource>
</resources>
<testSources>
<source>src/test/java/example/ConfigTest.java</source>
<source>src/test/java/example/HelloWorldTest.java</source>
- <source>src/test/java/example/Login.java</source>
+ <source>src/test/java/example/LoginTest.java</source>
</testSources>
</archetype>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml?view=diff&rev=490071&r1=490070&r2=490071
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
Sun Dec 24 12:51:03 2006
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-apps</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-blank</artifactId>
- <packaging>war</packaging>
- <name>Blank Webapp</name>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/</url>
- </scm>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <packaging>war</packaging>
+ <name>Struts 2 Blank Webapp</name>
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -33,7 +31,43 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>1.2.8</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties?view=diff&rev=490071&r1=490070&r2=490071
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties
Sun Dec 24 12:51:03 2006
@@ -2,4 +2,4 @@
requiredstring = ${getText(fieldName)} is required.
password = Password
username = User Name
-Missing.message = This feature is under construction. Please try again in the
next interation.
+Missing.message = This feature is under construction. Please try again in the
next iteration.
