harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r505357 - in /harmony/enhanced/classlib/trunk: depends/files/ depends/jars/ depends/manifests/mx4j_3.0.1/ depends/manifests/mx4j_3.0.2/ depends/manifests/mx4j_3.0.2/META-INF/ make/
Date Fri, 09 Feb 2007 16:36:08 GMT
Author: hindessm
Date: Fri Feb  9 08:36:07 2007
New Revision: 505357

URL: http://svn.apache.org/viewvc?view=rev&rev=505357
Log:
Update mx4j to 3.0.2.

Added:
    harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/
      - copied from r504813, harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.1/
Removed:
    harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.1/
Modified:
    harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
    harmony/enhanced/classlib/trunk/depends/jars/   (props changed)
    harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml

Modified: harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?view=diff&rev=505357&r1=505356&r2=505357
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Fri Feb  9 08:36:07
2007
@@ -175,8 +175,8 @@
 bootclasspath.37=xerces_2.8.0/xml-apis.jar
 
 # The following JARs are from mx4j.sf.net
-bootclasspath.38=mx4j_3.0.1/mx4j.jar
-bootclasspath.39=mx4j_3.0.1/mx4j-remote.jar
+bootclasspath.38=mx4j_3.0.2/mx4j.jar
+bootclasspath.39=mx4j_3.0.2/mx4j-remote.jar
 
 # Dependencies for awt and swing
 bootclasspath.40=misc.jar

Propchange: harmony/enhanced/classlib/trunk/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb  9 08:36:07 2007
@@ -3,6 +3,7 @@
 icu4j_3.4.4
 junit_3.8.2
 mx4j_3.0.1
+mx4j_3.0.2
 xalan-j_2.7.0
 xerces_2.8.0
 bcprov-jdk14-132

Modified: harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/META-INF/MANIFEST.MF?view=diff&rev=505357&r1=504813&r2=505357
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/META-INF/MANIFEST.MF Fri
Feb  9 08:36:07 2007
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Harmony JMX MX4J
 Bundle-SymbolicName: org.apache.harmony.management.mx4j
-Bundle-Version: 3.0.1
+Bundle-Version: 3.0.2
 Bundle-ClassPath: mx4j.jar, mx4j-remote.jar
 Eclipse-JREBundle: true
 Export-Package: javax.management,

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=505357&r1=505356&r2=505357
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Fri Feb  9 08:36:07 2007
@@ -206,13 +206,13 @@
         <copy file="LICENSE" todir="${hy.hdk}" verbose="yes" />
         <copy file="NOTICE" todir="${hy.hdk}" verbose="yes" />
 
-        <!-- Copy across the boot dependency jars -->
+        <!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
                 <patternset includes="bcel-5.2/*.jar" />
                 <patternset includes="icu4j_3.4.4/*.jar" />
                 <patternset includes="icu4jni_3.4/*.jar" />
-                <patternset includes="mx4j_3.0.1/*.jar" />
+                <patternset includes="mx4j_3.0.2/*.jar" />
                 <patternset includes="xalan-j_2.7.0/*.jar" />
                 <patternset includes="xerces_2.8.0/*.jar" />
                 <patternset includes="yoko_M2-20070130/yoko-rmi-spec.jar" />

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=505357&r1=505356&r2=505357
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Fri Feb  9 08:36:07 2007
@@ -16,6 +16,7 @@
 depends.dir=depends
 depends.jars=${depends.dir}/jars
 mirror.base=http://mirrors.ibiblio.org/pub/mirrors/maven2
+sf.base=http://internap.dl.sourceforge.net/sourceforge
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0
 xalan.jar=${xalan.dir}/xalan.jar
@@ -61,14 +62,12 @@
 ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar
 ecj.md5=633e14a4dc14ca578b5548c3c088172f
 
