Author: wsmoak
Date: Sun Dec 24 09:31:36 2006
New Revision: 490051
URL: http://svn.apache.org/viewvc?view=rev&rev=490051
Log:
Put the Java sources back in the 'example' directory, since we will not be able
to filter the corresponding resources into a user-supplied package structure.
Update the archetype descriptor.
WW-1412
Added:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
- copied, changed from r490050,
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/ExampleSupport.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
- copied, changed from r490050,
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
- copied, changed from r490050,
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/Login.java
Removed:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/ExampleSupport.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/Login.java
Modified:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
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=490051&r1=490050&r2=490051
==============================================================================
---
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 09:31:36 2006
@@ -3,51 +3,21 @@
<archetype>
<id>struts2-archetype-starter</id>
<sources>
- <source>src/main/java/HelloWorldAction.java</source>
- <source>src/main/java/IndexAction.java</source>
- <source>src/main/java/DateConverter.java</source>
+ <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/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/com/myComp/myApp/IndexAction.properties</resource>
-
<resource>src/main/resources/com/myComp/myApp/package.properties</resource>
+ <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>src/main/resources/example.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/resources/applicationContext.xml</resource>
- <resource>src/main/webapp/ftl/index.ftl</resource>
- <resource>src/main/webapp/ftl/helloWorld.ftl</resource>
- <resource>src/main/webapp/WEB-INF/decorators/main.ftl</resource>
- <resource>src/main/webapp/WEB-INF/decorators.xml</resource>
- <resource>src/main/webapp/styles/main.css</resource>
- <resource>src/main/webapp/styles/forms.css</resource>
- <resource>src/main/webapp/styles/layout.css</resource>
- <resource>src/main/webapp/styles/layout-1col.css</resource>
- <resource>src/main/webapp/styles/layout-navleft-1col.css</resource>
- <resource>src/main/webapp/styles/layout-navleft-2col.css</resource>
- <resource>src/main/webapp/styles/layout-navtop-1col.css</resource>
- <resource>src/main/webapp/styles/layout-navtop-3col.css</resource>
- <resource>src/main/webapp/styles/layout-navtop-localleft.css</resource>
- <resource>src/main/webapp/styles/layout-navtop-subright.css</resource>
- <resource>src/main/webapp/styles/nav-horizontal.css</resource>
- <resource>src/main/webapp/styles/nav-vertical.css</resource>
- <resource>src/main/webapp/styles/tools.css</resource>
- <resource>src/main/webapp/styles/typo.css</resource>
- <resource>src/main/webapp/WEB-INF/dwr.xml</resource>
- <resource>src/main/webapp/WEB-INF/sitemesh.xml</resource>
- <resource>src/main/webapp/WEB-INF/sitemesh-decorator.tld</resource>
- <resource>src/main/webapp/WEB-INF/sitemesh-page.tld</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/index.jsp</resource>
</resources>
<testSources>
- <source>src/test/java/HelloWorldActionTest.java</source>
- <source>src/test/java/IndexActionTest.java</source>
+ <source>src/test/java/example/ConfigTest.java</source>
+ <source>src/test/java/example/HelloWorldTest.java</source>
+ <source>src/test/java/example/Login.java</source>
</testSources>
- <testResources>
- <resource>src/test/resources/test.properties</resource>
- </testResources>
</archetype>
Copied:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
(from r490050,
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/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?view=diff&rev=490051&p1=struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/ExampleSupport.java&r1=490050&p2=struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java&r2=490051
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/ExampleSupport.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/ExampleSupport.java
Sun Dec 24 09:31:36 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package ${package};
+package example;
import com.opensymphony.xwork2.ActionSupport;
Copied:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
(from r490050,
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/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?view=diff&rev=490051&p1=struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/HelloWorld.java&r1=490050&p2=struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java&r2=490051
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/HelloWorld.java
Sun Dec 24 09:31:36 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package ${package};
+package example;
/**
* <code>Set welcome message.</code>
Copied:
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
(from r490050,
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/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?view=diff&rev=490051&p1=struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/Login.java&r1=490050&p2=struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java&r2=490051
==============================================================================
---
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/Login.java
(original)
+++
struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/java/example/Login.java
Sun Dec 24 09:31:36 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package ${package};
+package example;
public class Login extends ExampleSupport {
