Author: mcucchiara
Date: Wed Mar 27 17:32:06 2013
New Revision: 1461733
URL: http://svn.apache.org/r1461733
Log:
WW-4031 - Missing log4j.properties inside convention and blank app archetypes
(placed log4j file in the right dir)
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1461733&r1=1461732&r2=1461733&view=diff
==============================================================================
---
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/META-INF/maven/archetype-metadata.xml
Wed Mar 27 17:32:06 2013
@@ -18,11 +18,18 @@
<fileSet filtered="false" packaged="true">
<directory>src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*package*.properties</include>
</includes>
</fileSet>
-
- <fileSet filtered="false" packaged="true">
+
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>log4j.properties</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="true">
<directory>src/main/resources</directory>
<includes>
<include>**/*-validation.xml</include>
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1461733&r1=1461732&r2=1461733&view=diff
==============================================================================
---
struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/META-INF/maven/archetype-metadata.xml
Wed Mar 27 17:32:06 2013
@@ -19,7 +19,14 @@
<fileSet filtered="false" packaged="true">
<directory>src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*package*.properties</include>
+ </includes>
+ </fileSet>
+
+ <fileSet filtered="false" packaged="false">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>log4j.properties</include>
</includes>
</fileSet>
