You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by oz...@apache.org on 2006/07/29 17:57:47 UTC
svn commit: r426820 - in /jakarta/commons/proper/transaction/trunk:
build.properties.sample build.xml lib/geronimo-spec-j2ee-1.0-M1.jar
lib/geronimo-spec-j2ee-1.4-rc4.jar lib/geronimo-spec-servlet-2.4-rc4.jar
project.xml
Author: ozeigermann
Date: Sat Jul 29 08:57:46 2006
New Revision: 426820
URL: http://svn.apache.org/viewvc?rev=426820&view=rev
Log:
Preparation for rc3
Added:
jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.4-rc4.jar (with props)
jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-servlet-2.4-rc4.jar (with props)
Removed:
jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.0-M1.jar
Modified:
jakarta/commons/proper/transaction/trunk/build.properties.sample
jakarta/commons/proper/transaction/trunk/build.xml
jakarta/commons/proper/transaction/trunk/project.xml
Modified: jakarta/commons/proper/transaction/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/build.properties.sample?rev=426820&r1=426819&r2=426820&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/commons/proper/transaction/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/build.xml?rev=426820&r1=426819&r2=426820&view=diff
==============================================================================
--- jakarta/commons/proper/transaction/trunk/build.xml (original)
+++ jakarta/commons/proper/transaction/trunk/build.xml Sat Jul 29 08:57:46 2006
@@ -57,8 +57,8 @@
<property name="dist.lib" value="${dist.dir}/lib"/>
<property name="dist.deploy" value="${dist.dir}/deploy"/>
- <property name="j2ee.jar" value="${lib.dir}/geronimo-spec-j2ee.jar"/>
- <property name="servlet.jar" value="${lib.dir}/geronimo-spec-servlet-2.4.jar"/>
+ <property name="j2ee.jar" value="${lib.dir}/geronimo-spec-j2ee-1.4-rc4.jar"/>
+ <property name="servlet.jar" value="${lib.dir}/geronimo-spec-servlet-2.4-rc4.jar"/>
<path id="classpath">
<pathelement location="${build.classes}" />
@@ -78,7 +78,11 @@
<available property="j2ee.present" classname="javax.resource.cci.Connection" classpath="${j2ee.jar}"/>
<available property="servlet.present" classname="javax.servlet.Servlet" classpath="${servlet.jar}"/>
<condition property="jvm14.present">
- <equals arg1="${ant.java.version}" arg2="1.4"/>
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ </or>
</condition>
<echo message="+-------------------------------------------------------"/>
<echo message="| Build environment for ${name} ${version}"/>
@@ -105,6 +109,7 @@
<echo message="Optional Libraries:"/>
<echo message=" J2EE API ${j2ee.present}"/>
<echo message=" Servlet API ${servlet.present}"/>
+ <echo message=" JVM 14 ${jvm14.present}"/>
<echo message=""/>
<property name="required.present" value="true"/>
<!--condition property="required.present">
@@ -169,7 +174,7 @@
</javac>
</target>
- <target name="build-test" depends="build">
+ <target name="build-test" depends="detect,build" if="jvm14.present">
<javac destdir="${build.classes}"
target="${compile.target}"
debug="${compile.debug}"
@@ -434,6 +439,10 @@
<copy file="project.xml" tofile="${dist.dir}/${final.name}.pom" />
<antcall target="internal-md5">
<param name="path" value="${dist.dir}/${final.name}.pom"/>
+ </antcall>
+ <copy file="${build.lib}/${final.name}.jar" tofile="${dist.dir}/${final.name}.jar" />
+ <antcall target="internal-md5">
+ <param name="path" value="${dist.dir}/${final.name}.jar"/>
</antcall>
</target>
Added: jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.4-rc4.jar
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.4-rc4.jar?rev=426820&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.4-rc4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-servlet-2.4-rc4.jar
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-servlet-2.4-rc4.jar?rev=426820&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-servlet-2.4-rc4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: jakarta/commons/proper/transaction/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/trunk/project.xml?rev=426820&r1=426819&r2=426820&view=diff
==============================================================================
--- jakarta/commons/proper/transaction/trunk/project.xml (original)
+++ jakarta/commons/proper/transaction/trunk/project.xml Sat Jul 29 08:57:46 2006
@@ -127,7 +127,15 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.0-M1</version>
+ <version>1.4-rc4</version>
+ <properties>
+ <scope>provided</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ <version>2.4-rc4</version>
<properties>
<scope>provided</scope>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: svn commit: r426820 - in /jakarta/commons/proper/transaction/trunk: build.properties.sample build.xml lib/geronimo-spec-j2ee-1.0-M1.jar lib/geronimo-spec-j2ee-1.4-rc4.jar lib/geronimo-spec-servlet-2.4-rc4.jar project.xml
Posted by Rahul Akolkar <ra...@gmail.com>.
On 7/29/06, ozeigermann@apache.org <oz...@apache.org> wrote:
> Author: ozeigermann
> Date: Sat Jul 29 08:57:46 2006
> New Revision: 426820
>
> URL: http://svn.apache.org/viewvc?rev=426820&view=rev
> Log:
> Preparation for rc3
>
> Added:
> jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.4-rc4.jar (with props)
> jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-servlet-2.4-rc4.jar (with props)
> Removed:
> jakarta/commons/proper/transaction/trunk/lib/geronimo-spec-j2ee-1.0-M1.jar
<snip/>
I guess another way to put my earlier comment in the RC thread is to
ask what the purpose of this lib directory is, in the [transaction]
repository.
-Rahul
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org