You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/18 00:30:06 UTC
svn commit: r422901 - in /struts/maven/trunk/struts2-archetype-starter: ./
src/main/resources/META-INF/
src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/
src/main/resources/archetype-resources/src/main/resources/
src/main/resources...
Author: mrdon
Date: Mon Jul 17 15:30:04 2006
New Revision: 422901
URL: http://svn.apache.org/viewvc?rev=422901&view=rev
Log:
Bringing the Maven 2 archetype uptodate
WW-1359
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
- copied, changed from r422891, struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/xwork.xml
Removed:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/xwork.xml
Modified:
struts/maven/trunk/struts2-archetype-starter/README.txt
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java
Modified: struts/maven/trunk/struts2-archetype-starter/README.txt
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/README.txt?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/README.txt (original)
+++ struts/maven/trunk/struts2-archetype-starter/README.txt Mon Jul 17 15:30:04 2006
@@ -1,16 +1,16 @@
INFORMATION
===========
-- This is Struts2's maven archetype plugin.
+- This is Struts 2's maven archetype plugin.
- To be used to create a simple webapp template that one could alter to meet his/her needs.
- The created template contains
- sitemesh integeration
- - a simple Struts2 action
- - a simple Struts2 action level validation
- - a simple Struts2 action alias level validation
- - a simple Struts2 global conversion
- - a simple Struts2 action level conversion
- - a simple Struts2 global resource bundle
- - a simple Struts2 action level resource bundle
+ - 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
USAGE
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml Mon Jul 17 15:30:04 2006
@@ -11,7 +11,7 @@
<resource>src/main/resources/com/myComp/myApp/HelloWorldAction-validation.xml</resource>
<resource>src/main/resources/com/myComp/myApp/HelloWorldAction-helloWorld-validation.xml</resource>
<resource>src/main/resources/com/myComp/myApp/IndexAction-conversion.properties</resource>
- <resource>src/main/resources/xwork.xml</resource>
+ <resource>src/main/resources/struts.xml</resource>
<resource>src/main/resources/xwork-conversion.properties</resource>
<resource>src/main/resources/struts.properties</resource>
<resource>src/main/webapp/ftl/index.ftl</resource>
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java Mon Jul 17 15:30:04 2006
@@ -17,7 +17,7 @@
*/
package com.myComp.myApp;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
/**
*
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java Mon Jul 17 15:30:04 2006
@@ -17,7 +17,7 @@
*/
package com.myComp.myApp;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
import java.util.Date;
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.properties Mon Jul 17 15:30:04 2006
@@ -1,12 +1,12 @@
### START SNIPPET: complete_file
-### Struts Action 2.0 default properties
+### Struts 2.0 default properties
###(can be overridden by a struts.properties file in the root of the classpath)
###
-### Specifies the Configuration used to configure Struts Action 2.0
+### Specifies the Configuration used to configure Struts 2.0
### one could extend org.apache.struts2.config.Configuration
-### to build one's customize way of getting the configurations parameters into Struts Action 2.0
+### to build one's customize way of getting the configurations parameters into Struts 2.0
# struts.configuration=org.apache.struts2.config.DefaultConfiguration
### This can be used to set your default locale and encoding scheme
@@ -15,7 +15,7 @@
### if specified, the default object factory can be overridden here
### Note: short-hand notation is supported in some cases, such as "spring"
-### Alternatively, you can provide a com.opensymphony.xwork.ObjectFactory subclass name here
+### Alternatively, you can provide a com.opensymphony.xwork2.ObjectFactory subclass name here
struts.objectFactory = spring
### specifies the autoWiring logic when using the SpringObjectFactory.
@@ -30,8 +30,8 @@
### if specified, the default object type determiner can be overridden here
### Note: short-hand notation is supported in some cases, such as "tiger" or "notiger"
-### Alternatively, you can provide a com.opensymphony.xwork.util.ObjectTypeDeterminer implementation name here
-### Note: if you have the xwork-tiger.jar within your classpath, GenericsObjectTypeDeterminer is used by default
+### Alternatively, you can provide a com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
+### Note: if you have the xwork2-tiger.jar within your classpath, GenericsObjectTypeDeterminer is used by default
### To disable tiger support use the "notiger" property value here.
#struts.objectTypeDeterminer = tiger
#struts.objectTypeDeterminer = notiger
@@ -75,7 +75,7 @@
### to evaluate expressions for String attributes for tags
struts.tag.altSyntax=true
-### when set to true, Struts Action 2.0 will act much more friendly for developers. This
+### when set to true, Struts 2.0 will act much more friendly for developers. This
### includes:
### - struts.i18n.reload = true
### - struts.configuration.xml.reload = true
@@ -99,7 +99,7 @@
struts.ui.templateSuffix=ftl
### Configuration reloading
-### This will cause the configuration to reload xwork.xml when it is changed
+### This will cause the configuration to reload struts.xml when it is changed
struts.configuration.xml.reload=false
### Location of velocity.properties file. defaults to velocity.properties
Copied: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml (from r422891, struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/xwork.xml)
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml?p2=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml&p1=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/xwork.xml&r1=422891&r2=422901&rev=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/xwork.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml Mon Jul 17 15:30:04 2006
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xwork PUBLIC
- "-//OpenSymphony Group//XWork 1.1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd">
-<xwork>
+<struts>
<include file="struts-default.xml" />
<package name="myPackage" extends="struts-default">
<action name="index" class="com.myComp.myApp.IndexAction">
@@ -15,4 +15,4 @@
<result type="freemarker">/ftl/helloWorld.ftl</result>
</action>
</package>
-</xwork>
+</struts>
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml Mon Jul 17 15:30:04 2006
@@ -8,7 +8,7 @@
<create creator="new" javascript="validator">
<param name="class" value="org.apache.struts2.validators.DWRValidator"/>
</create>
- <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
+ <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
</allow>
<signatures>
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java Mon Jul 17 15:30:04 2006
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
*
Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java
URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java?rev=422901&r1=422900&r2=422901&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java (original)
+++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java Mon Jul 17 15:30:04 2006
@@ -19,7 +19,7 @@
import junit.framework.TestCase;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
*