You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/16 08:13:14 UTC
svn commit: r414747 - in /incubator/harmony/enhanced/classlib/trunk:
THIRD_PARTY_NOTICES.txt depends/jars/ make/build-java.xml
make/depends.properties make/depends.xml
Author: hindessm
Date: Thu Jun 15 23:13:13 2006
New Revision: 414747
URL: http://svn.apache.org/viewvc?rev=414747&view=rev
Log:
Applying patch from "[#HARMONY-560] Use mx4j for javax.management"
Modified:
incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt
incubator/harmony/enhanced/classlib/trunk/depends/jars/ (props changed)
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
incubator/harmony/enhanced/classlib/trunk/make/depends.properties
incubator/harmony/enhanced/classlib/trunk/make/depends.xml
Modified: incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt?rev=414747&r1=414746&r2=414747&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt Thu Jun 15 23:13:13 2006
@@ -233,5 +233,62 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-================================================================================
-================================================================================
+===============================================================================
+===============================================================================
+
+License Notice for MX4J 3.0.1.
+==============================
+
+The MX4J License, Version 1.0
+
+Copyright (c) 2001-2004 by the MX4J contributors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ MX4J project (http://mx4j.sourceforge.net)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+ 4. The name "MX4J" must not be used to endorse or promote
+ products derived from this software without prior written
+ permission.
+ For written permission, please contact
+ biorn_steedom [at] users [dot] sourceforge [dot] net
+
+ 5. Products derived from this software may not be called "MX4J",
+ nor may "MX4J" appear in their name, without prior written
+ permission of Simone Bordet.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE MX4J CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the MX4J project. For more information on
+ MX4J, please see the MX4J website (http://mx4j.sourceforge.net/).
+
+===============================================================================
+===============================================================================
Propchange: incubator/harmony/enhanced/classlib/trunk/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 15 23:13:13 2006
@@ -1,8 +1,7 @@
-bcprov-jdk14-131
-bcprov-jdk14-132
-icu4j_3.4.4
bcprov-jdk14-133
ecj_3.2RC5
+icu4j_3.4.4
+junit_3.8.2
+mx4j_3.0.1
xalan-j_2.7.0
xerces_2.8.0
-junit_3.8.2
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=414747&r1=414746&r2=414747&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Jun 15 23:13:13 2006
@@ -156,6 +156,7 @@
<patternset includes="xerces_2.8.0/*.jar" />
<patternset includes="xalan-j_2.7.0/*.jar" />
<patternset includes="icu4j_3.4.4/*.jar" />
+ <patternset includes="mx4j_3.0.1/*.jar" />
</fileset>
<fileset dir="${depends.manifests}"/>
</copy>
Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=414747&r1=414746&r2=414747&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Thu Jun 15 23:13:13 2006
@@ -64,3 +64,12 @@
ecj.jar=${ecj.dir}/ecj_3.2RC5.jar
ecj.url=http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC5-200605191206/ecj.jar
ecj.md5=749b4db2b3a93568156da09c05b8697b
+
+mx4j.dir=${depends.jars}/mx4j_3.0.1
+mx4j.jar=${mx4j.dir}/mx4j.jar
+mx4j.url=${ibiblio.base}/maven/mx4j/jars/mx4j-3.0.1.jar
+mx4j.md5=7a8675e26ee20f997ad4f54091e9b7a5
+
+mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
+mx4j.remote.url=${ibiblio.base}/maven/mx4j/jars/mx4j-remote-3.0.1.jar
+mx4j.remote.md5=bacb72e0fcad4259825c7cac1a0efe43
Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=414747&r1=414746&r2=414747&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Jun 15 23:13:13 2006
@@ -44,6 +44,10 @@
<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}" />
+
<!-- Do not require the Eclipse compiler until the tools are integrated into the build
<check-one-file src="${ecj.url}" dest="${ecj.jar}" />
-->
@@ -90,6 +94,14 @@
<mkdir dir="${icu4j.dir}" />
<download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
md5="${icu4j.md5}" />
+
+ <mkdir dir="${mx4j.dir}" />
+ <download-one-file src="${mx4j.url}" dest="${mx4j.jar}"
+ md5="${mx4j.md5}" />
+
+ <mkdir dir="${mx4j.remote.dir}" />
+ <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}"