You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/07/14 17:50:30 UTC
svn commit: r219053 - in /geronimo/branches/v1_0_M4-QA:
etc/project.properties maven.xml
Author: ammulder
Date: Thu Jul 14 08:50:28 2005
New Revision: 219053
URL: http://svn.apache.org/viewcvs?rev=219053&view=rev
Log:
Geronimo M4 branch
- checks out OpenEJB M4 branch for uberbuild
- does not include TranQL in uberbuild
- uses 20050713 version of tranql
- uses 1.0-SNAPSHOT version of tranql-connector
Note that the uberbuild still suffers from mixed up dependencies
Modified:
geronimo/branches/v1_0_M4-QA/etc/project.properties
geronimo/branches/v1_0_M4-QA/maven.xml
Modified: geronimo/branches/v1_0_M4-QA/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/etc/project.properties?rev=219053&r1=219052&r2=219053&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/etc/project.properties (original)
+++ geronimo/branches/v1_0_M4-QA/etc/project.properties Thu Jul 14 08:50:28 2005
@@ -77,7 +77,7 @@
geronimo_version=1.0-SNAPSHOT
openejb_version=2.0-SNAPSHOT
tmporb_version=1.0-SNAPSHOT
-tranql_version=1.0-SNAPSHOT
+tranql_version=1.0-20050713
tranql_connector_version=1.0-SNAPSHOT
geronimo_spec_activation_version=1.0.2-SNAPSHOT
Modified: geronimo/branches/v1_0_M4-QA/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/maven.xml?rev=219053&r1=219052&r2=219053&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/maven.xml (original)
+++ geronimo/branches/v1_0_M4-QA/maven.xml Thu Jul 14 08:50:28 2005
@@ -25,7 +25,7 @@
xmlns:maven="jelly:maven"
xmlns:define="jelly:define"
xmlns:modules="local:modules"
- xmlns:gscm="g:scm">
+ xmlns:gscm="g:scm"> <!-- g:scm is defined in this file! -->
<!-- ============= -->
<!-- New m: goals -->
@@ -155,7 +155,7 @@
<delete dir="${maven.repo.local}/geronimo"/>
<!--delete dir="${maven.repo.local}/howl"/-->
<delete dir="${maven.repo.local}/openejb"/>
- <delete dir="${maven.repo.local}/tranql"/>
+ <!--<delete dir="${maven.repo.local}/tranql"/>-->
<j:if test="${context.getVariable('geronimo.all') == 'true'}">
<delete dir="${maven.repo.local}/geronimo-spec"/>
</j:if>
@@ -205,6 +205,17 @@
failonerror="true"
/>
</define:tag>
+ <define:tag name="checkout-tag">
+ <ant:cvs command="checkout -P"
+ quiet="${maven.scm.cvs.quiet}"
+ cvsRsh="ssh"
+ cvsRoot="${root}"
+ dest="${dest}"
+ package="${module}"
+ tag="${tag}"
+ failonerror="true"
+ />
+ </define:tag>
<define:tag name="update">
<echo message="updating ${dir}"/>
<ant:cvs command="update -P -d"
@@ -220,11 +231,12 @@
<goal name="m:checkout">
<!--gscm:checkout module="activemq" root="${geronimo.activemq.cvs.access}@cvs.activemq.codehaus.org:/home/projects/activemq/scm"/-->
<!--gscm:checkout module="howl/logger" root="${geronimo.howl.cvs.access}@cvs.forge.objectweb.org:/cvsroot/howl"/-->
- <gscm:checkout module="openejb" root="${geronimo.openejb.cvs.access}@cvs.openejb.org:/home/projects/openejb/scm"/>
-
+ <gscm:checkout-tag module="openejb" root="${geronimo.openejb.cvs.access}@cvs.openejb.org:/home/projects/openejb/scm" tag="v2_0_G1M4"/>
+<!--
<mkdir dir="${basedir}/tranql"/>
<gscm:checkout module="tranql" dest="${basedir}/tranql" root="${geronimo.tranql.cvs.access}@cvs.tranql.codehaus.org:/home/projects/tranql/scm"/>
<gscm:checkout module="connector" dest="${basedir}/tranql" root="${geronimo.tranql.cvs.access}@cvs.tranql.codehaus.org:/home/projects/tranql/scm"/>
+-->
</goal>
<goal name="m:update">
@@ -234,15 +246,17 @@
<!--gscm:update dir="${basedir}/activemq"/-->
<!--gscm:update dir="${basedir}/howl/logger"/-->
<gscm:update dir="${basedir}/openejb"/>
+<!--
<gscm:update dir="${basedir}/tranql/tranql"/>
<gscm:update dir="${basedir}/tranql/connector"/>
+-->
</goal>
<goal name="m:fresh-checkout">
<!--delete dir="${basedir}/activemq"/-->
<!--delete dir="${basedir}/howl"/-->
<delete dir="${basedir}/openejb"/>
- <delete dir="${basedir}/tranql"/>
+ <!--<delete dir="${basedir}/tranql"/>-->
<attainGoal name="m:checkout"/>
<ant:exec dir="${basedir}" executable="svn">
<ant:arg line="update"/>