Author: davenewton
Date: Sun Feb 1 00:06:00 2009
New Revision: 739661
URL: http://svn.apache.org/viewvc?rev=739661&view=rev
Log:
Updated struts2 blank archetype; work in progress, but functional.
Added:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/maven/
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
Modified:
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/java/example/ExampleSupport.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package.properties
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
Modified: struts/maven/trunk/struts2-archetype-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/pom.xml?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-blank/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-blank/pom.xml Sun Feb 1 00:06:00 2009
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<project>
<parent>
<groupId>org.apache.struts</groupId>
@@ -9,13 +8,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.1.6</version>
<name>Struts 2 Archetypes - Blank</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/</developerConnection>
-
<url>http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/</url>
- </scm>
-
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/</connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/struts/maven/trunk/struts2-archetype-blank/
+ </developerConnection>
+
<url>http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/</url>
+ </scm>
</project>
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?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
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 Feb 1 00:06:00 2009
@@ -1,31 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<archetype>
<id>struts2-archetype-blank</id>
+
+<!--
<sources>
<source>src/main/java/example/ExampleSupport.java</source>
<source>src/main/java/example/HelloWorld.java</source>
<source>src/main/java/example/Login.java</source>
</sources>
+
<resources>
<resource>src/main/resources/example/Login-validation.xml</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>
+
+ <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/LoginTest.java</source>
</testSources>
+-->
</archetype>
-
Added:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=739661&view=auto
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
(added)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
Sun Feb 1 00:06:00 2009
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor name="struts2-archetype-blank">
+ <fileSets>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="true" packaged="true">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="true">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*package*.properties</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="true">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*-validation.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="true" packaged="false">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/struts.xml</include>
+ <include>**/example.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/webapp/example</directory>
+ <includes>
+ <include>**/*.jsp</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/index.html</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/webapp/WEB-INF</directory>
+ <includes>
+ <include>**/web.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
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?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
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 Feb 1 00:06:00 2009
@@ -1,78 +1,77 @@
<?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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <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>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- <version>2.0.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0.5</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.1.2</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.11</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <packaging>war</packaging>
+ <name>Struts 2 Blank Webapp</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-junit-plugin</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>2.0.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.12</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
Sun Feb 1 00:06:00 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package example;
+package ${package}.example;
import com.opensymphony.xwork2.ActionSupport;
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
Sun Feb 1 00:06:00 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package example;
+package ${package}.example;
/**
* <code>Set welcome message.</code>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
Sun Feb 1 00:06:00 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package example;
+package ${package}.example;
public class Login extends ExampleSupport {
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
Sun Feb 1 00:06:00 2009
@@ -1,25 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd";>
-
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
+<!--
+ - This file is included by the struts.xml file as an example
+ - of how to break up the configuration file into multiple files.
+-->
<struts>
-
- <package name="example" namespace="/example" extends="struts-default">
-
- <action name="HelloWorld" class="example.HelloWorld">
- <result>/example/HelloWorld.jsp</result>
- </action>
-
- <action name="Login_*" method="{1}" class="example.Login">
- <result name="input">/example/Login.jsp</result>
- <result type="redirect-action">Menu</result>
- </action>
-
- <action name="*" class="example.ExampleSupport">
- <result>/example/{1}.jsp</result>
- </action>
-
- <!-- Add actions here -->
- </package>
+ <package name="example" namespace="/example" extends="struts-default">
+ <action name="HelloWorld" class="${package}.example.HelloWorld">
+ <result>/example/HelloWorld.jsp</result>
+ </action>
+
+ <action name="Login_*" method="{1}" class="${package}.example.Login">
+ <result name="input">/example/Login.jsp</result>
+ <result type="redirectAction">Menu</result>
+ </action>
+
+ <action name="*" class="${package}.example.ExampleSupport">
+ <result>/example/{1}.jsp</result>
+ </action>
+
+ <!-- Add additional "example" package actions here. -->
+
+ </package>
</struts>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/Login-validation.xml
Sun Feb 1 00:06:00 2009
@@ -1,16 +1,17 @@
+<?xml version="1.0"?>
<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
-
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
<validators>
- <field name="username">
- <field-validator type="requiredstring">
- <message key="requiredstring"/>
- </field-validator>
- </field>
- <field name="password">
- <field-validator type="requiredstring">
- <message key="requiredstring"/>
- </field-validator>
- </field>
+ <field name="username">
+ <field-validator type="requiredstring">
+ <message key="requiredstring"/>
+ </field-validator>
+ </field>
+
+ <field name="password">
+ <field-validator type="requiredstring">
+ <message key="requiredstring"/>
+ </field-validator>
+ </field>
</validators>
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?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
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 Feb 1 00:06:00 2009
@@ -1,5 +1,5 @@
-HelloWorld.message= Struts is up and running ...
-requiredstring = ${getText(fieldName)} is required.
+HelloWorld.message = Struts is up and running...
+requiredstring= ${getText(fieldName)} is required.
password = Password
username = User Name
Missing.message = This feature is under construction. Please try again in the
next iteration.
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
Sun Feb 1 00:06:00 2009
@@ -1,4 +1,4 @@
-HelloWorld.message= ¡Struts está bien! ...
+HelloWorld.message = ¡Struts está bien!...
requiredstring = ${getText(fieldName)} se requiere.
password = Contraseña
username = Nombre de Usuario
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
Sun Feb 1 00:06:00 2009
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd";>
-
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
-
- <constant name="struts.enable.DynamicMethodInvocation" value="false" />
- <constant name="struts.devMode" value="true" />
-
- <include file="example.xml"/>
-
- <!-- Add packages here -->
-
+ <constant name="struts.enable.DynamicMethodInvocation" value="false"/>
+ <constant name="struts.devMode" value="true"/>
+
+ <include file="example.xml"/>
+
+ <!-- Add addition packages and configuration here. -->
</struts>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Sun Feb 1 00:06:00 2009
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+<web-app id="struts_blank" version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ <display-name>Struts Blank</display-name>
- <display-name>Struts Blank</display-name>
+ <filter>
+ <filter-name>struts2</filter-name>
+ <filter-class>
+ org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
+ </filter-class>
+ </filter>
- <filter>
- <filter-name>struts2</filter-name>
-
<filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>struts2</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
+ <filter-mapping>
+ <filter-name>struts2</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
</web-app>
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
Sun Feb 1 00:06:00 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package example;
+package ${package}.example;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.config.RuntimeConfiguration;
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
Sun Feb 1 00:06:00 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-package example;
+package ${package}.example;
import com.opensymphony.xwork2.ActionSupport;
-import junit.framework.TestCase;
+import org.apache.struts2.StrutsTestCase;
-public class HelloWorldTest extends TestCase {
+public class HelloWorldTest extends StrutsTestCase {
public void testHelloWorld() throws Exception {
HelloWorld hello_world = new HelloWorld();
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java?rev=739661&r1=739660&r2=739661&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
Sun Feb 1 00:06:00 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package example;
+package ${package}.example;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.config.entities.ActionConfig;
