From 97ae65c7a3701a541722f293bf54b3d2e3886c8b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 28 Jan 2013 20:17:03 +0000
Subject: [PATCH] WW-3974 solves problem with parsing properties

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1439606 13f79535-47bb-0310-9956-ffa450edef68
---
 archetypes/struts2-archetype-portlet/pom.xml       |  7 -------
 .../src/main/resources/archetype-resources/pom.xml | 14 +++++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 944b41d5d..596e33410 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -25,13 +25,6 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources/archetype-resources/src</directory>
                 <filtering>false</filtering>
                 <includes>
                     <include>**/*.*</include>
diff --git a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index fe6699595..da4ae4027 100644
--- a/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -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>
-    <version>\${version}</version>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
     <packaging>war</packaging>
-    <name>\${artifactId}</name>
+    <name>${artifactId}</name>
 
     <properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -25,13 +25,13 @@
         <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>
@@ -68,7 +68,7 @@
 						<artifactId>maven-war-plugin</artifactId>
 						<version>${plugin.war.version}</version>
 						<configuration>
-							<webXml>\${project.build.directory}/pluto-resources/web.xml</webXml>
+							<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
 						</configuration>
 					</plugin>
 					<!-- bind 'pluto2:assemble' goal to 'generate-resources' lifecycle -->