harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r531881 - in /harmony/enhanced/classlib/branches/java6: depends/files/bootclasspath.properties depends/jars/ make/build-java.xml make/depends.properties make/depends.xml
Date Tue, 24 Apr 2007 11:29:33 GMT
Author: mloenko
Date: Tue Apr 24 04:29:32 2007
New Revision: 531881

URL: http://svn.apache.org/viewvc?view=rev&rev=531881
Log:
add dependency to XML Security

Modified:
    harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
    harmony/enhanced/classlib/branches/java6/depends/jars/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/build-java.xml
    harmony/enhanced/classlib/branches/java6/make/depends.properties
    harmony/enhanced/classlib/branches/java6/make/depends.xml

Modified: harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties?view=diff&rev=531881&r1=531880&r2=531881
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties Tue Apr
24 04:29:32 2007
@@ -193,12 +193,17 @@
 bootclasspath.source.46=pack200-src.jar
 bootclasspath.source.packageroot.46=/
 
+# The following JARs are from XML Security
+bootclasspath.47=xmlsec-1.4.0/commons-logging.jar
+bootclasspath.48=xmlsec-1.4.0/xmlsec-1.4.0.jar
+
+
 #
 #  Sun compatibility
 #
 #  Uncomment the three lines below to include additional
 #  compatiblity types.
 #
-#bootclasspath.47=suncompat.jar
-#bootclasspath.source.47=suncompat-src.jar
-#bootclasspath.source.packageroot.47=/
+#bootclasspath.49=suncompat.jar
+#bootclasspath.source.49=suncompat-src.jar
+#bootclasspath.source.packageroot.49=/

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 24 04:29:32 2007
@@ -1,3 +1,4 @@
+
 bcprov-jdk14-133
 ecj_3.2RC5
 icu4j_3.4.4
@@ -21,3 +22,4 @@
 yoko_M2-20061115
 yoko_M2-20070130
 xerces_2.9.0
+xmlsec_1.4.0

Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?view=diff&rev=531881&r1=531880&r2=531881
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Tue Apr 24 04:29:32 2007
@@ -240,6 +240,25 @@
 		<fileset dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0"/>
 	</move>
 
+	<!-- Unzip xmlsec jars -->
+	<mkdir dir="${hy.jdk}/jre/lib/boot/xmlsec-1.4.0" />
+	<unzip src="${depends.jars}/xmlsec_1.4.0/xmlsec.zip"
+	       dest="${hy.jdk}/jre/lib/boot" >
+		<patternset>
+			<include name="xml-security-1_4_0/libs/xmlsec-1.4.0.jar" />
+			<include name="xml-security-1_4_0/libs/commons-logging.jar" />
+		</patternset>
+
+                <!-- mapper type="flatten" / -->
+	</unzip>
+
+        <!-- TODO: remove this when switch to next ant version -->
+	<move todir="${hy.jdk}/jre/lib/boot/xmlsec-1.4.0">
+		<fileset dir="${hy.jdk}/jre/lib/boot/xml-security-1_4_0/libs"/>
+	</move>
+        <delete dir="${hy.jdk}/jre/lib/boot/xml-security-1_4_0" />
+
+
         <!-- delete these lines if BC version is greater than jdk15-134 -->
         <!-- delete the original signed.bcprov.jar                      -->
         <delete file="${hy.jdk}/jre/lib/ext/signed.bcprov.jar" />

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?view=diff&rev=531881&r1=531880&r2=531881
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Tue Apr 24 04:29:32 2007
@@ -28,6 +28,11 @@
 xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.0.zip
 xerces.md5=a3aece3feb68be6d319072b85ad06023
 
+xmlsec.dir=${depends.jars}/xmlsec_1.4.0
+xmlsec.zip=${xmlsec.dir}/xmlsec.zip
+xmlsec.url=http://xml.apache.org/security/dist/java-library/xml-security-bin-1_4_0.zip
+xmlsec.md5=79ffece964a40d33fb25f3f7a8e83f6b
+
 junit.dir=${depends.jars}/junit_3.8.2
 junit.jar=${junit.dir}/junit.jar
 junit.url=${mirror.base}/junit/junit/3.8.2/junit-3.8.2.jar

Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?view=diff&rev=531881&r1=531880&r2=531881
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Tue Apr 24 04:29:32 2007
@@ -39,6 +39,7 @@
         <check-one-file src="${bcel.url}" dest="${bcel.jar}" />
         <check-one-file src="${xalan.url}" dest="${xalan.jar}" />
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
+        <check-one-file src="${xmlsec.url}" dest="${xmlsec.zip}" />
         <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}" />
@@ -311,6 +312,10 @@
     <mkdir dir="${xerces.dir}" />
     <download-one-file src="${xerces.url}" dest="${xerces.zip}"
                            md5="${xerces.md5}" />
+
+    <mkdir dir="${xmlsec.dir}" />
+    <download-one-file src="${xmlsec.url}" dest="${xmlsec.zip}"
+                           md5="${xmlsec.md5}" />
 
     <mkdir dir="${junit.dir}" />
     <download-one-file src="${junit.url}" dest="${junit.jar}"



Mime
View raw message