Author: mcucchiara
Date: Wed Mar 27 16:25:56 2013
New Revision: 1461694
URL: http://svn.apache.org/r1461694
Log:
WW-4030 - Blank, Convention and Starter archetype contains a wrong path
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml
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=1461694&r1=1461693&r2=1461694&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
Wed Mar 27 16:25:56 2013
@@ -74,7 +74,7 @@
<systemProperties>
<systemProperty>
<name>log4j.configuration</name>
-
<value>file:${basedir}/src/main/resources/log4j.properties</value>
+
<value>file:\${basedir}/src/main/resources/log4j.properties</value>
</systemProperty>
<systemProperty>
<name>slf4j</name>
@@ -82,10 +82,10 @@
</systemProperty>
</systemProperties>
<scanIntervalSeconds>10</scanIntervalSeconds>
-
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
<contextPath>/struts2-blank</contextPath>
-
<descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+
<descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
</webAppConfig>
</configuration>
<dependencies>
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=1461694&r1=1461693&r2=1461694&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
Wed Mar 27 16:25:56 2013
@@ -88,7 +88,7 @@
<systemProperties>
<systemProperty>
<name>log4j.configuration</name>
-
<value>file:${basedir}/src/main/resources/log4j.properties</value>
+
<value>file:\${basedir}/src/main/resources/log4j.properties</value>
</systemProperty>
<systemProperty>
<name>slf4j</name>
@@ -96,10 +96,10 @@
</systemProperty>
</systemProperties>
<scanIntervalSeconds>10</scanIntervalSeconds>
-
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
<contextPath>/struts2-showcase</contextPath>
-
<descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+
<descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
</webAppConfig>
</configuration>
<dependencies>
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=1461694&r1=1461693&r2=1461694&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
Wed Mar 27 16:25:56 2013
@@ -97,7 +97,7 @@
<systemProperties>
<systemProperty>
<name>log4j.configuration</name>
-
<value>file:${basedir}/src/main/resources/log4j.properties</value>
+
<value>file:\${basedir}/src/main/resources/log4j.properties</value>
</systemProperty>
<systemProperty>
<name>slf4j</name>
@@ -105,10 +105,10 @@
</systemProperty>
</systemProperties>
<scanIntervalSeconds>10</scanIntervalSeconds>
-
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+
<webAppSourceDirectory>\${basedir}/src/main/webapp/</webAppSourceDirectory>
<webAppConfig>
<contextPath>/struts2-showcase</contextPath>
-
<descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+
<descriptor>\${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
</webAppConfig>
</configuration>
<dependencies>
