From 29c2eb778b728a2b23dc8dc1cdfc16f6b36c41b9 Mon Sep 17 00:00:00 2001
From: Johannes Geppert <jogep@apache.org>
Date: Sat, 11 Feb 2012 22:33:36 +0000
Subject: [PATCH] WW-3738: Struts2 Maven Archetypes are broken

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1243174 13f79535-47bb-0310-9956-ffa450edef68
---
 archetypes/struts2-archetype-blank/pom.xml    |  3 ++
 .../META-INF/{ => maven}/archetype.xml        |  7 ++-
 .../struts2-archetype-convention/pom.xml      |  3 ++
 .../src/main/resources/META-INF/archetype.xml |  4 --
 .../resources/META-INF/maven/archetype.xml    |  7 +++
 .../struts2-archetype-dbportlet/pom.xml       |  2 +
 .../src/main/resources/META-INF/archetype.xml | 21 ---------
 archetypes/struts2-archetype-plugin/pom.xml   |  1 +
 .../src/main/resources/META-INF/archetype.xml | 15 ------
 archetypes/struts2-archetype-portlet/pom.xml  |  1 +
 .../src/main/resources/META-INF/archetype.xml | 20 --------
 archetypes/struts2-archetype-starter/pom.xml  |  1 +
 .../src/main/resources/META-INF/archetype.xml | 47 -------------------
 13 files changed, 23 insertions(+), 109 deletions(-)
 rename archetypes/struts2-archetype-blank/src/main/resources/META-INF/{ => maven}/archetype.xml (81%)
 delete mode 100644 archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
 create mode 100644 archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
 delete mode 100644 archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
 delete mode 100644 archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
 delete mode 100644 archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
 delete mode 100644 archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml

diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index df9f7f7c2..abcb8b398 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -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>
diff --git a/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml b/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
similarity index 81%
rename from archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
rename to archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
index a21f57aab..2fd544f5c 100644
--- a/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
+++ b/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
@@ -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>
 
 <!--  
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index b327a6a1e..4cab76890 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -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>
diff --git a/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml b/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index c1f7aa979..000000000
--- a/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype>
-  <id>struts2-archetype-convention</id>
-</archetype>
diff --git a/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml b/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 000000000..ea5e04216
--- /dev/null
+++ b/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
@@ -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>
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index d237c897a..b14588fe7 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -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>
diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml b/archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index a19db5e0a..000000000
--- a/archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -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>
-
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index df4cd4e6e..c462f25a1 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -28,6 +28,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/pom.xml</include>
+                    <include>**/archetype.xml</include>
                 </includes>
             </resource>
         </resources>
diff --git a/archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml b/archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 2f1f594e9..000000000
--- a/archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -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>
-
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index d2cb6d679..ed99aad05 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -28,6 +28,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/pom.xml</include>
+                    <include>**/archetype.xml</include>
                 </includes>
             </resource>
         </resources>
diff --git a/archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml b/archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 74997108b..000000000
--- a/archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -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>
-
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 72eed968f..a2d6e20a5 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -30,6 +30,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/pom.xml</include>
+                    <include>**/archetype.xml</include>
                 </includes>
             </resource>
         </resources>
diff --git a/archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml b/archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 7669fef53..000000000
--- a/archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -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>
-