harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r910956 - in /harmony/enhanced/classlib/branches/java6: depends/files/ depends/jars/ depends/manifests/xalan-j_2.7.0/META-INF/ make/ modules/xmlsec/ modules/xmlsec/META-INF/ modules/xmlsec/make/
Date Wed, 17 Feb 2010 13:00:02 GMT
Author: hindessm
Date: Wed Feb 17 13:00:02 2010
New Revision: 910956

URL: http://svn.apache.org/viewvc?rev=910956&view=rev
Log:
Remove old downloaded-but-not-used xmlsec download.
Create an xmlsec module to "own" this dependency and configure it to
download a more recent xmlsec zip that has some security fixes.
Add more exports to the xalan manifest to match imports on xmlsec.

Added:
    harmony/enhanced/classlib/branches/java6/modules/xmlsec/
    harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/
    harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/MANIFEST.MF   (with props)
    harmony/enhanced/classlib/branches/java6/modules/xmlsec/build.xml   (with props)
    harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/
    harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/depends.properties   (with
props)
Modified:
    harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
    harmony/enhanced/classlib/branches/java6/depends/jars/   (props changed)
    harmony/enhanced/classlib/branches/java6/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
    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?rev=910956&r1=910955&r2=910956&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties Wed Feb
17 13:00:02 2010
@@ -190,9 +190,8 @@
 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
-
+bootclasspath.47=xmlsec-1.4.3/commons-logging.jar
+bootclasspath.48=xmlsec-1.4.3/xmlsec-1.4.3.jar
 
 #
 #  Sun compatibility

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 17 13:00:02 2010
@@ -9,7 +9,6 @@
 yoko-1.0
 bcprov-jdk15-141
 asm-3.1
-xmlsec_1.4.0
 bsf-3.0-beta3
 icu4j_4.2.1
 axis2-1.3
@@ -19,3 +18,4 @@
 geronimo-jaxb_2.1_spec-1.0
 geronimo-ws-metadata_2.0_spec-1.1.2
 geronimo-jaxws_2.1_spec-1.0
+xmlsec-1.4.3

Modified: harmony/enhanced/classlib/branches/java6/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF?rev=910956&r1=910955&r2=910956&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
(original)
+++ harmony/enhanced/classlib/branches/java6/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
Wed Feb 17 13:00:02 2010
@@ -6,4 +6,6 @@
 Bundle-ClassPath: xalan.jar
 Eclipse-JREBundle: true
 Export-Package: org.apache.xpath,
- org.apache.xpath.objects
+ org.apache.xpath.objects,
+ org.apache.xml.dtm,
+ org.apache.xml.utils

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=910956&r1=910955&r2=910956&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Wed Feb 17 13:00:02 2010
@@ -28,11 +28,6 @@
 xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.zip
 xerces.md5=a0e07ede1c3bd5231fe15eae24032b2e
 
-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_4.6
 junit.jar=${junit.dir}/junit-4.6.jar
 junit.url=${maven2.base}/junit/junit/4.6/junit-4.6.jar

Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=910956&r1=910955&r2=910956&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Wed Feb 17 13:00:02 2010
@@ -36,7 +36,6 @@
     <target name="-check">
         <check-one-file src="${xalan.url}" dest="${xalan.orig.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="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
         <check-one-file src="${findbugs.url}" dest="${findbugs.zip}" />
@@ -113,10 +112,6 @@
         <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}"
                            md5="${junit.md5}" />

Added: harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/MANIFEST.MF?rev=910956&view=auto
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/MANIFEST.MF (added)
+++ harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/MANIFEST.MF Wed Feb 17
13:00:02 2010
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony Apache-XML-Security-J
+Bundle-SymbolicName: org.apache.harmony.xmlsec
+Bundle-Version: 1.4.3
+Bundle-ClassPath: xmlsec-1.4.3.jar, commons-logging.jar
+Eclipse-JREBundle: true
+Export-Package: javax.xml.crypto,
+  javax.xml.crypto.dom,
+  javax.xml.crypto.dsig,
+  javax.xml.crypto.dsig.dom,
+  javax.xml.crypto.dsig.keyinfo,
+  javax.xml.crypto.dsig.spec
+Import-Package: java.io,
+  java.lang,
+  java.lang.reflect,
+  java.math,
+  java.net,
+  java.security,
+  java.security.cert,
+  java.security.interfaces,
+  java.security.spec,
+  java.util,
+  java.util.logging,
+  javax.crypto,
+  javax.xml.parsers,
+  javax.xml.transform,
+  org.apache.xml.dtm,
+  org.apache.xml.utils,
+  org.apache.xpath,
+  org.apache.xpath.compiler,
+  org.w3c.dom,
+  org.w3c.dom.traversal,
+  org.xml.sax

Propchange: harmony/enhanced/classlib/branches/java6/modules/xmlsec/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/classlib/branches/java6/modules/xmlsec/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/xmlsec/build.xml?rev=910956&view=auto
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/xmlsec/build.xml (added)
+++ harmony/enhanced/classlib/branches/java6/modules/xmlsec/build.xml Wed Feb 17 13:00:02
2010
@@ -0,0 +1,66 @@
+<?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="XML-SEC Build" default="build" basedir=".">
+    <description>Build for xml security 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">
+        <check-one-file src="${xmlsec.url}" dest="${xmlsec.zip}" />
+    </target>
+        
+    <target name="fetch-depends">
+
+        <mkdir dir="${xmlsec.dir}" />
+        <download-one-file src="${xmlsec.url}" dest="${xmlsec.zip}"
+                           md5="${xmlsec.md5}" />
+
+    </target>
+
+    <target name="-copy-jars">
+        <mkdir dir="${hy.jdk}/jre/lib/boot/xmlsec-${xmlsec.version}" />
+        <unzip src="${xmlsec.zip}"
+               dest="${hy.jdk}/jre/lib/boot/${xmlsec.basename}" >
+            <patternset>
+                <include name="**/xmlsec-${xmlsec.version}.jar" />
+                <include name="**/commons-logging.jar" />
+            </patternset>
+            <mapper type="flatten" />
+        </unzip>
+
+        <copy todir="${hy.jdk}/jre/lib/boot/${xmlsec.basename}/META-INF">
+            <fileset dir="META-INF" />
+        </copy>
+    </target>
+
+    <target name="test" />
+
+    <target name="clean">
+        <delete dir="${hy.jdk}/jre/lib/boot/${xmlsec.basename}" />
+    </target>
+
+</project>

Propchange: harmony/enhanced/classlib/branches/java6/modules/xmlsec/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/depends.properties?rev=910956&view=auto
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/depends.properties (added)
+++ harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/depends.properties Wed Feb
17 13:00:02 2010
@@ -0,0 +1,23 @@
+# 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.
+
+depends.jars=${depends.dir}/jars
+xmlsec.version=1.4.3
+xmlsec.zipname=xml-security-bin-1_4_3.zip
+xmlsec.basename=xmlsec-${xmlsec.version}
+xmlsec.dir=${depends.jars}/${xmlsec.basename}
+xmlsec.zip=${xmlsec.dir}/${xmlsec.zipname}
+xmlsec.url=http://santuario.apache.org/dist/java-library/${xmlsec.zipname}
+xmlsec.md5=d7fa5a2233584c6e3d73b58f1dbb5cd0

Propchange: harmony/enhanced/classlib/branches/java6/modules/xmlsec/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message