db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r234356 - in /db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk: ./ maven.xml project.properties project.xml src/conf/build-src.properties
Date Sun, 21 Aug 2005 21:37:30 GMT
Author: henning
Date: Sun Aug 21 14:37:24 2005
New Revision: 234356

URL: http://svn.apache.org/viewcvs?rev=234356&view=rev
Log:
- add common external reference
- remove Thomas' build-src.properties hack
- extend common/project.xml
- add multiproject type


Removed:
    db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/src/conf/build-src.properties
Modified:
    db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/   (props changed)
    db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/maven.xml
    db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.properties
    db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.xml

Propchange: db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Sun Aug 21 14:37:24 2005
@@ -0,0 +1 @@
+common https://svn.apache.org/repos/asf/db/torque/branches/svn-reorganisation-branch/common/trunk

Modified: db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/maven.xml?rev=234356&r1=234355&r2=234356&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/maven.xml (original)
+++ db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/maven.xml Sun Aug 21 14:37:24
2005
@@ -48,16 +48,10 @@
         <include name="plugin.properties" />
       </fileset>
     </copy>
-    <!--copy build-src.properties to the right place -->
-    <!--see comment in build-src.properties -->
-    <copy 
-      file="${maven.src.dir}/conf/build-src.properties"
-      tofile="${maven.dist.src.assembly.dir}/build.properties"
-    />
-    <copy 
-      file="${torque.project.base.path}"
-      todir="${maven.dist.src.assembly.dir}"
-    />
+
+    <copy todir="${maven.dist.src.assembly.dir}/common">
+      <fileset dir="common" includes="*"/>
+    </copy>  
   </preGoal>
   
 </project>

Modified: db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.properties
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.properties?rev=234356&r1=234355&r2=234356&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.properties (original)
+++ db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.properties Sun
Aug 21 14:37:24 2005
@@ -38,16 +38,5 @@
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
 
-# -------------------------------------------------------------------
-# Workaround to allow building from the source distribution.
-# In cvs, the extends path is ../../project-base.xml,
-# whereas in the source distribution, the extends path is 
-# project-base.xml
-# The property in this file controls the path for the cvs version.
-# The property can be removed as soon as maven distributes a 
-# project.xml where the <extends> is already resolved.
-# Outside building from the source distribution, this property has 
-# no effect.
-# -------------------------------------------------------------------
-torque.project.base.path = ../../project-base.xml
-
+# multiproject build
+maven.multiproject.type=plugin

Modified: db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.xml?rev=234356&r1=234355&r2=234356&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.xml (original)
+++ db/torque/branches/svn-reorganisation-branch/maven-plugin/trunk/project.xml Sun Aug 21
14:37:24 2005
@@ -18,7 +18,7 @@
  -->
 
 <project>
-  <extend>${torque.project.base.path}</extend>
+  <extend>common/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-torque-plugin</id>
   <groupId>torque</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message