[jboss-cvs] Repository SVN: r29447 - in apache-xerces: 2.9.1-patch-01-brew and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 6 13:49:24 EDT 2009
Author: permaine
Date: 2009-10-06 13:49:24 -0400 (Tue, 06 Oct 2009)
New Revision: 29447
Added:
apache-xerces/2.9.1-patch-01-brew/
apache-xerces/2.9.1-patch-01-brew/component-info.xml
apache-xerces/2.9.1-patch-01-brew/lib/
apache-xerces/2.9.1-patch-01-brew/lib/resolver.jar
apache-xerces/2.9.1-patch-01-brew/lib/xercesImpl.jar
apache-xerces/2.9.1-patch-01-brew/lib/xml-apis.jar
apache-xerces/2.9.1-patch-01-brew/src/
apache-xerces/2.9.1-patch-01-brew/src/Xerces-J-src.2.9.1.tar.bz2
apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-CVE-2009-2625.patch
apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-build.patch
apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-libgcj.patch
apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-version.sh
Log:
Add Brew build 2.9.1-patch-01-brew
Added: apache-xerces/2.9.1-patch-01-brew/component-info.xml
===================================================================
--- apache-xerces/2.9.1-patch-01-brew/component-info.xml (rev 0)
+++ apache-xerces/2.9.1-patch-01-brew/component-info.xml 2009-10-06 17:49:24 UTC (rev 29447)
@@ -0,0 +1,34 @@
+<project name="apache-xerces-component-info">
+
+ <!-- ============================================================ -->
+ <!-- Apache Xerces -->
+ <!-- ============================================================ -->
+
+ <component id="apache-xerces"
+ licenseType="apache-2.0"
+ version="2.9.1-brew"
+ projectHome="http://xml.apache.org/xerces2-j/index.html"
+ description="High performance, fully compliant XML parser"
+ scm=":ext:cvs.devel.redhat.com:/cvs/dist/xerces-j2"
+ tag="xerces-j2-2_9_1-2_2_patch_01_ep5_el4">
+ <artifact id="xml-apis.jar"/>
+ <artifact id="resolver.jar"/>
+ <artifact id="xercesImpl.jar"/>
+
+<!--
+ <import componentref="apache-xml-commons">
+ <compatible version="1.3.04-brew"/>
+ <compatible version="1.3.03-brew"/>
+ </import>
+-->
+
+ <export>
+ <include input="xercesImpl.jar"/>
+ <include input="resolver.jar"/>
+ <include input="xml-apis.jar"/>
+
+ </export>
+
+ </component>
+
+</project>
Added: apache-xerces/2.9.1-patch-01-brew/lib/resolver.jar
===================================================================
(Binary files differ)
Property changes on: apache-xerces/2.9.1-patch-01-brew/lib/resolver.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-xerces/2.9.1-patch-01-brew/lib/xercesImpl.jar
===================================================================
(Binary files differ)
Property changes on: apache-xerces/2.9.1-patch-01-brew/lib/xercesImpl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-xerces/2.9.1-patch-01-brew/lib/xml-apis.jar
===================================================================
(Binary files differ)
Property changes on: apache-xerces/2.9.1-patch-01-brew/lib/xml-apis.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-xerces/2.9.1-patch-01-brew/src/Xerces-J-src.2.9.1.tar.bz2
===================================================================
(Binary files differ)
Property changes on: apache-xerces/2.9.1-patch-01-brew/src/Xerces-J-src.2.9.1.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-CVE-2009-2625.patch
===================================================================
--- apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-CVE-2009-2625.patch (rev 0)
+++ apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-CVE-2009-2625.patch 2009-10-06 17:49:24 UTC (rev 29447)
@@ -0,0 +1,17 @@
+--- src/org/apache/xerces/impl/XMLScanner.java.orig 2009-09-30 10:40:17.000000000 -0400
++++ src/org/apache/xerces/impl/XMLScanner.java 2009-09-30 10:43:06.000000000 -0400
+@@ -1026,6 +1026,14 @@ public abstract class XMLScanner
+ if (XMLChar.isMarkup(c) || c == ']') {
+ fStringBuffer.append((char)fEntityScanner.scanChar());
+ }
++ else if (XMLChar.isHighSurrogate(c)) {
++ scanSurrogates(fStringBuffer);
++ }
++ else if (isInvalidLiteral(c)) {
++ reportFatalError("InvalidCharInSystemID",
++ new Object[] { Integer.toHexString(c) });
++ fEntityScanner.scanChar();
++ }
+ } while (fEntityScanner.scanLiteral(quote, ident) != quote);
+ fStringBuffer.append(ident);
+ ident = fStringBuffer;
Added: apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-build.patch
===================================================================
--- apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-build.patch (rev 0)
+++ apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-build.patch 2009-10-06 17:49:24 UTC (rev 29447)
@@ -0,0 +1,114 @@
+--- Xerces-J_2_9_1/build.xml.build 2007-08-20 15:16:53.000000000 -0400
++++ Xerces-J_2_9_1/build.xml 2009-01-07 14:11:56.313148122 -0500
+@@ -41,7 +41,7 @@
+ <!-- enable compilation under JDK 1.4 and above -->
+ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
+ <classpath>
+- <pathelement location="${tools.dir}/bin/xjavac.jar"/>
++ <pathelement location="./tools/bin/xjavac.jar"/>
+ </classpath>
+ </taskdef>
+
+@@ -88,7 +88,7 @@
+ <property name="packages" value="org.*"/>
+
+ <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
+- <property name="doc.generator.package" value="${tools.dir}/stylebook-1.0-b2.jar"/>
++ <property name="doc.generator.package" value="${tools.dir}/xml-stylebook.jar"/>
+
+ <property name="build.src" value="${build.dir}/src"/>
+ <property name="build.dest" value="${build.dir}/classes"/>
+@@ -101,7 +101,6 @@
+ <property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
+ <property name="disttools.dir" value="${build.dir}/tools"/>
+ <property name="distbin.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
+- <property name='src.apis.zip' value="${tools.dir}/xml-commons-external-src.zip"/>
+
+ <filter token="year" value="${year}"/>
+ <filter token="version" value="${parser.Version}"/>
+@@ -214,28 +213,6 @@
+ </fileset>
+ </copy>
+
+- <!-- now deal with API's: -->
+- <unzip src="${src.apis.zip}" dest="${build.src}">
+- <patternset
+- includes="org/xml/sax/**
+- javax/xml/**
+- javax/xml/datatype/**
+- javax/xml/namespace/**
+- javax/xml/parsers/**
+- javax/xml/transform/**
+- javax/xml/validation/**
+- javax/xml/xpath/**
+- org/w3c/dom/*
+- org/w3c/dom/bootstrap/**
+- org/w3c/dom/events/**
+- org/w3c/dom/html/**
+- org/w3c/dom/ls/**
+- org/w3c/dom/ranges/**
+- org/w3c/dom/traversal/**
+- org/w3c/dom/xpath/**"
+- />
+- </unzip>
+-
+ <!-- substitute tokens as needed -->
+ <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
+ token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
+@@ -333,7 +310,7 @@
+ </copy>
+ <xjavac srcdir="${build.tests}"
+ destdir="${build.dest}"
+- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
++ classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:${tools.dir}/junit.jar"
+ debug="${debug}"
+ includeAntRuntime="false"
+ includeJavaRuntime="true"/>
+@@ -378,7 +355,7 @@
+ <target name="docs" depends="prepare, prepare-docs">
+ <echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
+ <java fork="yes"
+- classpath="${java.class.path}:${doc.generator.package}:./tools/xalan.jar"
++ classpath="${java.class.path}:${doc.generator.package}:${tools.dir}/xalan.jar"
+ classname="${doc.generator}"
+ failOnError="yes">
+ <arg value="targetDirectory=${build.docs}"/>
+@@ -406,7 +383,7 @@
+ <!-- =================================================================== -->
+ <target name="javadocs" depends="prepare-src">
+
+- <condition property="additional.param" value=" -taglet org.apache.xerces.util.ExperimentalTaglet -taglet org.apache.xerces.util.InternalTaglet -tagletpath ${tools.dir}/bin/xerces2taglets.jar">
++ <condition property="additional.param" value=" -taglet org.apache.xerces.util.ExperimentalTaglet -taglet org.apache.xerces.util.InternalTaglet -tagletpath ./tools/bin/xerces2taglets.jar">
+ <available classname="com.sun.tools.doclets.Taglet"/>
+ </condition>
+
+@@ -1189,29 +1166,6 @@
+ <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
+ token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
+
+- <!-- now deal with API's: -->
+- <unzip src="${src.apis.zip}" dest="${build.src}">
+- <patternset
+- includes="org/xml/sax/**
+- javax/xml/**
+- javax/xml/datatype/**
+- javax/xml/namespace/**
+- javax/xml/parsers/**
+- javax/xml/transform/**
+- javax/xml/validation/**
+- javax/xml/xpath/**
+- org/w3c/dom/*
+- org/w3c/dom/bootstrap/**
+- org/w3c/dom/events/**
+- org/w3c/dom/html/**
+- org/w3c/dom/ls/**
+- org/w3c/dom/ranges/**
+- org/w3c/dom/traversal/**
+- org/w3c/dom/xpath/**"
+- />
+- </unzip>
+-
+-
+ <!-- substitute tokens as needed -->
+ <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
+ token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
Added: apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-libgcj.patch
===================================================================
--- apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-libgcj.patch (rev 0)
+++ apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-libgcj.patch 2009-10-06 17:49:24 UTC (rev 29447)
@@ -0,0 +1,17 @@
+Also apply the xjavac classpath hack when running under libgcj.
+
+ http://issues.apache.org/bugzilla/show_bug.cgi?id=34551
+ http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=152255
+
+--- tools/org/apache/xerces/util/XJavac.java.libgcj 2006-09-18 23:31:36.000000000 -0400
++++ tools/org/apache/xerces/util/XJavac.java 2009-01-07 14:13:34.574305922 -0500
+@@ -68,7 +68,8 @@
+ (vendor.indexOf("APPLE") >= 0) ||
+ (vendor.indexOf("HEWLETT-PACKARD") >= 0) ||
+ (vendor.indexOf("KAFFE") >= 0) ||
+- (vendor.indexOf("SABLE") >= 0)) {
++ (vendor.indexOf("SABLE") >= 0) ||
++ (vendor.indexOf("FREE SOFTWARE FOUNDATION") >= 0)) {
+ // we're on an SUN 1.4 or higher; fiddle with the bootclasspath.
+ // since we can't eviscerate XML-related info here,
+ // we must use the classpath
Added: apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-version.sh
===================================================================
--- apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-version.sh (rev 0)
+++ apache-xerces/2.9.1-patch-01-brew/src/xerces-j2-version.sh 2009-10-06 17:49:24 UTC (rev 29447)
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Xerces-J2 version script
+# JPackage Project (http://www.jpackage.org/)
+# $Id$
+
+# Source functions library
+. /usr/share/java-utils/java-functions
+
+# Configuration
+MAIN_CLASS=org.apache.xerces.impl.Version
+
+# Set parameters
+set_jvm
+export CLASSPATH=$(build-classpath xerces-j2)
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
More information about the jboss-cvs-commits
mailing list