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/archetyp
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 @@
src/main/resources
true
-**/pom.xml
-**/archetype.xml
-**/archetype-metadata.xml
+**/*.*
+
+
+
+
src/main/resources/archetype-resources/src
+false
+
+**/*.*
+
+
+
+org.apache.maven.archetype
+archetype-packaging
+2.0
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+2.5
+
+\
+UTF-8
+
+
+
+maven-archetype-plugin
+2.0
+
+
+
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 @@
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";>
4.0.0
-${groupId}
-${artifactId}
-${project.version}
+\${groupId}
+\${artifactId}
+\${version}
war
-Struts 2 Blank Webapp
+\${artifactId}
${project.version}
@@ -17,19 +17,19 @@
org.apache.struts
struts2-core
-${struts2.version}
+\${struts2.version}
org.apache.struts
struts2-config-browser-plugin
-${struts2.version}
+\${struts2.version}
org.apache.struts
struts2-junit-plugin
-${struts2.version}
+\${struts2.version}
test
@@ -56,7 +56,7 @@
org.springframework
spring-core
-2.5
+3.0.5.RELEASE
test
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/tru
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Any23 (Incubating) (https://cwiki.apache.org/confluence/display/ANY23) Pages - Building Apache Any23 Website HOW_TO created by lewismc (08:16 AM) https://cwiki.apache.org/confluence/display/ANY23/Building+Apache+Any23+Website+HOW_TO Index edited by lewismc (08:08 AM) https://cwiki.apache.org/confluence/display/ANY23/Index Apache Avro (https://cwiki.apache.org/confluence/display/AVRO) Pages - Powered By Avro edited by lewismc (02:54 PM) https://cwiki.apache.org/confluence/display/AVRO/Powered+By+Avro Apache Bean Validation (https://cwiki.apache.org/confluence/display/BeanValidation) Pages - Post-graduation checklist edited by mbenson (10:50 PM) https://cwiki.apache.org/confluence/display/BeanValidation/Post-graduation+checklist Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Crypto (Digital Signatures) edited by mazzag (02:16 PM) https://cwiki.apache.org/confluence/display/CAMEL/Crypto+%28Digital+Signatures%29 Camel 2.10.0 Release edited by davsclaus (12:20 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.10.0+Release CXFRS edited by webmas...@fernandoribeiro.eti.br (11:43 AM) https://cwiki.apache.org/confluence/display/CAMEL/CXFRS MongoDB edited by raulvk (10:17 AM) https://cwiki.apache.org/confluence/display/CAMEL/MongoDB Apache Deft (https://cwiki.apache.org/confluence/display/DEFT) Pages - Architecture edited by slemesle (05:45 PM) https://cwiki.apache.org/confluence/display/DEFT/Architecture Apache MyFaces Extensions CDI (https://cwiki.apache.org/confluence/display/EXTCDI) Pages - CODI Versions edited by gpetracek (05:44 PM) https://cwiki.apache.org/confluence/display/EXTCDI/CODI+Versions Apache Flex (https://cwiki.apache.org/confluence/display/FLEX) Pages - User Groups edited by keith_sutton (09:58 PM) https://cwiki.apache.org/confluence/display/FLEX/User+Groups Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30) Pages - timereport - Web Application Security Sample edited by chirun...@gmail.com (03:12 AM) https://cwiki.apache.org/confluence/display/GMOxDOC30/timereport+-+Web+Application+Security+Sample Apache Gora (https://cwiki.apache.org/confluence/display/GORA) Pages - Building Apache Gora Website HOW_TO edited by lewismc (06:34 PM) https://cwiki.apache.org/confluence/display/GORA/Building+Apache+Gora+Website+HOW_TO Index edited by lewismc (08:05 AM) https://cwiki.apache.org/confluence/display/GORA/Index Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - LanguageManual Types created by cwsteinbach (02:16 PM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types LanguageManual edited by cwsteinbach (02:15 PM) https://cwiki.apache.org/confluence/display/Hive/LanguageManual Apache MyFaces (https://cwiki.apache.org/confluence/display/MYFACES) Pages - April 2012 edited by gpetracek (06:00 PM) https://cwiki.apache.org/confluence/display/MYFACES/April+2012 OODT (https://cwiki.apache.org/confluence/display/OODT) Pages - OODT Filemgr User Guide edited by good...@oodt.apache.org (05:56 PM) https://cwiki.apache.org/confluence/display/OODT/OODT+Filemgr+User+Guide Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - AOO 3.4 Release Notes edited by jsc (01:53 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4+Release+Notes OpenJPA (https://cwiki.apache.org/confluence/display/openjpa) Pages - Apache Nexus Release Process (1.2.x-2.1.x) edited by allee8...@gmail.com (11:17 AM) https://cwiki.apache.org/confluence/display/openjpa/Apache+Nexus+Release+Process+%281.2.x-2.1.x%29 Apache Openmeetings (https://cwiki.apache.org/confluence/display/OPENMEETINGS) Pages
