diff options
| -rw-r--r-- | NOTICE | 5 | ||||
| -rw-r--r-- | ooo.lst | 4 | ||||
| -rw-r--r-- | saxon/saxon-9.0.0.7-bj.patch | 2 | ||||
| -rw-r--r-- | stax/download/README_jsr173_1.0_api.jar | 7 | ||||
| -rw-r--r-- | stax/download/README_stax-1.2.0.jar | 13 | ||||
| -rw-r--r-- | stax/makefile.mk | 10 | ||||
| -rw-r--r-- | stax/prj/d.lst | 2 |
7 files changed, 26 insertions, 17 deletions
@@ -84,6 +84,11 @@ a font family based on the Vera Fonts. More information 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 @@ -47,6 +47,7 @@ c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz 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.12.6-with-nspr-4.8.4.tar.gz 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 diff --git a/saxon/saxon-9.0.0.7-bj.patch b/saxon/saxon-9.0.0.7-bj.patch index 11d30914e985..157ed004c2ef 100644 --- a/saxon/saxon-9.0.0.7-bj.patch +++ b/saxon/saxon-9.0.0.7-bj.patch @@ -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> + diff --git a/stax/download/README_jsr173_1.0_api.jar b/stax/download/README_jsr173_1.0_api.jar deleted file mode 100644 index 9a566eb2aab3..000000000000 --- a/stax/download/README_jsr173_1.0_api.jar +++ /dev/null @@ -1,7 +0,0 @@ -The JSR173 is the XML pull API used at build time for the saxon9 XSLT -processor, it has become part of OpenJDK 6. -When using an older JDK, get the API from - http://stax.codehaus.org/ -and put it under stax/download. -_____ -1.2 Release(final) is available under the Apache License 2.0 diff --git a/stax/download/README_stax-1.2.0.jar b/stax/download/README_stax-1.2.0.jar new file mode 100644 index 000000000000..c2f4365afbac --- /dev/null +++ b/stax/download/README_stax-1.2.0.jar @@ -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 diff --git a/stax/makefile.mk b/stax/makefile.mk index af23b266c6fd..145e787cedba 100644 --- a/stax/makefile.mk +++ b/stax/makefile.mk @@ -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)!= "" diff --git a/stax/prj/d.lst b/stax/prj/d.lst index 7cfc3dd4af58..4345d5b8844c 100644 --- a/stax/prj/d.lst +++ b/stax/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\class\jsr*.jar %_DEST%\bin%_EXT% +..\%__SRC%\class\stax*.jar %_DEST%\bin%_EXT% |