[weld-commits] Weld SVN: r5244 - in archetypes/trunk/jsf: servlet-minimal/src/main/resources/archetype-resources and 1 other directory.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-12-09 00:15:05 -0500 (Wed, 09 Dec 2009)
New Revision: 5244

Modified:
   archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml
   archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
Log:
escape non-evaluated expressions


Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml	2009-12-09 05:08:16 UTC (rev 5243)
+++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml	2009-12-09 05:15:05 UTC (rev 5244)
@@ -1,3 +1,5 @@
+#set( $expr_start = '${' )
+#set( $expr_end = '}' )
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
@@ -15,7 +17,7 @@
       -->
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file -->
-      <jboss.home>${env.JBOSS_HOME}</jboss.home>
+      <jboss.home>${expr_start}env.JBOSS_HOME${expr_end}</jboss.home>
       <jboss.domain>default</jboss.domain>
       <!-- The version of Weld extensions in use -->
       <weld.extensions.version>1.0.0-CR2</weld.extensions.version>
@@ -27,7 +29,7 @@
          <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-extensions-bom</artifactId>
-            <version>${weld.extensions.version}</version>
+            <version>${expr_start}weld.extensions.version}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
@@ -124,8 +126,8 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>jboss-maven-plugin</artifactId>
             <configuration>
-               <jbossHome>${jboss.home}</jbossHome>
-               <serverName>${jboss.domain}</serverName>
+               <jbossHome>${expr_start}jboss.home${expr_end}</jbossHome>
+               <serverName>${expr_start}jboss.domain${expr_end}</serverName>
             </configuration>
          </plugin>
       </plugins>

Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml	2009-12-09 05:08:16 UTC (rev 5243)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml	2009-12-09 05:15:05 UTC (rev 5244)
@@ -1,3 +1,5 @@
+#set( $expr_start = '${' )
+#set( $expr_end = '}' )
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
@@ -24,7 +26,7 @@
          <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-extensions-bom</artifactId>
-            <version>${weld.extensions.version}</version>
+            <version>${expr_start}weld.extensions.version${expr_end}</version>
             <type>pom</type>
             <scope>import</scope>
          </dependency>
@@ -145,9 +147,9 @@
                   </connector>
                </connectors>
                <!-- force friendly name instead of artifact name + version -->
-               <contextPath>${project.build.finalName}</contextPath>
+               <contextPath>${expr_start}project.build.finalName${expr_end}</contextPath>
                <!-- Where the BeanManager is constructed. This is where you'll declare datasources. -->
-               <jettyEnvXml>\${basedir}/src/test/resources/jetty-env.xml</jettyEnvXml>
+               <jettyEnvXml>${expr_start}basedir${expr_end}/src/test/resources/jetty-env.xml</jettyEnvXml>
                <!-- This parameter will auto-deploy modified classes. -->
                <!-- You can save changes in a file or class and refresh your browser to view the changes. -->
                <scanIntervalSeconds>3</scanIntervalSeconds>
@@ -160,7 +162,7 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>tomcat-maven-plugin</artifactId>
             <configuration>
-               <path>/${project.build.finalName}</path>
+               <path>/${expr_start}project.build.finalName${expr_end}</path>
                <!-- Embedded port -->
                <port>9090</port>
                <!--