- Updated to use Struts 2.0.14 GA
- Added German resource bundle
- minor enhancements and cleanups
git-svn-id: https://svn.apache.org/repos/asf/struts/maven/branches/ARCHETYPES_2_0_X@720341 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/struts2-archetype-blank/README.txt b/struts2-archetype-blank/README.txt
index 5eb3e1c..183f8a2 100644
--- a/struts2-archetype-blank/README.txt
+++ b/struts2-archetype-blank/README.txt
@@ -20,7 +20,7 @@
-DartifactId=myWebApp \
-DarchetypeGroupId=org.apache.struts \
-DarchetypeArtifactId=struts2-archetype-blank \
- -DarchetypeVersion=2.0.9-SNAPSHOT \
+ -DarchetypeVersion=2.0.14-SNAPSHOT \
-DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository
IMPORTANT:
diff --git a/struts2-archetype-blank/pom.xml b/struts2-archetype-blank/pom.xml
index 3a3ae2a..e1fd087 100644
--- a/struts2-archetype-blank/pom.xml
+++ b/struts2-archetype-blank/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
- <version>2.0.11.2-SNAPSHOT</version>
+ <version>2.0.14-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Struts 2 Archetypes - Blank</name>
diff --git a/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml b/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
index 7051d7a..3c30e4b 100644
--- a/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
+++ b/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
@@ -1,31 +1,32 @@
<?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>
- </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>
+ <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 filtered="false">src/main/resources/example/package_de.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/LoginTest.java</source>
+ </testSources>
</archetype>
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
index 732a46c..238184b 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -3,11 +3,11 @@
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>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+ <packaging>war</packaging>
+ <name>Struts 2 Blank Webapp</name>
<dependencies>
@@ -44,11 +44,11 @@
<version>2.0</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>2.0.11.2</version>
+ <version>2.0.14</version>
</dependency>
</dependencies>
@@ -58,7 +58,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.11</version>
+ <version>6.1.14</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
index 554509a..efde209 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
index d5268ca..4562dfd 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
index d425488..bdeb8d7 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_de.properties b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_de.properties
new file mode 100644
index 0000000..d1feabe
--- /dev/null
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_de.properties
@@ -0,0 +1,5 @@
+HelloWorld.message= Struts ist gestartet und verfügbar ...
+requiredstring = ${getText(fieldName)} ist ein Pflichtfeld.
+password = Passwort
+username = Benutzername
+Missing.message = Diese Funktion ist noch nicht implementiert. Bitte versuchen Sie es in der nächsten Version nocheinmal.
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 9dd7192..0f060de 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,5 +1,7 @@
<?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="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">
<display-name>Struts Blank</display-name>
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp
index 938c761..f936436 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/example/HelloWorld.jsp
@@ -22,7 +22,19 @@
</s:url>
<s:a href="%{url}">Espanol</s:a>
</li>
+ <li>
+ <s:url id="url" action="HelloWorld">
+ <s:param name="request_locale">de</s:param>
+ </s:url>
+ <s:a href="%{url}">Deutsch</s:a>
+ </li>
</ul>
+<p>
+<s:url id="url" action="Welcome"/>
+<s:a href="%{url}">Welcome !</s:a>
+</p>
+
+
</body>
</html>
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
index d70aa4e..5de7bd3 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/ConfigTest.java
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
index 9239a70..bbcc610 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/HelloWorldTest.java
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
diff --git a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
index 72b761d..5c372d3 100644
--- a/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
+++ b/struts2-archetype-blank/src/main/resources/archetype-resources/src/test/java/example/LoginTest.java
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
