harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r770234 - in /harmony/enhanced/classlib/trunk: depends/manifests/mx4j_3.0.2/ make/ modules/jmx/ modules/jmx/META-INF/ modules/jmx/make/
Date Thu, 30 Apr 2009 14:01:42 GMT
Author: hindessm
Date: Thu Apr 30 14:01:42 2009
New Revision: 770234

URL: http://svn.apache.org/viewvc?rev=770234&view=rev
Log:
Moving mx4j dependencies to a module.

Added:
    harmony/enhanced/classlib/trunk/modules/jmx/
    harmony/enhanced/classlib/trunk/modules/jmx/META-INF/   (props changed)
      - copied from r770110, harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/META-INF/
    harmony/enhanced/classlib/trunk/modules/jmx/build.xml   (with props)
    harmony/enhanced/classlib/trunk/modules/jmx/make/
    harmony/enhanced/classlib/trunk/modules/jmx/make/depends.properties   (with props)
Removed:
    harmony/enhanced/classlib/trunk/depends/manifests/mx4j_3.0.2/
Modified:
    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/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=770234&r1=770233&r2=770234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Thu Apr 30 14:01:42 2009
@@ -204,7 +204,6 @@
                 <patternset includes="bcel-5.2/*.jar" />
                 <patternset includes="asm-3.1/*.jar" />
                 <patternset includes="icu4j_4.0/*.jar" />
-                <patternset includes="mx4j_3.0.2/*.jar" />
                 <patternset includes="xalan-j_2.7.0/xalan.jar" />
                 <patternset includes="xerces_2.9.1/*.jar" />
                 <patternset includes="yoko-1.0/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?rev=770234&r1=770233&r2=770234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Thu Apr 30 14:01:42 2009
@@ -62,13 +62,6 @@
 # VS2005 version 8.00.50727.42
 msvcp.md5@x86_64@=5ae0f01f02a03558da0cbd249e4df263
 
-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.remote.jar=${mx4j.dir}/mx4j-remote.jar
-
 jetty.dir=${depends.jars}/jetty
 jetty.jar=${jetty.dir}/jetty-6.0.0.jar
 jetty.md5=930507973c9ad19a874af06f10be7223

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=770234&r1=770233&r2=770234&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Apr 30 14:01:42 2009
@@ -36,7 +36,6 @@
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
         <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
-        <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
         <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
         <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
@@ -62,15 +61,12 @@
     </target>
 
     <target name="-extract"
-         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-fix-xalan-manifest"
/>
+         depends="-extract-props,-extract-dejavu-fonts,-extract-xerces,-fix-xalan-manifest"
/>
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
                   srcfile="${dejavu-fonts.zip}"
                   targetfile="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
-        <uptodate property="mx4j.uptodate"
-                  srcfile="${mx4j.zip}"
-                  targetfile="${mx4j.jar}" />
         <uptodate property="xerces.uptodate"
                   srcfile="${xerces.zip}"
                   targetfile="${xerces.dir}/xercesImpl.jar" />
@@ -85,31 +81,6 @@
         <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
     </target>
 
-    <target name="-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" />
-	<touch file="${mx4j.jar}" />
-    </target>
-
     <target name="-extract-xerces" unless="xerces.uptodate">
         <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
         <copy todir="${xerces.dir}" flatten="yes">
@@ -181,10 +152,6 @@
     <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
                            md5="${bcprov.md5}" />
 
-    <mkdir dir="${mx4j.dir}" />
-    <download-one-file src="${mx4j.url}" dest="${mx4j.zip}"
-                           md5="${mx4j.md5}" />
-
     <mkdir dir="${jetty.dir}" />
     <download-one-file src="${jetty.url}" dest="${jetty.jar}"
                            md5="${jetty.md5}" />

Propchange: harmony/enhanced/classlib/trunk/modules/jmx/META-INF/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: harmony/enhanced/classlib/trunk/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jmx/build.xml?rev=770234&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jmx/build.xml (added)
+++ harmony/enhanced/classlib/trunk/modules/jmx/build.xml Thu Apr 30 14:01:42 2009
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<project name="JMX Build" default="build" basedir=".">
+    <description>Build for JMX component</description>
+
+    <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+
+    <target name="build" depends="check-depends, -copy-jars" />
+
+    <target name="check-depends" depends="-check,-extract" />
+
+    <target name="-check">
+        <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
+    </target>
+
+    <target name="fetch-depends">
+        <mkdir dir="${mx4j.dir}" />
+        <download-one-file src="${mx4j.url}" dest="${mx4j.zip}"
+                           md5="${mx4j.md5}" />
+    </target>
+
+    <target name="-extract" depends="-extract-props,-extract-mx4j" />
+
+    <target name="-extract-props">
+        <uptodate property="mx4j.uptodate"
+                  srcfile="${mx4j.zip}"
+                  targetfile="${mx4j.jar}" />
+    </target>
+
+    <target name="-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-${mx4j.version}/lib">
+                <include name="mx4j.jar"/>
+                <include name="mx4j-remote.jar"/>
+            </fileset>
+        </copy>
+        <delete dir="${mx4j.dir}.tmp" />
+	<touch file="${mx4j.jar}" />
+    </target>
+
+    <target name="-copy-jars">
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="mx4j_${mx4j.version}/*.jar" />
+            </fileset>
+        </copy>
+        <copy todir="${hy.jdk}/jre/lib/boot/mx4j_${mx4j.version}/META-INF">
+            <fileset dir="META-INF" />
+        </copy>
+    </target>
+
+    <target name="test" />
+
+    <target name="clean">
+        <delete dir="${hy.jdk}/jre/lib/boot/mx4j_${mx4j.version}" />
+    </target>
+
+</project>

Propchange: harmony/enhanced/classlib/trunk/modules/jmx/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/classlib/trunk/modules/jmx/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jmx/make/depends.properties?rev=770234&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jmx/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/jmx/make/depends.properties Thu Apr 30 14:01:42
2009
@@ -0,0 +1,10 @@
+depends.jars=${depends.dir}/jars
+sf.base=http://internap.dl.sourceforge.net/sourceforge
+
+mx4j.version=3.0.2
+mx4j.dir=${depends.jars}/mx4j_${mx4j.version}
+mx4j.zip=${mx4j.dir}/mx4j.zip
+mx4j.url=${sf.base}/mx4j/mx4j-${mx4j.version}.zip
+mx4j.md5=443bd83ee36414de4b8fc5722b038b02
+mx4j.jar=${mx4j.dir}/mx4j.jar
+mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar

Propchange: harmony/enhanced/classlib/trunk/modules/jmx/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message