Well, if you weren't confused then I was :). I'll merge my changes with
HEAD soon (tomorrow, probably). I want to get everything cleaned up for
the release first.
-James
On Sun, 2004-10-10 at 23:13, Oliver Zeigermann wrote:
> I am an idiot! Of course this is the release branch :( Wanted to say to
> the MAIN branch.
>
> Sorry,
>
> Oliver
>
> James Mason schrieb:
>
> > I thought this was the release branch. This would definately be a good
> > time to tell me if I'm putting together a release with the wrong version
> > of the code :).
> >
> > -James
> >
> > On Sun, 2004-10-10 at 21:33, Oliver Zeigermann wrote:
> >
> >>Any special reason why you did not take this over to the relesae branch
> >>(same with previous commit)? Just wondering...
> >>
> >>Oliver
> >>
> >>[EMAIL PROTECTED] schrieb:
> >>
> >>>masonjm 2004/10/10 18:27:05
> >>>
> >>> Modified: webdavclient Tag: SLIDE_2_1_RELEASE_BRANCH build.xml
> >>> Added: webdavclient/lib Tag: SLIDE_2_1_RELEASE_BRANCH
> >>> commons-transaction-20040805.jar
> >>> Removed: webdavclient/lib Tag: SLIDE_2_1_RELEASE_BRANCH
> >>> commons-transaction-20040726.jar
> >>> Log:
> >>> - Updated commons-transaction.jar
> >>> - Added build targets for jca and ant packages
> >>> - Added "release" build target
> >>>
> >>> Revision Changes Path
> >>> No revision
> >>> No revision
> >>> 1.1.2.1 +278 -0
> >>> jakarta-slide/webdavclient/lib/Attic/commons-transaction-20040805.jar
> >>>
> >>> <<Binary file>>
> >>>
> >>>
> >>> No revision
> >>> No revision
> >>> 1.22.2.4 +85 -1 jakarta-slide/webdavclient/build.xml
> >>>
> >>> Index: build.xml
> >>> ===================================================================
> >>> RCS file: /home/cvs/jakarta-slide/webdavclient/build.xml,v
> >>> retrieving revision 1.22.2.3
> >>> retrieving revision 1.22.2.4
> >>> diff -u -r1.22.2.3 -r1.22.2.4
> >>> --- build.xml 6 Oct 2004 11:14:09 -0000 1.22.2.3
> >>> +++ build.xml 11 Oct 2004 01:27:05 -0000 1.22.2.4
> >>> @@ -28,6 +28,8 @@
> >>> <property name="jca.rar.name" value="webdav-${version}.rar"/>
> >>> <property name="archive.src.name"
> >>> value="${project}-webdavclient-src-${version}"/>
> >>> <property name="archive.bin.name"
> >>> value="${project}-webdavclient-bin-${version}"/>
> >>> + <property name="archive.ant.name"
> >>> value="${project}-ant-webdav-bin-${version}"/>
> >>> + <property name="archive.jca.name"
> >>> value="${project}-jca-webdav-bin-${version}"/>
> >>> <!-- ===================================================================
> >>> -->
> >>> <!-- Build Properties
> >>> -->
> >>> <!-- ===================================================================
> >>> -->
> >>> @@ -52,7 +54,7 @@
> >>> <property name="antlr.jar" value="lib/antlr.jar"/>
> >>> <property name="commons-logging.jar" value="lib/commons-logging.jar"/>
> >>> <property name="ant.jar" value="lib/ant.jar"/>
> >>> - <property name="commons-transaction.jar"
> >>> value="lib/commons-transaction-20040726.jar"/>
> >>> + <property name="commons-transaction.jar"
> >>> value="lib/commons-transaction-20040805.jar"/>
> >>> <property name="j2ee-spec.jar" value="lib/geronimo-spec-j2ee-1.0-M1.jar"/>
> >>> <property name="jdom.jar" value="lib/jdom-1.0.jar"/>
> >>> <property name="xml-im-exporter.jar" value="lib/xml-im-exporter1.1.jar"/>
> >>> @@ -510,5 +512,87 @@
> >>> description="Package binary distribution as ZIP and TAR-GZIP">
> >>> <delete dir="${slide.dist}/${archive.bin.name}"/>
> >>> </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Copy all files for the jca bin archive
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-jca-prepare" depends="dist-jca">
> >>> + <mkdir dir="${slide.dist}/${archive.jca.name}"/>
> >>> + <copy todir="${slide.dist}/${archive.jca.name}">
> >>> + <fileset dir="${jca.dist}"/>
> >>> + </copy>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages jca bin dist as ZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-jca-zip" depends="package-jca-prepare">
> >>> + <zip zipfile="${slide.dist}/${archive.jca.name}.zip">
> >>> + <zipfileset dir="${slide.dist}/${archive.jca.name}"
> >>> + prefix="${archive.jca.name}" includes="**"/>
> >>> + </zip>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages jca bin dist as TAR-GZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-jca-tgz" depends="package-jca-prepare">
> >>> + <tar tarfile="${slide.dist}/${archive.jca.name}.tar" longfile="gnu">
> >>> + <tarfileset dir="${slide.dist}">
> >>> + <include name="${archive.jca.name}/**"/>
> >>> + </tarfileset>
> >>> + </tar>
> >>> + <gzip zipfile="${slide.dist}/${archive.jca.name}.tar.gz"
> >>> + src="${slide.dist}/${archive.jca.name}.tar"/>
> >>> + <delete file="${slide.dist}/${archive.jca.name}.tar"/>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages jca bin with ZIP and TAR-GZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-jca-all" depends="package-jca-zip, package-jca-tgz"
> >>> + description="Package binary jca distribution as ZIP and TAR-GZIP">
> >>> + <delete dir="${slide.dist}/${archive.jca.name}"/>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Copy all files for the ant bin archive
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-ant-prepare" depends="dist-ant">
> >>> + <mkdir dir="${slide.dist}/${archive.ant.name}"/>
> >>> + <copy todir="${slide.dist}/${archive.ant.name}">
> >>> + <fileset dir="${ant.dist}"/>
> >>> + </copy>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages ant bin dist as ZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-ant-zip" depends="package-ant-prepare">
> >>> + <zip zipfile="${slide.dist}/${archive.ant.name}.zip">
> >>> + <zipfileset dir="${slide.dist}/${archive.ant.name}"
> >>> + prefix="${archive.ant.name}" includes="**"/>
> >>> + </zip>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages ant bin dist as TAR-GZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-ant-tgz" depends="package-ant-prepare">
> >>> + <tar tarfile="${slide.dist}/${archive.ant.name}.tar" longfile="gnu">
> >>> + <tarfileset dir="${slide.dist}">
> >>> + <include name="${archive.ant.name}/**"/>
> >>> + </tarfileset>
> >>> + </tar>
> >>> + <gzip zipfile="${slide.dist}/${archive.ant.name}.tar.gz"
> >>> + src="${slide.dist}/${archive.ant.name}.tar"/>
> >>> + <delete file="${slide.dist}/${archive.ant.name}.tar"/>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages ant bin with ZIP and TAR-GZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="package-ant-all" depends="package-ant-zip, package-ant-tgz"
> >>> + description="Package binary ant distribution as ZIP and TAR-GZIP">
> >>> + <delete dir="${slide.dist}/${archive.ant.name}"/>
> >>> + </target>
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <!-- Packages jca, ant and client distributions with ZIP and TAR-GZIP
> >>> -->
> >>> + <!-- ===================================================================
> >>> -->
> >>> + <target name="release"
> >>> + depends="package-ant-all, package-jca-all, package-src-all,
> >>> package-bin-all"
> >>> + description="Packages ant, jca and client distributions with ZIP and
> >>> TAR-GZIP"/>
> >>> </project>
> >>>
> >>>
> >>>
> >>>
> >>>
> >>>---------------------------------------------------------------------
> >>>To unsubscribe, e-mail: [EMAIL PROTECTED]
> >>>For additional commands, e-mail: [EMAIL PROTECTED]
> >>>
> >>>
> >>
> >>
> >>---------------------------------------------------------------------
> >>To unsubscribe, e-mail: [EMAIL PROTECTED]
> >>For additional commands, e-mail: [EMAIL PROTECTED]
> >>
> >>
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
> >
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
