db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r234279 - in /db/torque/branches/svn-reorganisation-branch/generator/trunk: ./ maven.xml project.properties project.xml src/conf/build-src.properties
Date Sun, 21 Aug 2005 17:27:35 GMT
Author: henning
Date: Sun Aug 21 10:27:30 2005
New Revision: 234279

URL: http://svn.apache.org/viewcvs?rev=234279&view=rev
Log:
- added external common

- removed Thomas' build-src hack (no longer needed)

- adjusted to new svn tree structure



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

Propchange: db/torque/branches/svn-reorganisation-branch/generator/trunk/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Sun Aug 21 10:27:30 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/generator/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/generator/trunk/maven.xml?rev=234279&r1=234278&r2=234279&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/generator/trunk/maven.xml (original)
+++ db/torque/branches/svn-reorganisation-branch/generator/trunk/maven.xml Sun Aug 21 10:27:30
2005
@@ -27,7 +27,8 @@
 
 <project
   xmlns:pom="pom"
-  xmlns:deploy="deploy">
+  xmlns:deploy="deploy"
+  default="jar:jar">
 
   <!-- Allow any user specific values to override the defaults -->
   <property file="${user.home}/build.properties" />
@@ -71,24 +72,6 @@
         <include name="id-table-schema.xml" />
       </fileset>
     </copy>
-  </preGoal>
-
-  <!-- ================================================================== -->
-  <!-- D I S T : B U I L D _ S R C   P R E   G O A L                      -->
-  <!-- ================================================================== -->
-  <!-- copies files to the right place to get pom <extends>  path right   -->
-  <!-- ================================================================== -->
-  <preGoal name="dist:build-src">
-    <!--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}"
-    />
   </preGoal>
 
   <!-- ================================================================== -->

Modified: db/torque/branches/svn-reorganisation-branch/generator/trunk/project.properties
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/generator/trunk/project.properties?rev=234279&r1=234278&r2=234279&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/generator/trunk/project.properties (original)
+++ db/torque/branches/svn-reorganisation-branch/generator/trunk/project.properties Sun Aug
21 10:27:30 2005
@@ -24,19 +24,6 @@
 # your build.properties file.
 # -------------------------------------------------------------------
 
-# -------------------------------------------------------------------
-# 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
-
 #========================================================================
 # 
 # Maven building and deploy. These settings are for deployment to www.apache.org.

Modified: db/torque/branches/svn-reorganisation-branch/generator/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/generator/trunk/project.xml?rev=234279&r1=234278&r2=234279&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/generator/trunk/project.xml (original)
+++ db/torque/branches/svn-reorganisation-branch/generator/trunk/project.xml Sun Aug 21 10:27:30
2005
@@ -18,7 +18,7 @@
  -->
 
 <project>
-  <extend>${torque.project.base.path}</extend>
+  <extend>common/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>torque-gen</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