-mx4j.dir=${depends.jars}/mx4j_3.0.1
+mx4j.dir=${depends.jars}/mx4j_3.0.2
+mx4j.zip=${mx4j.dir}/mx4j.zip
+mx4j.url=${sf.base}/mx4j/mx4j-3.0.2.zip
+mx4j.md5=443bd83ee36414de4b8fc5722b038b02
 mx4j.jar=${mx4j.dir}/mx4j.jar
-mx4j.url=${mirror.base}/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar
-mx4j.md5=7a8675e26ee20f997ad4f54091e9b7a5
-
 mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
-mx4j.remote.url=${mirror.base}/mx4j/mx4j-remote/3.0.1/mx4j-remote-3.0.1.jar
-mx4j.remote.md5=bacb72e0fcad4259825c7cac1a0efe43
 
 yoko.dir=${depends.jars}/yoko_M2-20070130
 yoko.jar=${yoko.dir}/yoko.jar

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=505357&r1=505356&r2=505357
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Fri Feb  9 08:36:07 2007
@@ -29,7 +29,7 @@
     <import file="${basedir}/make/properties.xml" />
 
     <target name="check" description="Check whether dependencies are available"
-            depends="-check,-check-win,-check-unix" />
+            depends="-check,-check-win,-check-unix,-extract" />
 
     <target name="-check">
         <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
@@ -44,8 +44,7 @@
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
         <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
         <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
-        <check-one-file src="${mx4j.url}" dest="${mx4j.jar}" />
-        <check-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}" />
+        <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
         <check-one-file src="${ecj.url}" dest="${ecj.jar}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
         <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
@@ -64,6 +63,35 @@
         <antcall target="-awt-tar-extract" />
     </target>
 
+    <target name="-extract" depends="-extract-props,-really-extract-mx4j" />
+    <target name="-extract-props">
+        <uptodate property="mx4j.uptodate"
+                  srcfile="${mx4j.zip}"
+                  targetfile="${mx4j.jar}" />
+    </target>
+    <target name="-really-extract-mx4j" unless="mx4j.uptodate">
+        <!-- This doesn't work for me since my ant doesn't support
+             mapper in unzip.
+
+        <unzip src="${mx4j.zip}" dest="${mx4j.dir}">
+            <patternset>
+                <include name="**/mx4j.jar"/>
+                <include name="**/mx4j-remote.jar"/>
+            </patternset>
+            <mapper type="flatten" />
+        </unzip>
+          -->
+
+        <unzip src="${mx4j.zip}" dest="${mx4j.dir}.tmp" />
+        <copy todir="${mx4j.dir}" flatten="yes">
+            <fileset dir="${mx4j.dir}.tmp/mx4j-3.0.2/lib">
+                <include name="mx4j.jar"/>
+                <include name="mx4j-remote.jar"/>
+            </fileset>
+        </copy>
+        <delete dir="${mx4j.dir}.tmp" />
+    </target>
+
     <!-- 
        *  FIXME : the following awful little hack is because we noticed that for whatever
        *  reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
@@ -258,12 +286,9 @@
                            md5="${icu4j.md5}" />
 
     <mkdir dir="${mx4j.dir}" />
-    <download-one-file src="${mx4j.url}" dest="${mx4j.jar}"
+    <download-one-file src="${mx4j.url}" dest="${mx4j.zip}"
                            md5="${mx4j.md5}" />
 
-    <download-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}"
-                           md5="${mx4j.remote.md5}" />
-
     <mkdir dir="${ecj.dir}" />
     <download-one-file src="${ecj.url}" dest="${ecj.jar}"
                            md5="${ecj.md5}" />
@@ -368,7 +393,7 @@
 
     <target name="-awt-tar-extract" unless="awtdeps.uptodate">
         <echo>Extracting awt dependencies</echo>
-    <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}"
+        <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}"
                compression="gzip" />
         <echo file="${awtdeps.testfile}"
               message="${awtdeps.tar} extracted${line.separator}" />



Mime
View raw message