Return-Path: 
 <scm-return-18700-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 362 invoked from network); 19 Mar 2007 22:36:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Mar 2007 22:36:11 -0000
Received: (qmail 34911 invoked by uid 500); 19 Mar 2007 22:36:19 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 34877 invoked by uid 500); 19 Mar 2007 22:36:18 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 34866 invoked by uid 99); 19 Mar 2007 22:36:18 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2007 15:36:18 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2007 15:36:09 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B772A1A983A; Mon, 19 Mar 2007 15:35:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r520135 - in /geronimo/server/trunk: ./
 applications/geronimo-dojo/ modules/geronimo-client-builder/
 modules/geronimo-connector-builder/ modules/geronimo-corba-builder/
 modules/geronimo-directory/ modules/geronimo-j2ee-builder/ modules/gero...
Date: Mon, 19 Mar 2007 22:35:48 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070319223549.B772A1A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Mon Mar 19 15:35:47 2007
New Revision: 520135

URL: http://svn.apache.org/viewvc?view=rev&rev=520135
Log:
 r6693@Bliss:  jason | 2007-03-19 15:28:23 -0700
 Use ${project.build.directory} and ${project.build.outputDirectory} to root to target/ and target/classes

Modified:
    geronimo/server/trunk/   (props changed)
    geronimo/server/trunk/applications/geronimo-dojo/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-directory/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
    geronimo/server/trunk/pom.xml

Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Mar 19 15:35:47 2007
@@ -1,3 +1,3 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882
-bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:6692
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:6693

Modified: geronimo/server/trunk/applications/geronimo-dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-dojo/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/applications/geronimo-dojo/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-dojo/pom.xml Mon Mar 19 15:35:47 2007
@@ -48,8 +48,7 @@
         </dependency>
     </dependencies>
 
-    <!-- this build process extracts certain files from dojo.zip
-         into a webapp. -->
+    <!-- this build process extracts certain files from dojo.zip into a webapp. -->
     <build>
         <plugins>
             <plugin>
@@ -67,7 +66,7 @@
                                     <groupId>org.dojotoolkit</groupId>
                                     <artifactId>dojo</artifactId>
                                     <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/</outputDirectory>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}</outputDirectory>
@@ -75,6 +74,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -98,7 +98,7 @@
                         NOTE: targetPath is broken for webResources (as documented)
                         -->
                         <resource>
-                            <directory>${pom.basedir}/target/classes</directory>
+                            <directory>${project.build.outputDirectory}</directory>
                             <includes>
                                 <include>META-INF/LICENSE*</include>
                                 <include>META-INF/NOTICE*</include>

Modified: geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -80,7 +80,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -110,7 +110,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -68,7 +68,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-directory/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-directory/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Mon Mar 19 15:35:47 2007
@@ -159,7 +159,7 @@
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
                     <sourceSchemas>directory.xsd</sourceSchemas>
-                    <outputDirectory>${pom.basedir}/target/classes/schemaorg_apache_xmlbeans</outputDirectory>
+                    <outputDirectory>${project.build.outputDirectory}/schemaorg_apache_xmlbeans</outputDirectory>
                     <defaultXmlConfigDir>${pom.basedir}/src/main/schema/xmlconfig.xml</defaultXmlConfigDir>
                 </configuration>
             </plugin>
@@ -181,7 +181,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>
@@ -198,9 +198,9 @@
                         <configuration>
                             <tasks>
                                 <tstamp/>
-                                <mkdir dir="${pom.basedir}/target/var"/>
+                                <mkdir dir="${project.build.directory}/var"/>
                                 <copy file="${pom.basedir}/src/test/resources/directory.xml"
-                                    todir="${pom.basedir}/target/var"/>
+                                    todir="${project.build.directory}/var"/>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -200,7 +200,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -79,7 +79,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml Mon Mar 19 15:35:47 2007
@@ -75,7 +75,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -77,7 +77,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -100,7 +100,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -75,7 +75,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-service-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -75,7 +75,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -163,7 +163,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -87,7 +87,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -105,7 +105,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Mon Mar 19 15:35:47 2007
@@ -95,7 +95,7 @@
                             <tasks>
                                 <mkdir dir="${pom.basedir}/target/clover/classes"/>
                                 <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
+                                    <fileset dir="${project.build.outputDirectory}">
                                         <include name="schemaorg_apache_xmlbeans/**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=520135&r1=520134&r2=520135
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Mar 19 15:35:47 2007
@@ -1509,7 +1509,7 @@
                     <version>2.0.2</version>
                     <configuration>
                         <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                        <webXml>${pom.basedir}/target/jspweb.xml</webXml>
+                        <webXml>${project.build.directory}/jspweb.xml</webXml>
                         <archiveClasses>true</archiveClasses>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems on windows -->
@@ -1524,7 +1524,7 @@
                         -->
                         <webResources>
                             <resource>
-                                <directory>${pom.basedir}/target/classes</directory>
+                                <directory>${project.build.outputDirectory}</directory>
                                 <includes>
                                     <include>META-INF/LICENSE*</include>
                                     <include>META-INF/NOTICE*</include>