You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/10 09:00:20 UTC

svn commit: r420446 - /geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml

Author: jdillon
Date: Mon Jul 10 00:00:20 2006
New Revision: 420446

URL: http://svn.apache.org/viewvc?rev=420446&view=rev
Log:
Drop properties; just adds complexity and management overhead

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml?rev=420446&r1=420445&r2=420446&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml Mon Jul 10 00:00:20 2006
@@ -31,12 +31,6 @@
     <artifactId>geronimo-tomcat-builder</artifactId>
     <name>Geronimo :: Tomcat :: Builder</name>
     
-    <properties>
-        <buildDir>${project.build.directory}</buildDir>
-        <endorsedDir>${buildDir}/endorsed</endorsedDir>
-        <localRepoDir>${settings.localRepository}</localRepoDir>
-    </properties>
-    
     <dependencies>
         
         <!-- Module Dependencies -->
@@ -150,7 +144,7 @@
                     <systemProperties>
                         <property>
                             <name>java.endorsed.dirs</name>
-                            <value>${endorsedDir}</value>
+                            <value>${project.build.directory}/endorsed</value>
                         </property>
                         <property>
                             <name>java.security.auth.login.config</name>
@@ -179,16 +173,16 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${buildDir}/var/catalina/conf" file="src/var/web.xml"/>
-                                <copy todir="${buildDir}/var/catalina/webapps">
+                                <copy todir="${project.build.directory}/var/catalina/conf" file="src/var/web.xml"/>
+                                <copy todir="${project.build.directory}/var/catalina/webapps">
                                     <fileset dir="src/test-resources/deployables">
                                         <include name="war1/**"/>
                                         <include name="war3/**"/>
                                         <include name="war4/**"/>
                                     </fileset>
                                 </copy>
-                                <copy todir="${endorsedDir}" flatten="true">
-                                    <fileset dir="${localRepoDir}">
+                                <copy todir="${project.build.directory}/endorsed" flatten="true">
+                                    <fileset dir="${settings.localRepository}">
                                         <include name="xerces/xercesImpl/${xercesVersion}/*.jar"/>
                                         <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"/>
                                     </fileset>