You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/02/12 22:39:35 UTC
svn commit: r1243337 - in /incubator/ooo/trunk: ext_sources/ main/
main/saxon/ main/stax/ main/stax/download/ main/stax/prj/
Author: pfg
Date: Sun Feb 12 21:39:34 2012
New Revision: 1243337
URL: http://svn.apache.org/viewvc?rev=1243337&view=rev
Log:
Conditionally bring in the StaX API 1.2.0
This is only required for Java5 installations when
not using an external Saxon-B distribution, so it's
unlikely we will include it in a binary package.
Previous version had issues (see XMLBEANS-308)
and is not being shipped in othe Apache Projects.
The new version is under an Apache License 2.0.
Added:
incubator/ooo/trunk/ext_sources/980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip (with props)
incubator/ooo/trunk/main/stax/download/README_stax-1.2.0.jar
Removed:
incubator/ooo/trunk/ext_sources/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
incubator/ooo/trunk/ext_sources/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
incubator/ooo/trunk/ext_sources/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
incubator/ooo/trunk/main/stax/download/README_jsr173_1.0_api.jar
Modified:
incubator/ooo/trunk/main/NOTICE
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/saxon/saxon-9.0.0.7-bj.patch
incubator/ooo/trunk/main/stax/makefile.mk
incubator/ooo/trunk/main/stax/prj/d.lst
Added: incubator/ooo/trunk/ext_sources/980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip?rev=1243337&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ooo/trunk/ext_sources/980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip
------------------------------------------------------------------------------
svn:mime-type = application/zip
Modified: incubator/ooo/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE?rev=1243337&r1=1243336&r2=1243337&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE (original)
+++ incubator/ooo/trunk/main/NOTICE Sun Feb 12 21:39:34 2012
@@ -84,6 +84,11 @@ a font family based on the Vera Fonts. M
is available here:
http://dejavu-fonts.org/
+Older versions of Java may require the StAX API, which
+was included in OpenJDK 6. Information about the latest
+version under an Apache License 2.0 is available here:
+ http://stax.codehaus.org/
+
Category B Software
As part of its Third-Party Licensing Policy, Apache products
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1243337&r1=1243336&r2=1243337&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Sun Feb 12 21:39:34 2012
@@ -47,6 +47,7 @@ c735eab2d659a96e5a594c9e8541ad63-zlib-1.
3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz
+980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip
# Libraries with category B license
61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
@@ -58,9 +59,6 @@ b92261a5679276c400555004937af965-nss-3.1
ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
-fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
99d94103662a8d0b571e247a77432ac5-rhino1_7R3.zip
377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
Modified: incubator/ooo/trunk/main/saxon/saxon-9.0.0.7-bj.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/saxon/saxon-9.0.0.7-bj.patch?rev=1243337&r1=1243336&r2=1243337&view=diff
==============================================================================
--- incubator/ooo/trunk/main/saxon/saxon-9.0.0.7-bj.patch (original)
+++ incubator/ooo/trunk/main/saxon/saxon-9.0.0.7-bj.patch Sun Feb 12 21:39:34 2012
@@ -173,7 +173,7 @@
+ <property name="solar.bin" value="${solarbindir}"/>
+ <path id="classpath-j">
+ <fileset dir="${solar.bin}">
-+ <include name="jsr173_1.0_api.jar"/>
++ <include name="stax-1.2.0.jar"/>
+ </fileset>
+ </path>
+
Added: incubator/ooo/trunk/main/stax/download/README_stax-1.2.0.jar
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/stax/download/README_stax-1.2.0.jar?rev=1243337&view=auto
==============================================================================
--- incubator/ooo/trunk/main/stax/download/README_stax-1.2.0.jar (added)
+++ incubator/ooo/trunk/main/stax/download/README_stax-1.2.0.jar Sun Feb 12 21:39:34 2012
@@ -0,0 +1,13 @@
+The JSR173 is the XML pull API used at build time for the Saxon-B
+XSLT processor: it has become part of OpenJDK 6.
+
+When using an older JDK, you can get the API from
+ http://dist.codehaus.org/stax/jars/
+located at the StAX Home site
+ http://stax.codehaus.org/
+and put it under stax/download.
+
+1.2 Release(final) is available under the Apache License 2.0.
+
+Checksum (for reference):
+MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87
Modified: incubator/ooo/trunk/main/stax/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/stax/makefile.mk?rev=1243337&r1=1243336&r2=1243337&view=diff
==============================================================================
--- incubator/ooo/trunk/main/stax/makefile.mk (original)
+++ incubator/ooo/trunk/main/stax/makefile.mk Sun Feb 12 21:39:34 2012
@@ -45,19 +45,19 @@ all:
.IF "$(BUILD_STAX)" != "YES"
-$(OUT)$/class$/jsr173_1.0_api.jar : $(PRJ)$/download$/jsr173_1.0_api.jar
+$(OUT)$/class$/stax-1.2.0.jar : $(PRJ)$/download$/stax-1.2.0.jar
+$(COPY) $< $@
.ELSE # "$(BUILD_STAX)" != "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=stax-api-1.0-2-sources
-TARFILE_MD5=8294d6c42e3553229af9934c5c0ed997
+TARFILE_NAME=stax-src-1.2.0
+TARFILE_MD5=980143f96b3f6ce45d2e4947da21a5e9
TARFILE_ROOTDIR=src
-BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf jsr173_1.0_api.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class
+BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf stax-1.2.0.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class
-OUT2CLASS=jsr173_1.0_api.jar
+OUT2CLASS=stax-1.2.0.jar
.ENDIF # "$(BUILD_STAX)" != "YES"
.ELSE # $(SOLAR_JAVA)!= ""
Modified: incubator/ooo/trunk/main/stax/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/stax/prj/d.lst?rev=1243337&r1=1243336&r2=1243337&view=diff
==============================================================================
--- incubator/ooo/trunk/main/stax/prj/d.lst (original)
+++ incubator/ooo/trunk/main/stax/prj/d.lst Sun Feb 12 21:39:34 2012
@@ -1 +1 @@
-..\%__SRC%\class\jsr*.jar %_DEST%\bin%_EXT%
+..\%__SRC%\class\stax*.jar %_DEST%\bin%_EXT%