Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3738: Struts2 Maven Archetypes are broken

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1243174 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Johannes Geppert
2012-02-11 22:33:36 +00:00
parent eafd29bea7
commit 29c2eb778b
13 changed files with 23 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archetypes/struts2-archetype-blank/pom.xml
+3
View File
@@ -9,6 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-blank</artifactId>
<version>2.3.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank</name>
<scm>
@@ -28,6 +29,8 @@
<filtering>true</filtering>
<includes>
<include>**/pom.xml</include>
<include>**/archetype.xml</include>
<include>**/archetype-metadata.xml</include>
</includes>
</resource>
</resources>
archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml → archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
+5 -2
View File
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<archetype
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd"
>
<id>struts2-archetype-blank</id>
<!--
archetypes/struts2-archetype-convention/pom.xml
+3
View File
@@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-convention</artifactId>
<version>2.3.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Blank Convention</name>
<scm>
@@ -27,6 +28,8 @@
<filtering>true</filtering>
<includes>
<include>**/pom.xml</include>
<include>**/archetype.xml</include>
<include>**/archetype-metadata.xml</include>
</includes>
</resource>
</resources>
archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<id>struts2-archetype-convention</id>
</archetype>
archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
+7
View File
@@ -0,0 +1,7 @@
<archetype
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd"
>
<id>struts2-archetype-convention</id>
</archetype>
archetypes/struts2-archetype-dbportlet/pom.xml
+2
View File
@@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
<version>2.3.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Struts 2 Archetypes - Database Portlet</name>
<scm>
@@ -27,6 +28,7 @@
<filtering>true</filtering>
<includes>
<include>**/pom.xml</include>
<include>**/archetype.xml</include>
</includes>
</resource>
</resources>
archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<id>struts2-archetype-dbblank</id>
<sources>
<source>src/main/java/view/IndexAction.java</source>
<source>src/main/java/edit/IndexAction.java</source>
</sources>
<resources>
<resource>src/main/resources/struts.xml</resource>
<resource>src/main/webapp/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/webapp/WEB-INF/portlet.xml</resource>
<resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>
<resource>src/main/webapp/WEB-INF/view/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/help/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/edit/index-input.jsp</resource>
<resource>src/main/webapp/WEB-INF/edit/index-success.jsp</resource>
</resources>
</archetype>
archetypes/struts2-archetype-plugin/pom.xml
+1
View File
@@ -28,6 +28,7 @@
<filtering>true</filtering>
<includes>
<include>**/pom.xml</include>
<include>**/archetype.xml</include>
</includes>
</resource>
</resources>
archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<id>struts2-archetype-plugin</id>
<sources>
<source>src/main/java/MyResult.java</source>
</sources>
<resources>
<resource>src/main/resources/struts-plugin.xml</resource>
<resource>LICENSE.txt</resource>
<resource>NOTICE.txt</resource>
<resource>README.txt</resource>
</resources>
</archetype>
archetypes/struts2-archetype-portlet/pom.xml
+1
View File
@@ -28,6 +28,7 @@
<filtering>true</filtering>
<includes>
<include>**/pom.xml</include>
<include>**/archetype.xml</include>
</includes>
</resource>
</resources>
archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
-20
View File
@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archetype>
<id>struts2-archetype-portlet</id>
<sources>
<source>src/main/java/HelloAction.java</source>
<source>src/main/java/UpdateNameAction.java</source>
</sources>
<testSources>
<source>src/test/java/JettyPlutoLauncher.java</source>
</testSources>
<resources>
<resource>src/main/resources/struts.xml</resource>
<resource>src/main/webapp/WEB-INF/jsp/view/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/jsp/edit/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/webapp/WEB-INF/portlet.xml</resource>
</resources>
</archetype>
archetypes/struts2-archetype-starter/pom.xml
+1
View File
@@ -30,6 +30,7 @@
<filtering>true</filtering>
<includes>
<include>**/pom.xml</include>
<include>**/archetype.xml</include>
</includes>
</resource>
</resources>
archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
-47
View File
@@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
</sources>
<resources>
<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/resources/log4j.properties</resource>
<resource>src/main/webapp/jsp/index.jsp</resource>
<resource>src/main/webapp/jsp/helloWorld.jsp</resource>
<resource>src/main/webapp/WEB-INF/decorators/main.jsp</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/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>
</testSources>
<testResources>
<resource>src/test/resources/test.properties</resource>
</testResources>
</archetype>