struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1244929 - in /struts/struts2/trunk/archetypes: struts2-archetype-blank/ struts2-archetype-blank/src/main/resources/archetype-resources/ struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/ struts2-arch...
Date Thu, 16 Feb 2012 11:02:28 GMT
Author: jogep
Date: Thu Feb 16 11:02:27 2012
New Revision: 1244929

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

Modified:
    struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
    struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package_es.properties
    struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml
    struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/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=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml Thu Feb 16 11:02:27 2012
@@ -28,12 +28,43 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>**/pom.xml</include>
-                    <include>**/archetype.xml</include>
-                    <include>**/archetype-metadata.xml</include>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/archetype-resources/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.*</include>
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.0</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
Thu Feb 16 11:02:27 2012
@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>${project.version}</version>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
     <packaging>war</packaging>
-    <name>Struts 2 Blank Webapp</name>
+    <name>\${artifactId}</name>
 
     <properties>
         <struts2.version>${project.version}</struts2.version>
@@ -17,19 +17,19 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>2.5</version>
+            <version>3.0.5.RELEASE</version>
             <scope>test</scope>
         </dependency>
 

Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example/package_es.properties
Thu Feb 16 11:02:27 2012
@@ -1,5 +1,5 @@
-HelloWorld.message = ¡Struts está bien!...
+HelloWorld.message = \u00A1Struts est\u00E1 bien\!...
 requiredstring = ${getText(fieldName)} es requerido.
-password = Contraseña
+password = Contrase\u00F1a
 username = Nombre de Usuario
-Missing.message = Página bajo construcción, trate de nuevo en la proxima versión
+Missing.message = P\u00E1gina bajo construcci\u00F3n, trate de nuevo en la proxima versi\u00F3n.
\ No newline at end of file

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=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml Thu Feb 16 11:02:27
2012
@@ -27,12 +27,43 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>**/pom.xml</include>
-                    <include>**/archetype.xml</include>
-                    <include>**/archetype-metadata.xml</include>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/archetype-resources/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.*</include>
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.0</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
Thu Feb 16 11:02:27 2012
@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>${project.version}</version>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
     <packaging>war</packaging>
-    <name>Struts 2 Blank Convention Webapp</name>
+    <name>\${artifactId}</name>
 
     <properties>
         <struts2.version>${project.version}</struts2.version>
@@ -17,26 +17,26 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
           <groupId>org.apache.struts</groupId>
           <artifactId>struts2-config-browser-plugin</artifactId>
-          <version>${struts2.version}</version>
+          <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package_es.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package_es.properties?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package_es.properties
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/src/main/resources/package_es.properties
Thu Feb 16 11:02:27 2012
@@ -1,2 +1,2 @@
-hello.message = ¡Struts está bien!...
+hello.message = \u00A1Struts est\u00E1 bien\!...
 requiredstring = ${getText(fieldName)} es requerido.

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=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml Thu Feb 16 11:02:27
2012
@@ -27,11 +27,43 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>**/pom.xml</include>
-                    <include>**/archetype.xml</include>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/archetype-resources/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.*</include>
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.0</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml
Thu Feb 16 11:02:27 2012
@@ -2,11 +2,11 @@
 
 <project>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
-	<packaging>war</packaging>
-	<version>${project.version}</version>
-	<name>Struts 2 Database Portlet</name>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
+    <packaging>war</packaging>
+    <name>\${artifactId}</name>
 	<url>http://www.myComp.com</url>
 	<description>Struts 2 Database Portlet</description>
 
@@ -28,31 +28,31 @@
 		<dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
 		<dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 		
         <dependency>
           <groupId>org.apache.struts</groupId>
           <artifactId>struts2-config-browser-plugin</artifactId>
-          <version>${struts2.version}</version>
+          <version>\${struts2.version}</version>
         </dependency>
 
         <!-- Spring -->

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=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml Thu Feb 16 11:02:27 2012
@@ -27,11 +27,43 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>**/pom.xml</include>
-                    <include>**/archetype.xml</include>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/archetype-resources/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.*</include>
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.0</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
Thu Feb 16 11:02:27 2012
@@ -3,10 +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>${project.version}</version>
-   <name>Struts 2 Plugin</name>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
+    <packaging>jar</packaging>
+    <name>\${artifactId}</name>
 
     <dependencies>
 

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=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml Thu Feb 16 11:02:27
2012
@@ -27,11 +27,43 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>**/pom.xml</include>
-                    <include>**/archetype.xml</include>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/archetype-resources/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.*</include>
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.0</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
Thu Feb 16 11:02:27 2012
@@ -3,11 +3,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
     <packaging>war</packaging>
-    <name>My Portlet Application</name>
-    <version>${project.version}</version>
+    <name>\${artifactId}</name>
 
     <properties>
         <struts2.version>${project.version}</struts2.version>
@@ -19,19 +19,19 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>

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=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml Thu Feb 16 11:02:27
2012
@@ -29,11 +29,43 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>**/pom.xml</include>
-                    <include>**/archetype.xml</include>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/archetype-resources/src</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.*</include>
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>2.0</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.5</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>

Modified: struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml?rev=1244929&r1=1244928&r2=1244929&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
Thu Feb 16 11:02:27 2012
@@ -2,12 +2,11 @@
 
 <project>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
-	<packaging>war</packaging>
-	<version>${project.version}</version>
-	<name>Struts 2 Starter</name>
-	<url>http://www.myComp.com</url>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
+    <packaging>war</packaging>
+    <name>\${artifactId}</name>
 	<description>Struts 2 Starter</description>
 
     <properties>
@@ -27,25 +26,25 @@
 		<dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-config-browser-plugin</artifactId>
-            <version>${struts2.version}</version>
+            <version>\${struts2.version}</version>
         </dependency>
 
 		<!-- Servlet & Jsp -->



Mime
View raw message