struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1243174 - in /struts/struts2/trunk/archetypes: struts2-archetype-blank/ struts2-archetype-blank/src/main/resources/META-INF/ struts2-archetype-blank/src/main/resources/META-INF/maven/ struts2-archetype-convention/ struts2-archetype-convent...
Date Sat, 11 Feb 2012 22:33:37 GMT
Author: jogep
Date: Sat Feb 11 22:33:36 2012
New Revision: 1243174

URL: http://svn.apache.org/viewvc?rev=1243174&view=rev
Log:
WW-3738: Struts2 Maven Archetypes are broken

Added:
    struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
  (contents, props changed)
      - copied, changed from r1241553, struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
    struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
      - copied, changed from r1241553, struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
Removed:
    struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
    struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
    struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/META-INF/archetype.xml
    struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
    struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
    struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
Modified:
    struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml

Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml?rev=1243174&r1=1243173&r2=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml Sat Feb 11 22:33:36 2012
@@ -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>

Copied: struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
(from r1241553, struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml?p2=struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml&p1=struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml&r1=1241553&r2=1243174&rev=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/archetype.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
Sat Feb 11 22:33:36 2012
@@ -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>
 
 <!--  

Propchange: struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml?rev=1243174&r1=1243173&r2=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml Sat Feb 11 22:33:36
2012
@@ -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>

Copied: struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
(from r1241553, struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml?p2=struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml&p1=struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml&r1=1241553&r2=1243174&rev=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/archetype.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype.xml
Sat Feb 11 22:33:36 2012
@@ -1,4 +1,7 @@
-<?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-convention</id>
 </archetype>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml?rev=1243174&r1=1243173&r2=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml Sat Feb 11 22:33:36
2012
@@ -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>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml?rev=1243174&r1=1243173&r2=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml Sat Feb 11 22:33:36 2012
@@ -28,6 +28,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/pom.xml</include>
+                    <include>**/archetype.xml</include>
                 </includes>
             </resource>
         </resources>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml?rev=1243174&r1=1243173&r2=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml Sat Feb 11 22:33:36
2012
@@ -28,6 +28,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/pom.xml</include>
+                    <include>**/archetype.xml</include>
                 </includes>
             </resource>
         </resources>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml?rev=1243174&r1=1243173&r2=1243174&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml Sat Feb 11 22:33:36
2012
@@ -30,6 +30,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>**/pom.xml</include>
+                    <include>**/archetype.xml</include>
                 </includes>
             </resource>
         </resources>



Mime
View raw message