[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.ac filter/Jar_XSLTFilter.mk filter/Module_filter.mk filter/prj filter/source Makefile.top Module_tail_build.mk offapi/com offapi/UnoApi_offapi.mk ooo.lst.in postprocess/packcomponents readlicense_oo/html readlicense_oo/txt RepositoryExternal.mk RepositoryModule_ooo.mk saxon/build.xml saxon/ExternalProject_saxon.mk saxon/Makefile saxon/Module_saxon.mk saxon/Package_saxon.mk saxon/prj saxon/README saxon/UnpackedTarball_saxon.mk scp2/InstallModule_ooo.mk scp2/source stax/makefile.mk stax/prj stax/README tail_build/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 05:49:28 PDT 2012
Makefile.top | 2
Module_tail_build.mk | 1
RepositoryExternal.mk | 17
RepositoryModule_ooo.mk | 1
config_host.mk.in | 4
configure.ac | 134
filter/Jar_XSLTFilter.mk | 42
filter/Module_filter.mk | 1
filter/prj/build.lst | 2
filter/source/xsltdialog/typedetectionexport.cxx | 2
filter/source/xsltdialog/typedetectionimport.cxx | 2
filter/source/xsltdialog/xmlfiltercommon.hxx | 2
filter/source/xsltdialog/xmlfilterhelpids.hrc | 3
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 11
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 20
filter/source/xsltdialog/xmlfiltertabpagexslt.hrc | 5
filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 5
filter/source/xsltdialog/xmlfiltertabpagexslt.src | 23
filter/source/xsltfilter/LibXSLTTransformer.cxx | 4
filter/source/xsltfilter/LibXSLTTransformer.hxx | 18
filter/source/xsltfilter/Manifest | 2
filter/source/xsltfilter/XSLTFilter.cxx | 69
filter/source/xsltfilter/XSLTFilter.jar.component | 25
filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java | 1824 ----------
filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.java | 386 --
filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java | 496 --
filter/source/xsltfilter/xsltfilter.component | 2
offapi/UnoApi_offapi.mk | 9
offapi/com/sun/star/xml/xslt/XSLT2Transformer.idl | 30
offapi/com/sun/star/xml/xslt/XSLTTransformer.idl | 32
offapi/com/sun/star/xml/xslt/XXSLTTransformer.idl | 36
ooo.lst.in | 6
postprocess/packcomponents/makefile.mk | 1
readlicense_oo/html/LICENSE.html | 13
readlicense_oo/txt/NOTICE | 5
readlicense_oo/txt/license.txt | 14
saxon/ExternalProject_saxon.mk | 37
saxon/Makefile | 7
saxon/Module_saxon.mk | 22
saxon/Package_saxon.mk | 16
saxon/README | 1
saxon/UnpackedTarball_saxon.mk | 16
saxon/build.xml | 1015 -----
saxon/prj/build.lst | 2
scp2/InstallModule_ooo.mk | 3
scp2/source/ooo/common_brand.scp | 3
scp2/source/ooo/file_library_ooo.scp | 1
scp2/source/ooo/file_ooo.scp | 6
scp2/source/ooo/module_hidden_ooo.scp | 1
stax/README | 1
stax/makefile.mk | 78
stax/prj/build.lst | 2
stax/prj/d.lst | 1
tail_build/prj/build.lst | 2
54 files changed, 195 insertions(+), 4268 deletions(-)
New commits:
commit 725eba738eae4eee6cd9b833d375db5463833119
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 10 17:42:46 2012 +0200
remove all traces of saxon
Change-Id: I33ca2c27d557d24e3900d7ebf8f3ea2d99b3cfb0
diff --git a/Makefile.top b/Makefile.top
index 1d50dd2..aa1e25f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -142,7 +142,6 @@ sal\
salhelper\
sane\
sax\
-saxon\
sc\
scaddins\
sccomp\
@@ -245,7 +244,6 @@ postprocess\
python\
redland\
setup_native\
-stax\
stlport\
sysui\
xpdf\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 57a7dc8..ddd1802 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
salhelper \
sane \
sax \
- $(call gb_Helper_optional,SAXON,saxon) \
sc \
scaddins \
sccomp \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4260150..11440fe 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2268,23 +2268,6 @@ endef
endif # SYSTEM_HSQLDB
-ifeq ($(SYSTEM_SAXON),YES)
-
-define gb_Jar__use_saxon
-$(call gb_Jar_use_system_jar,$(1),$(SAXON_JAR))
-endef
-
-else # !SYSTEM_SAXON
-
-$(eval $(call gb_Helper_register_jars,OOO,\
- saxon9 \
-))
-
-define gb_Jar__use_saxon
-$(call gb_Jar_use_jar,$(1),saxon9)
-endef
-
-endif # SYSTEM_SAXON
ifeq ($(SYSTEM_BSH),YES)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 65a9fd9..616b3cf 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -143,7 +143,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
salhelper \
sane \
sax \
- $(call gb_Helper_optional,SAXON,saxon) \
sc \
scaddins \
sccomp \
diff --git a/config_host.mk.in b/config_host.mk.in
index 62c4ff7..5a23172 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -43,7 +43,6 @@ export BUILD_MOZAB=@BUILD_MOZAB@
export BUILD_NCPUS=@BUILD_NCPUS@
export BUILD_PLATFORM=@build@
export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
-export BUILD_STAX=@BUILD_STAX@
export BUILD_TYPE=@BUILD_TYPE@
export BUILD_UNOWINREG=@BUILD_UNOWINREG@
export BUILD_VER_STRING=@BUILD_VER_STRING@
@@ -525,8 +524,6 @@ export JFREEREPORT_LIBSERIALIZER_TARBALL=@JFREEREPORT_LIBSERIALIZER_TARBALL@
export JFREEREPORT_FLOW_ENGINE_TARBALL=@JFREEREPORT_FLOW_ENGINE_TARBALL@
export JFREEREPORT_LIBLAYOUT_TARBALL=@JFREEREPORT_LIBLAYOUT_TARBALL@
export SAL_ENABLE_FILE_LOCKING=1
-export SAXON_JAR=@SAXON_JAR@
-export SAXON_TARBALL=@SAXON_TARBALL@
export SCPDEFS=@SCPDEFS@
export SERVLETAPI_JAR=@SERVLETAPI_JAR@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
@@ -625,7 +622,6 @@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
export SYSTEM_PYTHON=@SYSTEM_PYTHON@
export SYSTEM_REDLAND=@SYSTEM_REDLAND@
export SYSTEM_RHINO=@SYSTEM_RHINO@
-export SYSTEM_SAXON=@SYSTEM_SAXON@
export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@
export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@
export SYSTEM_VIGRA=@SYSTEM_VIGRA@
diff --git a/configure.ac b/configure.ac
index 969e6b0..e67a817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1580,15 +1580,6 @@ AC_ARG_WITH(libbase-jar,
[Specify path to jarfile manually.]),
LIBBASE_JAR=$withval)
-AC_ARG_WITH(system-saxon,
- AS_HELP_STRING([--with-system-saxon],
- [Use saxon already on system.]))
-
-AC_ARG_WITH(saxon-jar,
- AS_HELP_STRING([--with-saxon-jar=JARFILE],
- [Specify path to jarfile manually.]),
- SAXON_JAR=$withval)
-
AC_ARG_WITH(system-odbc,
AS_HELP_STRING([--with-system-odbc],
[Use the odbc headers already on system.]),,
@@ -7840,131 +7831,6 @@ AC_SUBST(POSTGRESQL_INC)
AC_SUBST(POSTGRESQL_LIB)
AC_SUBST(POSTGRESQL_TARBALL)
-
-dnl ===================================================================
-dnl Check for system saxon
-dnl ===================================================================
-if test "$with_java" != "no"; then
-AC_MSG_CHECKING([which saxon to use])
-if test "$with_system_saxon" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_SAXON=YES
- if test -z $SAXON_JAR; then
- AC_CHECK_FILE(/usr/share/java/saxon9.jar,
- [ SAXON_JAR=/usr/share/java/saxon9.jar ],
- [
- AC_CHECK_FILE(/usr/share/java/saxon.jar,
- [ SAXON_JAR=/usr/share/java/saxon.jar ],
- [ AC_CHECK_FILE(/usr/share/java/saxon9.jar,
- [ SAXON_JAR=/usr/share/java/saxon9.jar ],
- [ AC_MSG_ERROR(saxon.jar replacement not found)]
- )
- ]
- )
- ]
- )
- else
- AC_CHECK_FILE($SAXON_JAR, [],
- [AC_MSG_ERROR(saxon.jar replacement not found.)], [])
- fi
-
- dnl Saxon comes in two practically available versions, the out-of-date saxonb which
- dnl supports the Java extensions that LibreOffice uses, and the up-to-date saxon he
- dnl "home edition" version, which is crippled to not support those Java extensions.
- dnl And as an aside the he one also needs to be tweaked to include
- dnl a META-INF/services to broadcast that it supports the jaxp transform factory
-
- AC_MSG_CHECKING([if saxon works])
- cat > saxontest.java <<_ACEOF
-[import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-
-import net.sf.saxon.FeatureKeys;
-
-class saxontest {
- public static void main(String[] args) {
- System.setProperty("javax.xml.transform.TransformerFactory",
- "net.sf.saxon.TransformerFactoryImpl");
- try {
- TransformerFactory tfactory = TransformerFactory.newInstance();
- // some external saxons (Debian, Ubuntu, ...) have this disabled
- // per default
- tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
- System.out.println("TransformerFactory is" +
- tfactory.getClass().getName());
- Transformer transformer = tfactory.newTransformer(
- new StreamSource(new File(args[0])));
- } catch(Exception e){
- e.printStackTrace(System.err);
- System.exit(-1);
- }
- System.exit(0);
- }
-}
-]
-_ACEOF
-
- cat > saxontest.xsl<<_ACEOF
-[<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
- <xsl:value-of select="math:sqrt(1)" xmlns:math="java:java.lang.Math"/>
- </xsl:template>
-</xsl:stylesheet>
-]
-_ACEOF
-
- javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
- AC_TRY_EVAL(javac_cmd)
- if test $? = 0 -a -f ./saxontest.class; then
- java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
- AC_TRY_EVAL(java_cmd)
- if test $? = 0; then
- AC_MSG_RESULT([yes])
- else
- cat saxontest.java >&5
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb])
- fi
- else
- AC_MSG_RESULT([no])
- cat saxontest.java >&5
- AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
- fi
-else
- AC_MSG_RESULT([internal])
- SYSTEM_SAXON=NO
- NEED_SAXON=TRUE
- SAXON_TARBALL=ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-fi
-fi
-AC_SUBST(SYSTEM_SAXON)
-AC_SUBST(SAXON_TARBALL)
-AC_SUBST(SAXON_JAR)
-
-if test -n "$NEED_SAXON"; then
- BUILD_TYPE="$BUILD_TYPE SAXON"
-fi
-
-# ===================================================================
-# Check whether to build stax
-# ===================================================================
-AC_MSG_CHECKING([whether building the stax is required])
-BUILD_STAX=NO
-if test -z "$SOLAR_JAVA"; then
- AC_MSG_RESULT([no (java disabled)])
-elif test "$SYSTEM_SAXON" = "YES"; then
- AC_MSG_RESULT([no (already provided by system saxon)])
-elif test -f "./stax/download/jsr173_1.0_api.jar"; then
- AC_MSG_RESULT([no (will use the prebuilt stax/download/jsr173_1.0_api.jar)])
-else
- BUILD_STAX=YES
- AC_MSG_RESULT([yes (no system saxon and no prebuilt copy)])
-fi
-AC_SUBST(BUILD_STAX)
-
dnl ===================================================================
dnl Check for system curl
dnl ===================================================================
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 9083dc7..2319f39 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,2 +1,2 @@
-fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
+fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas LIBXSLT:libxslt basegfx package PYTHON:python NULL
fl filter\prj nmake - all fl_prj NULL
diff --git a/ooo.lst.in b/ooo.lst.in
index 755daa9..b2fd401 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -6,21 +6,17 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
-8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
-a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
@@ -30,7 +26,6 @@ e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
-fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
@POSTGRESQL_TARBALL@
@@ -91,7 +86,6 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@ORCUS_TARBALL@
@PNG_TARBALL@
@RHINO_TARBALL@
- at SAXON_TARBALL@
@TOMCAT_TARBALL@
@VIGRA_TARBALL@
@VISIO_TARBALL@
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 7753ed9..6c87f39 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -2110,18 +2110,6 @@ FITNESS FOR A PARTICULAR PURPOSE.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
file declares SANE application interface. See the SANE standard for a
detailed explanation of the interface.</P>
-<H2 CLASS="western">Saxon (B)</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: Saxon (B). Use of
-any of this software is governed by the terms of the license below:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#10.Mozilla Public License Version 1.1|outline">Jump
-to MPL Version 1.1</A></P>
-<H2 CLASS="western">Stax</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: Stax API. Use of
-any of this software is governed by the terms of the license below:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#11.Apache License|outline">Jump
-to Apache License Version 2.0</A></P>
<H2 CLASS="western">STLPort</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
following software may be included in this product:STLport. Use of
@@ -9471,4 +9459,4 @@ this trademark restriction does not form part of the License.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Creative
Commons may be contacted at <A HREF="http://creativecommons.org/">http://creativecommons.org/</A>.</P>
</BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/readlicense_oo/txt/NOTICE b/readlicense_oo/txt/NOTICE
index 181aea7..8edf0f0 100644
--- a/readlicense_oo/txt/NOTICE
+++ b/readlicense_oo/txt/NOTICE
@@ -139,7 +139,6 @@ As part of the base system this product also includes code from the following
projects which are licensed under the Apache license:
- serf
- redland
-- StAX
The notices from these projects are following:
@@ -153,10 +152,6 @@ This product includes Redland software (http://librdf.org/)
developed at the Institute for Learning and Research Technology,
University of Bristol, UK (http://www.bristol.ac.uk/).
-
-StAX
-[no notices]
-
____
This product includes software developed by the OpenSSL Project
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index 8e06f1f..47ef7f2 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -2057,20 +2057,6 @@ SANE
This file declares SANE application interface. See the SANE standard
for a detailed explanation of the interface.
-Saxon (B)
-
- The following software may be included in this product: Saxon (B). Use
- of any of this software is governed by the terms of the license below:
-
- See MPL Version 1.1 below
-
-Stax
-
- The following software may be included in this product: Stax API. Use
- of any of this software is governed by the terms of the license below:
-
- See Apache License Version 2.0 below
-
STLPort
The following software may be included in this product:STLport. Use of
diff --git a/saxon/ExternalProject_saxon.mk b/saxon/ExternalProject_saxon.mk
deleted file mode 100644
index 8d31d58..0000000
--- a/saxon/ExternalProject_saxon.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,saxon))
-
-$(eval $(call gb_ExternalProject_use_unpacked,saxon,saxon))
-
-$(eval $(call gb_ExternalProject_register_targets,saxon,\
- build \
-))
-
-$(call gb_ExternalProject_get_state_target,saxon,build) :
- cd "$(call gb_UnpackedTarball_get_dir,saxon)" && \
- ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
- $(ICECREAM_RUN) "$(ANT)" \
- -q \
- -f build.xml \
- -Dbuild.label="build-libreoffice" \
- $(if $(filter YES,$(SYSTEM_TOMCAT))\
- ,-Dservletapi.jar=$(SERVLETAPI_JAR) \
- ,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \
- )\
- $(if $(filter yes,$(JAVACISGCJ))\
- ,-Dbuild.compiler=gcj \
- ) \
- -Dant.build.javac.target=$(JAVA_TARGET_VER) \
- $(if $(debug),-Dbuild.debug="on") \
- -Dsolarbindir=$(OUTDIR)/bin jar-bj && \
- touch $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/saxon/Makefile b/saxon/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/saxon/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/saxon/Module_saxon.mk b/saxon/Module_saxon.mk
deleted file mode 100644
index 0ac17fe..0000000
--- a/saxon/Module_saxon.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,saxon))
-
-ifneq ($(SOLAR_JAVA),)
-ifneq ($(filter SAXON,$(BUILD_TYPE)),)
-$(eval $(call gb_Module_add_targets,saxon,\
- ExternalProject_saxon \
- Package_saxon \
- UnpackedTarball_saxon \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/saxon/Package_saxon.mk b/saxon/Package_saxon.mk
deleted file mode 100644
index ba19d97..0000000
--- a/saxon/Package_saxon.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,saxon_inc,$(call gb_UnpackedTarball_get_dir,saxon)))
-
-$(eval $(call gb_Package_use_external_project,saxon_inc,saxon))
-
-$(eval $(call gb_Package_add_file,saxon_inc,bin/saxon9.jar,saxon-build/9.0.0.7/bj/saxon9.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/saxon/README b/saxon/README
deleted file mode 100644
index 26344a7..0000000
--- a/saxon/README
+++ /dev/null
@@ -1 +0,0 @@
-XSLT and XQuery Processor from [[http://saxon.sourceforge.net/]]
diff --git a/saxon/UnpackedTarball_saxon.mk b/saxon/UnpackedTarball_saxon.mk
deleted file mode 100644
index 206257b..0000000
--- a/saxon/UnpackedTarball_saxon.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,saxon))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,saxon,$(SAXON_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_file,saxon,build.xml,saxon/build.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/saxon/build.xml b/saxon/build.xml
deleted file mode 100644
index a6e7714..0000000
--- a/saxon/build.xml
+++ /dev/null
@@ -1,1015 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project basedir="." default="all" name="Saxon-B The XSLT and XQuery Processor"
- xmlns:dn="antlib:org.apache.ant.dotnet">
-
- <!-- TODO *really* Must publish NOTICES directory with patch releases. Should also
- publish doc directory, and add a notice concerning Saxon/MPL itself, as per section 3.6 of MPL 1.0 -->
-
- <!--TODO: 1: ensure saxon9api.netmodule is included in the build
- 2: remove the archive target before shipping this file-->
-
- <!-- note : Ant 1.7 is needed for this script -->
-
- <!-- Ant 1.7 introduces a <service> element to allow META-INF/services
- directories to be created in JAR files. Unfortunately it is broken,
- see http://issues.apache.org/bugzilla/show_bug.cgi?id=41201. The relevant
- code here is retained in the form of comments, and can be reinstated
- when the bug is fixed. Meanwhile the directories are created manually -->
-
- <!-- Build file for Saxon. This builds all four for the released products:
- Saxon-B and Saxon-SA, on both the Java and .NET platforms. It also builds
- the released resources file. A full build requires access to Saxonica
- proprietary source code. The open source Saxon-B product can be built for
- Java using target "bj"; but building Saxon-B for .NET may require some
- disentangling of tasks that depend on Saxon-SA being present. -->
-
- <!-- Useful targets:
-
- clean clears temporary directories
- bj builds executables for Saxon-B
- saj builds executables for Saxon-B and Saxon-SA
- n builds executables for Saxon on .NET
- build builds all executables
- resources builds samples and documentation
- release builds ZIP files for published downloads
- archive produces a back-up archive -->
-
-
- <!-- Naming conventions:
- -n : .NET
- -j : Java
- -b : Saxon-B
- -sa : Saxon-SA
- combined as appropriate, so -bj denotes Saxon-B on the Java platform
- -->
-
- <property name="version" value="9.0.0.7"/>
- <property name="versionh" value="9-0-0-7"/>
- <property name="release.date" value="2008-07-03"/>
-
- <!-- following locations are specific to the machine -->
-
- <!-- root drive for input files-->
- <property name="root" value="."/>
-
- <!-- root drive for generated files-->
- <property name="troot" value="."/>
-
- <!-- directory holding Java source code -->
- <property name="development-j.dir" value="${root}/MyJava/saxon8.x"/>
-
- <!-- directory holding Java source code as in Subversion -->
- <property name="subversion-j.dir" value="${root}"/>
-
- <!-- directory holding latest patch state of Saxon-SA Java code -->
- <property name="saj-patch.dir" value="${root}/saxon-90-patch"/>
-
- <!-- directory holding Java test drivers -->
- <property name="drivers-j.dir" value="${root}/MyJava/test"/>
-
- <!-- directories holding C# source code -->
- <property name="vss-n.dir" value="${root}/Documents and Settings/Mike/My Documents/Visual Studio 2005/Projects/Saxon.Api"/>
-
- <!-- directory holding C# source code as in Subversion -->
- <property name="subversion-n.dir" value="${root}/saxon-svn/latest9.0/bn/csource"/>
-
- <!-- directory holding XML user documentation -->
- <property name="userdoc.dir" value="${root}/MyJava/doc/saxon8"/>
-
- <!-- directory holding .NET API documentation (which is built manually using NDOC -->
- <property name="dotnetdoc.dir" value="${root}/MyDotNet/dotnetdoc"/>
-
- <!-- directories holding use cases and sample applications -->
- <property name="usercases.dir" value="${root}/MyJava/use-cases"/>
- <property name="samples.dir" value="${root}/MyJava/samples"/>
-
- <!-- directory in which to build the product for release -->
- <property name="product.dir" value="${troot}/saxon-build/${version}"/>
-
- <!-- directory in which to build the issued .ZIP files -->
- <property name="issue.dir" value="${troot}/saxon-issues/saxon-issue-${release.date} (${version})"/>
-
- <!-- location of the C# compiler -->
- <property name="csharp.compiler" value="c:/Windows/Microsoft.NET/Framework/v1.1.4322/csc.exe"/>
-
-
- <!-- following locations are for IKVMC code used to build the .NET product -->
-
- <property name="development-ikvm.dir" value="${root}/MyDotNet"/>
- <property name="ikvm.dir" value="${development-ikvm.dir}/ikvm-0.32.0.0"/>
- <property name="generated.stubs.dir" value="${development-ikvm.dir}/stubs"/>
- <property name="saxondotnet.snk" value="${development-ikvm.dir}/make/saxondotnet.snk"/>
-
- <!-- Precondition for .NET compilation: IKVM is installed.
- * Download from www.ikvm.net
- * Unzip into ${development-ikvm.dir}
- * Register in the GAC (access the Microsoft .NET Framework Configuration item in the
- Windows Control Panel, and add the assemblies to the Assembly Cache.
- At a minimum, install the IKVM.GNU.Classpath.dll and IKVM.Runtime.dll)
- * Generate stubs in ${generated.stubs.dir}
- for System.Xml.dll, System.Security.dll, and IKVM.GNU.Classpath.dll
- -->
-
- <!-- following locations are relative to the build file -->
-
- <property name="lib.dir" value="libs"/>
- <property name="temp.dir" value="temp"/>
- <property name="archive.dir" value="archive"/>
- <property name="services.dir" value="services"/>
- <property name="temp-src-j.dir" value="${temp.dir}/j/source"/>
- <property name="temp-src-nj.dir" value="${temp.dir}/n/jsource"/>
- <property name="temp-src-nc.dir" value="${temp.dir}/n/csource"/>
- <property name="classes-j.dir" value="${temp.dir}/j/classes"/>
- <property name="classes-n.dir" value="${temp.dir}/n/classes"/>
- <property name="jar-n.dir" value="${temp.dir}/n/jar"/>
- <property name="dll-n.dir" value="${temp.dir}/n/dll"/>
-
- <!-- following locations are relative to the destination directory -->
-
- <property name="build-bj.dir" value="${product.dir}/bj"/>
- <property name="build-saj.dir" value="${product.dir}/saj"/>
- <property name="build-bn.dir" value="${product.dir}/bn"/>
- <property name="build-san.dir" value="${product.dir}/san"/>
- <property name="build-resources.dir" value="${product.dir}/resources"/>
- <property name="javadoc.dir" value="${build-resources.dir}/doc/javadoc"/>
-
-
- <property name="build.debug" value="true"/>
- <property name="build.debuglevel" value="source,lines,vars"/>
- <property name="build.deprecation" value="true"/>
- <property name="build.optimize" value="true"/>
- <property name="build.compiler.source" value="1.5"/>
- <property name="build.compress" value="false"/>
-
- <!-- following properties can be switched to determine whether to build from patch source
- or from development source -->
-
- <!-- patch source -->
-
- <property name="source-bj.dir" value="${subversion-j.dir}"/>
- <property name="source-saj.dir" value="${saj-patch.dir}"/>
- <property name="source-api-n.dir" value="${subversion-n.dir}/api/Saxon.Api"/>
- <property name="source-cmd-n.dir" value="${subversion-n.dir}/cmd"/>
- <property name="source-samples-n.dir" value="${subversion-n.dir}/samples"/>
-
- <!-- development source -->
- <!--
- <property name="source-bj.dir" value="${development-j.dir}"/>
- <property name="source-saj.dir" value="${development-j.dir}"/>
- <property name="source-api-n.dir" value="${vss-n.dir}"/>
- <property name="source-cmd-n.dir" value="${vss-n.dir}"/>
- <property name="source-samples-n.dir" value="${vss-n.dir}"/>
- -->
-
- <property name="solar.bin" value="${solarbindir}"/>
- <path id="classpath-j">
- <fileset dir="${solar.bin}">
- <include name="jsr173_1.0_api.jar"/>
- </fileset>
- </path>
-
- <path id="classpath-n">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${ikvm.dir}">
- <include name="classpath/mscorlib.jar"/>
- <include name="classpath/System.jar"/>
- <include name="bin/IKVM.GNU.Classpath.jar"/>
- <include name="bin/IKVM.Runtime.jar"/>
- </fileset>
- <fileset dir="${generated.stubs.dir}">
- <include name="System.Xml.jar"/>
- <include name="System.Security.jar"/>
- </fileset>
- </path>
-
- <path id="classpath-samples">
- <fileset dir="${lib.dir}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${build-saj.dir}">
- <include name="*.jar"/>
- </fileset>
- <!-- Substitute build-bj.dir if there is no requirement to compile the sample applications
- that depend on Saxon-SA -->
- </path>
-
- <target name="clean" description="Clean all files other than source code and downloaded jars.">
- <delete dir="${temp.dir}"/>
- <delete dir="${product.dir}"/>
- <mkdir dir="${product.dir}"/>
- </target>
-
- <target name="download" description="Download third-party jar files.">
- <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"
- dest="${lib.dir}/dom4j-1.6.1.jar" verbose="true"/>
-
- <get src="http://www.ibiblio.org/maven/jdom/jars/jdom-1.0.jar"
- dest="${lib.dir}/jdom-1.0.jar" verbose="true"/>
-
- <get src="http://www.cafeconleche.org/XOM/xom-1.1.jar" dest="${lib.dir}/xom-1.1.jar"
- verbose="true"/>
-
- <get src="http://dist.codehaus.org/stax/jars/stax-api-1.0.1.jar" dest="${lib.dir}/stax-api-1.0.1.jar"
- verbose="true"/>
-
- <!-- TODO: add servlet.jar, ant.jar -->
-
- </target>
-
-
- <target name="copysource-development" description="Copy relevant source files from development directory">
- <copy todir="${temp-src-j.dir}">
- <fileset dir="${source-bj.dir}">
- <include name="net/sf/saxon/**/*.java"/>
- <exclude name="**/dotnet/**"/>
- <!--<exclude name="**/s9api/**"/> s9api needs Java 5 -->
- <include name="net/sf/saxon/**/package.html"/>
- </fileset>
- <!--
- <fileset dir="${source-saj.dir}">
- <include name="com/saxonica/**/*.java"/>
- <exclude name="com/saxonica/validate/DotNetVerifier.java"/>
- <include name="com/saxonica/**/package.html"/>
- </fileset>
- -->
- </copy>
- <!--
- <replace file="${temp-src-j.dir}/com/saxonica/validate/SchemaAwareConfiguration.java"
- token="/*DOTNETONLY*/"
- value="//"
- summary="yes"/>
- -->
- <replace file="${temp-src-j.dir}/net/sf/saxon/Configuration.java"
- token="/*DOTNETONLY*/"
- value="//"
- summary="yes"/>
- <copy todir="${temp-src-nj.dir}">
- <fileset dir="${source-bj.dir}">
- <include name="net/sf/saxon/**/*.java"/>
- <exclude name="**/ant/**"/>
- <exclude name="**/dom/**"/>
- <exclude name="**/dom4j/**"/>
- <exclude name="**/java/**"/>
- <exclude name="**/javax/**"/>
- <exclude name="**/jdom/**"/>
- <exclude name="**/pull/PullToStax.java"/>
- <exclude name="**/pull/StaxBridge.java"/>
- <!-- <exclude name="**/s9api/**"/> s9api needs Java 5 -->
- <exclude name="**/xom/**"/>
- <exclude name="**/xpath/**"/>
- <exclude name="**/xqj/**"/>
- </fileset>
- <!--
- <fileset dir="${source-saj.dir}">
- <include name="com/saxonica/extra/*.java"/>
- <include name="com/saxonica/fsa/*.java"/>
- <include name="com/saxonica/ptree/*.java"/>
- <include name="com/saxonica/schema/*.java"/>
- <include name="com/saxonica/sdoc/*.java"/>
- <include name="com/saxonica/validate/*.java"/>
- <include name="com/saxonica/Validate.java"/>
- </fileset>-->
- </copy>
- <!--
- <replace file="${temp-src-nj.dir}/com/saxonica/validate/SchemaAwareConfiguration.java"
- token="/*JAVAONLY*/"
- value="//"
- summary="yes"/>
- -->
- <replace file="${temp-src-nj.dir}/net/sf/saxon/Configuration.java"
- token="/*JAVAONLY*/"
- value="//"
- summary="yes"/>
- <!-- when building from development source
- <copy todir="${temp-src-nc.dir}/api">
- <fileset dir="${source-api-n.dir}">
- <include name="Saxon.Api/*.cs"/>
- </fileset>
- </copy>
-
- <copy todir="${temp-src-nc.dir}/cmd">
- <fileset dir="${source-cmd-n.dir}/Transform">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-cmd-n.dir}/Query">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-cmd-n.dir}/Validate">
- <include name="*.cs"/>
- </fileset>
- </copy>
- <copy todir="${temp-src-nc.dir}/samples">
- <fileset dir="${source-samples-n.dir}/XQueryExamples">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-samples-n.dir}/XPathExample">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-samples-n.dir}/XsltExamples">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-samples-n.dir}/SchemaExamples">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-samples-n.dir}/XsltTestSuiteDriver">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-samples-n.dir}/XQueryTestSuiteDriver">
- <include name="*.cs"/>
- </fileset>
- <fileset dir="${source-samples-n.dir}/SampleExtensions">
- <include name="*.cs"/>
- </fileset>
- </copy>
- -->
- <!-- when building from patch source
- <copy todir="${temp-src-nc.dir}/api/Saxon.Api">
- <fileset dir="${source-api-n.dir}">
- <include name="*.cs"/>
- </fileset>
- </copy>
- <copy todir="${temp-src-nc.dir}/cmd" >
- <fileset dir="${source-cmd-n.dir}">
- <include name="*.cs"/>
- </fileset>
- </copy>
- <copy todir="${temp-src-nc.dir}/samples">
- <fileset dir="${source-samples-n.dir}">
- <include name="*.cs"/>
- </fileset>
- </copy>
- -->
- <!-- -->
-
- </target>
-
- <target name="create-meta-inf" description="Create contents of META-INF/services files">
-
- <!-- given the Ant 1.7.0 bug, create the services files here for copying into the JARS -->
- <mkdir dir="${services.dir}/saxon9/META-INF/services"/>
- <echo file="${services.dir}/saxon9/META-INF/services/javax.xml.transform.TransformerFactory"
- message="net.sf.saxon.TransformerFactoryImpl"/>
- <mkdir dir="${services.dir}/saxon9-xpath/META-INF/services"/>
- <echo file="${services.dir}/saxon9-xpath/META-INF/services/javax.xml.xpath.XPathFactory"
->net.sf.saxon.xpath.XPathFactoryImpl
-http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl
-http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl
-http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl
-http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl
-http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl
-</echo>
- <mkdir dir="${services.dir}/saxon9sa/META-INF/services"/>
- <echo file="${services.dir}/saxon9sa/META-INF/services/javax.xml.transform.TransformerFactory"
- message="com.saxonica.SchemaAwareTransformerFactory"/>
- <mkdir dir="${services.dir}/saxon9sa-jaxp/META-INF/services"/>
- <echo file="${services.dir}/saxon9sa-jaxp/META-INF/services/javax.xml.validation.SchemaFactory"
->com.saxonica.jaxp.SchemaFactoryImpl
-http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl
-</echo>
-
-
- </target>
-
- <target name="compile-bj" description="Compile Saxon-B classes for Java." depends="copysource-development">
- <mkdir dir="${classes-j.dir}"/>
- <javac encoding="ISO-8859-1" debug="${build.debug}" debuglevel="${build.debuglevel}"
- deprecation="${build.deprecation}" destdir="${classes-j.dir}"
- optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}">
-
- <include name="net/**"/>
- <exclude name="**/dom/**"/>
- <exclude name="**/dom4j/**"/>
- <exclude name="**/javax/**"/>
- <exclude name="**/jdom/**"/>
- <exclude name="**/sql/**"/>
- <exclude name="**/xom/**"/>
- <exclude name="**/xpath/**"/>
- <exclude name="**/xqj/**"/>
- <exclude name="**/dotnet/**"/>
- <exclude name="**/s9api/**"/>
-
- <exclude name="**/ant/**"/>
- <exclude name="**/dotnet/**"/>
- <exclude name="**/s9api/**"/>
- <classpath>
- <path refid="classpath-j"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile-saj" description="Compile Saxon-SA classes for Java." depends="copysource-development">
- <mkdir dir="${classes-j.dir}"/>
- <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
- deprecation="${build.deprecation}" destdir="${classes-j.dir}"
- optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}">
-
- <include name="com/saxonica/**"/>
- <include name="net/sf/saxon/ant/**"/>
- <exclude name="com/saxonica/validate/DotNetVerifier.java"/>
- <classpath>
- <path refid="classpath-j"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile-s9api" description="Compile s9api classes for Java."
- depends="compile-bj, compile-saj, copysource-development">
- <!-- Compiling the s9api package requires JDK 1.5 -->
- <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
- deprecation="${build.deprecation}" destdir="${classes-j.dir}"
- optimize="${build.optimize}" srcdir="${temp-src-j.dir}" source="${build.compiler.source}">
-
- <include name="**/s9api/**"/>
- <classpath>
- <path refid="classpath-j"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile-bn" description="Compile Saxon-B classes for .NET" depends="copysource-development">
- <mkdir dir="${classes-n.dir}"/>
- <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
- deprecation="${build.deprecation}" destdir="${classes-n.dir}"
- optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}">
-
- <include name="net/**"/>
- <exclude name="**/s9api/**"/>
- <classpath>
- <path refid="classpath-n"/>
- </classpath>
- </javac>
- </target>
-
- <target name="compile-san" description="Compile Saxon-SA classes for .NET" depends="copysource-development">
- <mkdir dir="${classes-n.dir}"/>
- <javac debug="${build.debug}" debuglevel="${build.debuglevel}"
- deprecation="${build.deprecation}" destdir="${classes-n.dir}"
- optimize="${build.optimize}" srcdir="${temp-src-nj.dir}" source="${build.compiler.source}">
-
- <include name="com/saxonica/**"/>
- <exclude name="com/saxonica/validate/JavaVerifier.java"/>
- <classpath>
- <path refid="classpath-n"/>
- </classpath>
- </javac>
- </target>
-
- <target name="jar-bj" description="Create Saxon-B jar files for Java" depends="create-meta-inf, compile-bj">
- <mkdir dir="${product.dir}/bj"/>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9.jar">
- <include name="net/**/*.class"/>
- <exclude name="**/ant/**/*.class"/>
- <exclude name="**/dom/**/*.class"/>
- <exclude name="**/dom4j/**/*.class"/>
- <exclude name="**/javax/**/*.class"/>
- <exclude name="**/jdom/**/*.class"/>
- <exclude name="**/sql/**/*.class"/>
- <exclude name="**/xom/**/*.class"/>
- <exclude name="**/xpath/**/*.class"/>
- <exclude name="**/xqj/**/*.class"/>
- <exclude name="**/s9api/**/*.class"/>
- <include name="META-INF/**"/>
- <manifest>
- <attribute name="Project-Name" value="Saxon-B"/>
- <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
- </manifest>
- <metainf dir="${services.dir}/saxon9/META-INF"/>
- <!--
- <service type="javax.xml.transform.TransformerFactory"
- provider="net.sf.saxon.TransformerFactoryImpl"/>
- -->
- </jar>
- <!--
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-dom.jar">
- <include name="net/sf/saxon/dom/*.class"/>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-dom4j.jar">
- <include name="net/sf/saxon/dom4j/*.class"/>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-jdom.jar">
- <include name="net/sf/saxon/jdom/*.class"/>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-s9api.jar">
- <include name="net/sf/saxon/s9api/*.class"/>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-sql.jar">
- <include name="net/sf/saxon/sql/*.class"/>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xom.jar">
- <include name="net/sf/saxon/xom/*.class"/>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xpath.jar">
- <include name="net/sf/saxon/xpath/*.class"/>
- <metainf dir="${services.dir}/saxon9-xpath/META-INF"/>
- <!==
- <service type="javax.xml.xpath.XPathFactory">
- <provider classname="net.sf.saxon.xpath.XPathFactoryImpl"/>
- <provider classname="http\://java.sun.com/jaxp/xpath/dom: net.sf.saxon.xpath.XPathFactoryImpl"/>
- <provider classname="http\://saxon.sf.net/jaxp/xpath/om: net.sf.saxon.xpath.XPathFactoryImpl"/>
- <provider classname="http\://www.xom.nu/jaxp/xpath/xom: net.sf.saxon.xpath.XPathFactoryImpl"/>
- <provider classname="http\://jdom.org/jaxp/xpath/jdom: net.sf.saxon.xpath.XPathFactoryImpl"/>
- <provider classname="http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl"/>
- </service> ==>
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xqj.jar">
- <include name="net/sf/saxon/xqj/*.class"/>
- <include name="net/sf/saxon/javax/xml/namespace/*.class"/>
- <include name="net/sf/saxon/javax/xml/xquery/*.class"/>
- </jar>
- -->
- </target>
-
- <target name="jar-saj" description="Create Saxon-SA jar files for Java" depends="compile-s9api, jar-bj">
- <mkdir dir="${product.dir}/saj"/>
- <copy todir="${product.dir}/saj">
- <fileset dir="${product.dir}/bj">
- <include name="*.jar"/>
- </fileset>
- </copy>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa.jar">
- <include name="net/**/*.class"/>
- <exclude name="**/dom/**/*.class"/>
- <exclude name="**/dom4j/**/*.class"/>
- <exclude name="**/javax/**/*.class"/>
- <exclude name="**/jdom/**/*.class"/>
- <exclude name="**/s9api/**/*.class"/>
- <exclude name="**/sql/**/*.class"/>
- <exclude name="**/xom/**/*.class"/>
- <exclude name="**/xpath/**/*.class"/>
- <exclude name="**/xqj/**/*.class"/>
- <include name="com/saxonica/**/*.class"/>
- <exclude name="com/saxonica/jaxp/*.class"/>
- <exclude name="com.saxonica.CompileQuery.class"/>
- <manifest>
- <attribute name="Project-Name" value="Saxon-SA"/>
- </manifest>
- <metainf dir="${services.dir}/saxon9sa/META-INF"/>
- <!--
- <service type="javax.xml.transform.TransformerFactory"
- provider="com.saxonica.SchemaAwareTransformerFactory"/>
- -->
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa-jaxp.jar">
- <include name="com/saxonica/jaxp/*.class"/>
- <include name="net/sf/saxon/dom/TypeInfoImpl.class"/>
- <metainf dir="${services.dir}/saxon9sa-jaxp/META-INF"/>
- <!--
- <service type="javax.xml.validation.SchemaFactory">
- <provider classname="com.saxonica.jaxp.SchemaFactoryImpl"/>
- <provider classname="http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl"/>
- </service>
- -->
- </jar>
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa-qc.jar">
- <include name="com/saxonica/codegen/*.class"/>
- <include name="com.saxonica.CompileQuery.class"/>
- </jar>
- <!-- The Saxon-Ant task is delivered with Saxon-B but it won't compile without Saxon-SA present,
- unless modified -->
- <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-ant.jar">
- <include name="net/sf/saxon/ant/*.class"/>
- </jar>
- </target>
-
- <target name="jar-bn" description="Create Saxon-B jar files for .NET" depends="compile-bn">
- <mkdir dir="${jar-n.dir}"/>
- <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9.jar">
- <include name="net/**/*.class"/>
- </jar>
- </target>
-
- <target name="jar-san" description="Create Saxon-SA jar files for .NET" depends="compile-san">
- <mkdir dir="${jar-n.dir}"/>
- <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9sa.jar">
- <include name="com/saxonica/**/*.class"/>
- </jar>
- </target>
-
- <target name="dll-n" description="Create DLLs for .NET" depends="jar-bn, jar-san">
- <mkdir dir="${dll-n.dir}"/>
- <copy todir="${dll-n.dir}">
- <fileset dir="${ikvm.dir}/bin">
- <include name="IKVM.GNU.Classpath.dll"/>
- <include name="IKVM.Runtime.dll"/>
- </fileset>
- </copy>
- <copy file="${saxondotnet.snk}" todir="${basedir}"/>
- <!--
- Invoke IKVMC to cross-compile the JAR files into DLLs
- -->
- <exec dir="." executable="ikvmc.cmd" >
- <arg line="live"/> <!-- set to 'debug' for testing, 'live' for final build -->
- <arg line="${basedir}/${jar-n.dir}"/>
- <arg line="${basedir}/${dll-n.dir}"/>
- <arg line="${version}"/>
- </exec>
- </target>
-
- <target name="csharp-n" description="Compile C# source for .NET commands and API library"
- depends="dll-n">
-
- <mkdir dir="${dll-n.dir}/samples"/>
- <mkdir dir="${dll-n.dir}/tests"/>
-
- <exec dir="." executable="csharp-compile.cmd" >
- <arg line="${basedir}/${temp-src-nc.dir}"/>
- <arg line="${basedir}/${dll-n.dir}"/>
- <arg line="${version}"/>
- </exec>
-
-
-<!-- <taskdef
- uri="antlib:org.apache.ant.dotnet">
- <classpath>
- <pathelement location="c:/javalib/ant-dotnet-1.0/ant-dotnet-1.0.jar"/>
- </classpath>
- </taskdef>
- <dn:csc xmlns:dn="antlib:org.apache.ant.dotnet"
- executable="${csharp.compiler}"
- srcdir="${temp-src-nc.dir}/cmd"
- targettype="exe"
- win32icon="c:\MyDotNet\icons\gyfu.ico"
- destdir="${dll-n.dir}">
- <reference file="${dll-n.dir}/IKVM.GNU.Classpath.dll"/>
- <reference file="${dll-n.dir}/IKVM.Runtime.dll"/>
- <reference file="${dll-n.dir}/saxon9.dll"/>
- <reference file="${dll-n.dir}/saxon9sa.dll"/>
- </dn:csc>
- <dn:csc xmlns:dn="antlib:org.apache.ant.dotnet"
- executable="${csharp.compiler}"
- srcdir="${temp-src-nc.dir}/api"
- targettype="module"
- win32icon="c:\MyDotNet\icons\gyfu.ico"
- destdir="${dll-n.dir}">
- <reference file="${dll-n.dir}/IKVM.GNU.Classpath.dll"/>
- <reference file="${dll-n.dir}/IKVM.Runtime.dll"/>
- <reference file="${dll-n.dir}/saxon9.dll"/>
- <reference file="${dll-n.dir}/saxon9sa.dll"/>
- </dn:csc>
--->
- </target>
-
- <target name="basic-userdoc" description="Generate Basic Documentation for release with executable">
- <mkdir dir="${product.dir}/bj"/>
- <copy todir="${product.dir}/bj">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <mkdir dir="${product.dir}/saj"/>
- <copy todir="${product.dir}/saj">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <mkdir dir="${product.dir}/bn"/>
- <copy todir="${product.dir}/bn">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <mkdir dir="${product.dir}/san"/>
- <copy todir="${product.dir}/san">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="product-bn" description="Assemble product.directory for Saxon-B on .NET"
- depends="csharp-n, dll-n, basic-userdoc">
- <mkdir dir="${build-bn.dir}/bin"/>
- <copy todir="${build-bn.dir}/bin">
- <fileset dir="${dll-n.dir}">
- <include name="IKVM.GNU.Classpath.dll"/>
- <include name="IKVM.Runtime.dll"/>
- <include name="saxon9.dll"/>
- <include name="saxon9api.dll"/>
- <include name="saxon9api.netmodule"/>
- <include name="Query.exe"/>
- <include name="Transform.exe"/>
- </fileset>
- </copy>
- <echo file="${build-bn.dir}/bin/install-gac.cmd">
- set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin"
- %NET%\gacutil /if IKVM.Runtime.dll
- %NET%\gacutil /if IKVM.GNU.Classpath.dll
- %NET%\gacutil /if saxon9.dll
- %NET%\gacutil /if saxon9api.dll
- </echo>
- </target>
-
- <target name="product-san" description="Assemble product.directory for Saxon-SA on .NET"
- depends="csharp-n, dll-n, basic-userdoc">
- <copy todir="${build-san.dir}/bin">
- <fileset dir="${dll-n.dir}">
- <include name="IKVM.GNU.Classpath.dll"/>
- <include name="IKVM.Runtime.dll"/>
- <include name="saxon9.dll"/>
- <include name="saxon9sa.dll"/>
- <include name="saxon9api.dll"/>
- <include name="saxon9api.netmodule"/>
- <include name="Query.exe"/>
- <include name="Transform.exe"/>
- <include name="Validate.exe"/>
- </fileset>
- </copy>
- <echo file="${build-san.dir}/bin/install-gac.cmd">
- set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin"
- %NET%\gacutil /if IKVM.Runtime.dll
- %NET%\gacutil /if IKVM.GNU.Classpath.dll
- %NET%\gacutil /if saxon9.dll
- %NET%\gacutil /if saxon9sa.dll
- %NET%\gacutil /if saxon9api.dll
- </echo>
- </target>
-
- <target name="samples" description="Assemble Cross-Platform Samples and Use-Cases">
- <mkdir dir="${build-resources.dir}/samples"/>
- <copy todir="${product.dir}/resources/use-cases">
- <fileset dir="${usercases.dir}"/>
- </copy>
- <copy todir="${product.dir}/resources/samples">
- <fileset dir="${samples.dir}">
- <include name="analysis/timing-profile.xsl"/>
- <include name="data/*.xml"/>
- <include name="data/*.xsd"/>
- <include name="data/*.dtd"/>
- <include name="query/*.xq"/>
- <include name="styles/*.xsl"/>
- <include name="trax/xml/**/*.xml"/>
- <include name="trax/xsl/**/*.xsl"/>
- <include name="trax/xsl/**/preamble.txt"/>
- </fileset>
- </copy>
- </target>
-
- <target name="samples-j" description="Copy and Compile Java Samples"
- depends="jar-saj">
- <mkdir dir="${product.dir}/resources/samples/java"/>
- <mkdir dir="${product.dir}/resources/samples/java/classes"/>
- <copy todir="${product.dir}/resources/samples/java">
- <fileset dir="${samples.dir}/java">
- <include name="ApplyXPathJAXP.java"/>
- <include name="ExampleContentHandler.java"/>
- <include name="JDOMExample.java"/>
- <include name="PullExamples.java"/>
- <include name="QueryAPIExamples.java"/>
- <include name="QuickValidator.java"/>
- <include name="SaxonServlet.java"/>
- <include name="SaxonSAServlet.java"/>
- <include name="SchemaValidatorExample.java"/>
- <include name="SchemaValidatorHandlerExample.java"/>
- <include name="TraxExamples.java"/>
- <include name="XMarkBenchmark.java"/>
- <include name="XPathExample.java"/>
- <include name="XPathExampleDOM.java"/>
- <include name="XPathExampleSA.java"/>
- <include name="XPathExampleServlet.java"/>
- <include name="XQJExamples.java"/>
- </fileset>
- </copy>
- <javac debug="true" debuglevel="source, lines"
- destdir="${product.dir}/resources/samples/java/classes"
- srcdir="${product.dir}/resources/samples/java"
- source="${build.compiler.source}">
- <include name="*.java"/>
- <classpath>
- <path refid="classpath-samples"/>
- </classpath>
- </javac>
- </target>
-
- <target name="testdrivers-j" description="Copy Java Test Drivers">
- <mkdir dir="${product.dir}/resources/drivers/java/test"/>
- <copy todir="${product.dir}/resources/drivers/java/test">
- <fileset dir="${drivers-j.dir}">
- <include name="XQueryTestSuiteDriver.java"/>
- <include name="XsltTestSuiteDriver.java"/>
- <include name="CanonicalXML.java"/>
- <include name="XQTSModuleURIResolver.java"/>
- <include name="XQTSCollectionURIResolver.java"/>
- <include name="SchemaTestSuiteDriver.java"/>
- </fileset>
- </copy>
- </target>
-
- <target name="samples-n" description="Assemble release samples for .NET"
- depends="csharp-n">
- <mkdir dir="${build-resources.dir}/samples/cs"/>
- <copy todir="${build-resources.dir}/samples/cs">
- <fileset dir="${temp-src-nc.dir}/samples">
- <include name="*.cs"/>
- </fileset>
- </copy>
- <mkdir dir="${build-resources.dir}/samples/cs/bin"/>
- <copy todir="${build-resources.dir}/samples/cs/bin">
- <fileset dir="${dll-n.dir}/samples">
- <include name="*.exe"/>
- <include name="*.dll"/>
- <include name="*.pdb"/>
- </fileset>
- </copy>
- <copy todir="${build-resources.dir}/samples/cs/bin">
- <fileset dir="${dll-n.dir}/tests">
- <include name="*.exe"/>
- <include name="*.dll"/>
- <include name="*.pdb"/>
- </fileset>
- </copy>
- </target>
-
- <target name="product-javadoc" description="Generate Javadoc.">
- <javadoc bottom="Copyright (C) Michael H. Kay. All rights reserved."
- destdir="${javadoc.dir}" doctitle="saxon9 Javadocs"
- noindex="true" notree="true" access="public"
- maxmemory="512M" source="1.5">
- <packageset dir="${temp-src-j.dir}">
- <include name="net/**"/>
- <include name="com/**"/>
- <exclude name="**/dotnet/**"/>
- <exclude name="**/DotNetVerifier.java"/>
- </packageset>
- <classpath>
- <path refid="classpath-j"/>
- </classpath>
-
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- <link href="http://www.xom.nu/apidocs/"/>
-
- </javadoc>
- <copy file="${userdoc.dir}/fixed/javadoc/stylesheet.css"
- tofile="${javadoc.dir}/stylesheet.css"
- overwrite="true"/>
- </target>
-
- <target name="product-dotnetdoc" description="Copy .NET API documentation">
- <mkdir dir="${build-resources.dir}/doc/dotnetdoc"/>
- <copy todir="${build-resources.dir}/doc/dotnetdoc">
- <fileset dir="${dotnetdoc.dir}"/>
- </copy>
- </target>
-
-
- <target name="release-userdoc" description="Generate User Documentation">
- <taskdef name="saxon-xslt"
- classname="net.sf.saxon.ant.AntTransform"
- classpath="c:\saxon-build\9.0.0.1\saj\saxon9sa.jar;c:\saxon-licenses"/>
- <copy todir="${build-resources.dir}/doc">
- <fileset dir="${userdoc.dir}/fixed"/>
- </copy>
- <copy todir="${product.dir}/bj">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <copy todir="${product.dir}/saj">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <copy todir="${product.dir}/bn">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <copy todir="${product.dir}/san">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="doc/**"/>
- <include name="notices/**"/>
- </fileset>
- </copy>
- <saxon-xslt in="${userdoc.dir}/catalog.xml"
- style="${userdoc.dir}/render-page2.xsl"
- schemaAware="true"
- xmlVersion="1.0"
- schemaValidation="strict"
- out="${product.dir}/resources/doc/dummy.html"><!--validation="strict" -->
- <param name="destination" expression="offline"/>
- </saxon-xslt>
- <zip zipfile="${build-resources.dir}/source-userdoc.zip">
- <fileset dir="${userdoc.dir}">
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.xsd"/>
- <include name="**/*.css"/>
- <include name="fixed/**"/>
- <include name="welcome/**"/>
- </fileset>
- </zip>
- </target>
-
- <target name="release-source" description="Generate Zip file containing issued Source Code">
- <mkdir dir="${build-resources.dir}"/>
- <zip zipfile="${build-resources.dir}/source.zip">
- <fileset dir="${source-bj.dir}">
- <include name="net/**/*.java"/>
- <include name="net/**/package.html"/>
- </fileset>
- <fileset dir="${source-bj.dir}">
- <include name="net/sf/saxon/dotnet/*.java"/>
- <include name="net/sf/saxon/dotnet/package.html"/>
- </fileset>
- <fileset dir="${temp-src-nc.dir}">
- <include name="api/**/*.cs"/>
- <include name="cmd/**/*.cs"/>
- </fileset>
- </zip>
- <zip zipfile="${build-resources.dir}/sa-source.zip">
- <fileset dir="${source-saj.dir}">
- <include name="com/saxonica/**/*.java"/>
- <include name="com/saxonica/**/package.html"/>
- </fileset>
- </zip>
- </target>
-
- <target name="resources" description="Generate contents of released resources file"
- depends="release-userdoc, product-javadoc, product-dotnetdoc,
- samples, samples-j, testdrivers-j, samples-n, release-source">
- <mkdir dir="${product.dir}/resources/build"/>
- <copy todir="${product.dir}/resources/build">
- <fileset dir="${basedir}">
- <include name="build.xml"/>
- <include name="ikvmc.cmd"/>
- <include name="csharp-compile.cmd"/>
- </fileset>
- </copy>
- <copy todir="${product.dir}/resources">
- <fileset dir="${userdoc.dir}/welcome">
- <include name="notices/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="bj" depends="compile-bj, jar-bj, basic-userdoc"
- description="Generate Saxon-B for the Java platform"/>
-
- <target name="saj" depends="bj, jar-saj, basic-userdoc"
- description="Generate Saxon-SA for the Java platform"/>
-
- <target name="n" depends="product-bn, product-san"
- description="Generate Saxon for the .NET platform"/>
-
- <target name="build" description="Complete Saxon product build"
- depends="bj, saj, n"/> <!-- add resources -->
-
- <target name="release" description="Create .ZIP files for release" depends="build"
- > <!--depends="build, resources"-->
- <mkdir dir="${issue.dir}"/>
- <zip zipfile="${issue.dir}/saxonb${versionh}j.zip">
- <fileset dir="${product.dir}/bj"/>
- </zip>
- <zip zipfile="${issue.dir}/saxonb${versionh}n.zip">
- <fileset dir="${product.dir}/bn"/>
- </zip>
- <zip zipfile="${issue.dir}/saxonsa${versionh}j.zip">
- <fileset dir="${product.dir}/saj"/>
- </zip>
- <zip zipfile="${issue.dir}/saxonsa${versionh}n.zip">
- <fileset dir="${product.dir}/san"/>
- </zip>
- <!--
- <zip zipfile="${issue.dir}/saxon-resources${versionh}.zip">
- <fileset dir="${product.dir}/resources"/>
- </zip>
- -->
- </target>
-
- <target name="archive" description="Archive everything needed for backup">
- <mkdir dir="${archive.dir}"/>
- <copy todir="${archive.dir}">
- <fileset dir="${issue.dir}"/>
- <fileset dir="${development-j.dir}" includes="sa-source.zip"/>
- <fileset dir="${build-resources.dir}" includes="source.zip"/>
- </copy>
- <zip zipfile="${archive.dir}/saxontests.zip">
- <fileset dir="e:/tests">
- <include name="testsuite/*.*"/>
- <include name="java/**/*.java"/>
- <include name="xqts-current/SaxonDriver/**"/>
- <include name="xqts-extra/**"/>
- <include name="xslts_1_0_4/**/SaxonDriver/**"/>
- </fileset>
- <fileset dir="e:/tests/java" includes ="**/*.java"/>
- </zip>
- <zip zipfile="${archive.dir}/licensetool.zip">
- <fileset dir="c:/MyJava/licensetool"/>
- </zip>
- <zip zipfile="${archive.dir}/licenses.zip">
- <fileset dir="c:/saxon-licenses"/>
- </zip>
- </target>
-
-
-
-</project>
diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst
deleted file mode 100644
index a69eba0..0000000
--- a/saxon/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-xx saxon : solenv stax NULL
-xx saxon\prj nmake - all xx_saxon NULL
diff --git a/saxon/prj/d.lst b/saxon/prj/d.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/stax/README b/stax/README
deleted file mode 100644
index 13e69fb..0000000
--- a/stax/README
+++ /dev/null
@@ -1 +0,0 @@
-Library implementing the Streaming API for XML. (CH: Which one, probably the one by Sun???)
diff --git a/stax/makefile.mk b/stax/makefile.mk
deleted file mode 100644
index ff3238b..0000000
--- a/stax/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=stax
-TARGET=stax
-USE_JAVAVER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : antsettings.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
-all:
- @echo "Your java version already contains StAX"
-.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100060000"
-.IF "$(SYSTEM_SAXON)" == "YES"
-all:
- @echo "An already available installation of saxon should exist on your system."
- @echo "Therefore the files provided here does not need to be built in addition."
-.ENDIF
-
-.IF "$(BUILD_STAX)" != "YES"
-
-$(OUT)$/class$/jsr173_1.0_api.jar : $(PRJ)$/download$/jsr173_1.0_api.jar
- +$(COPY) $< $@
-
-.ELSE # "$(BUILD_STAX)" != "YES"
-
-# --- Files --------------------------------------------------------
-TARFILE_NAME=stax-api-1.0-2-sources
-TARFILE_MD5=8294d6c42e3553229af9934c5c0ed997
-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
-
-OUT2CLASS=jsr173_1.0_api.jar
-.ENDIF # "$(BUILD_STAX)" != "YES"
-
-.ELSE # $(SOLAR_JAVA)!= ""
-nojava:
- @echo "Not building $(PRJNAME) because Java is disabled"
-.ENDIF # $(SOLAR_JAVA)!= ""
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/stax/prj/build.lst b/stax/prj/build.lst
deleted file mode 100644
index cbfc6ea..0000000
--- a/stax/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-tx stax : solenv NULL
-tx stax nmake - all tx_stax NULL
diff --git a/stax/prj/d.lst b/stax/prj/d.lst
deleted file mode 100644
index a4fd204..0000000
--- a/stax/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\class\jsr*.jar %_DEST%\bin
diff --git a/stax/prj/dmake b/stax/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 11e4e0b..fd92f64 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
+tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
commit bfc71eb03e2bc6f26d53f70b32f9a8937086808b
Author: David Tardon <dtardon at redhat.com>
Date: Wed Oct 10 17:33:30 2012 +0200
drop saxon-based XSLT transformer
Change-Id: I2cd4e0965452c376df8c5e43353fbdd6f62fb27d
diff --git a/filter/Extension_xslt2_transformer.mk b/filter/Extension_xslt2_transformer.mk
deleted file mode 100644
index ab239d8..0000000
--- a/filter/Extension_xslt2_transformer.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Extension_Extension,xslt2-transformer,filter/source/xsltfilter))
-
-$(eval $(call gb_Extension_add_files,xslt2-transformer,,\
- $(call gb_Jar_get_outdir_target,saxon9) \
- $(call gb_Jar_get_outdir_target,XSLTFilter) \
- $(SRCDIR)/filter/source/xsltfilter/components.rdb \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk
deleted file mode 100644
index 84faeac..0000000
--- a/filter/Jar_XSLTFilter.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-$(eval $(call gb_Jar_Jar,XSLTFilter))
-
-$(eval $(call gb_Jar_use_jars,XSLTFilter,\
- ridl \
- unoil \
- jurt \
- juh \
-))
-
-$(eval $(call gb_Jar_use_externals,XSLTFilter,saxon))
-
-$(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTFilter.jar,OOO))
-
-$(eval $(call gb_Jar_set_manifest,XSLTFilter,$(SRCDIR)/filter/source/xsltfilter/Manifest))
-
-$(eval $(call gb_Jar_set_packageroot,XSLTFilter,com))
-
-$(eval $(call gb_Jar_add_sourcefiles,XSLTFilter,\
- filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64 \
- filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter \
- filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 603cec9..463af63 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -74,8 +74,6 @@ endif
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,filter,\
- Extension_xslt2_transformer \
- Jar_XSLTFilter \
Jar_XSLTValidate \
))
endif
diff --git a/filter/source/xsltfilter/Manifest b/filter/source/xsltfilter/Manifest
deleted file mode 100644
index 1bd3102..0000000
--- a/filter/source/xsltfilter/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-RegistrationClassName: com.sun.star.comp.xsltfilter.XSLTransformer
-UNO-Type-Path:
diff --git a/filter/source/xsltfilter/XSLTFilter.jar.component b/filter/source/xsltfilter/XSLTFilter.jar.component
deleted file mode 100644
index 35d104a..0000000
--- a/filter/source/xsltfilter/XSLTFilter.jar.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- -->
-
-<component loader="com.sun.star.loader.Java2"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="XSLTransformer">
- <service name="com.sun.star.comp.JAXTHelper"/>
- </implementation>
-</component>
diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
deleted file mode 100644
index 0d0f331..0000000
--- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
+++ /dev/null
@@ -1,1824 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-
-package com.sun.star.comp.xsltfilter;
-
-/**
- * <p>Encodes and decodes to and from Base64 notation.</p>
- * <p>Homepage: <a href="http://iharder.net/base64">http://iharder.net/base64</a>.</p>
- *
- * <p>The <tt>options</tt> parameter, which appears in a few places, is used to pass
- * several pieces of information to the encoder. In the "higher level" methods such as
- * encodeBytes( bytes, options ) the options parameter can be used to indicate such
- * things as first gzipping the bytes before encoding them, not inserting linefeeds
- * (though that breaks strict Base64 compatibility), and encoding using the URL-safe
- * and Ordered dialects.</p>
- *
- * <p>The constants defined in Base64 can be OR-ed together to combine options, so you
- * might make a call like this:</p>
- *
- * <code>String encoded = Base64.encodeBytes( mybytes, Base64.GZIP | Base64.DONT_BREAK_LINES );</code>
- *
- * <p>to compress the data before encoding it and then making the output have no newline characters.</p>
- *
- *
- * <p>
- * Change Log:
- * </p>
- * <ul>
- * <li>v2.2.2 - Fixed encodeFileToFile and decodeFileToFile to use the
- * Base64.InputStream class to encode and decode on the fly which uses
- * less memory than encoding/decoding an entire file into memory before writing.</li>
- * <li>v2.2.1 - Fixed bug using URL_SAFE and ORDERED encodings. Fixed bug
- * when using very small files (~< 40 bytes).</li>
- * <li>v2.2 - Added some helper methods for encoding/decoding directly from
- * one file to the next. Also added a main() method to support command line
- * encoding/decoding from one file to the next. Also added these Base64 dialects:
- * <ol>
- * <li>The default is RFC3548 format.</li>
- * <li>Calling Base64.setFormat(Base64.BASE64_FORMAT.URLSAFE_FORMAT) generates
- * URL and file name friendly format as described in Section 4 of RFC3548.
- * http://www.faqs.org/rfcs/rfc3548.html</li>
- * <li>Calling Base64.setFormat(Base64.BASE64_FORMAT.ORDERED_FORMAT) generates
- * URL and file name friendly format that preserves lexical ordering as described
- * in http://www.faqs.org/qa/rfcc-1940.html</li>
- * </ol>
- * Special thanks to Jim Kellerman at <a href="http://www.powerset.com/">http://www.powerset.com/</a>
- * for contributing the new Base64 dialects.
- * </li>
- *
- * <li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
- * some convenience methods for reading and writing to and from files.</li>
- * <li>v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
- * with other encodings (like EBCDIC).</li>
- * <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
- * encoded data was a single byte.</li>
- * <li>v2.0 - I got rid of methods that used booleans to set options.
- * Now everything is more consolidated and cleaner. The code now detects
- * when data that's being decoded is gzip-compressed and will decompress it
- * automatically. Generally things are cleaner. You'll probably have to
- * change some method calls that you were making to support the new
- * options format (<tt>int</tt>s that you "OR" together).</li>
- * <li>v1.5.1 - Fixed bug when decompressing and decoding to a
- * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
- * Added the ability to "suspend" encoding in the Output Stream so
- * you can turn on and off the encoding if you need to embed base64
- * data in an otherwise "normal" stream (like an XML file).</li>
- * <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
- * This helps when using GZIP streams.
- * Added the ability to GZip-compress objects before encoding them.</li>
- * <li>v1.4 - Added helper methods to read/write files.</li>
- * <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
- * <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
- * where last buffer being read, if not completely full, was not returned.</li>
- * <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
- * <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
- * </ul>
- *
- * <p>
- * I am placing this code in the Public Domain. Do with it as you will.
- * This software comes with no guarantees or warranties but with
- * plenty of well-wishing instead!
- * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
- * periodically to check for updates or to contribute improvements.
- * </p>
- *
- * @version 2.2.2
- */
-public class Base64
-{
-
-/* ******** P U B L I C F I E L D S ******** */
-
-
- /** No options specified. Value is zero. */
- public final static int NO_OPTIONS = 0;
-
- /** Specify encoding. */
- public final static int ENCODE = 1;
-
-
- /** Specify decoding. */
- public final static int DECODE = 0;
-
-
- /** Specify that data should be gzip-compressed. */
- public final static int GZIP = 2;
-
-
- /** Don't break lines when encoding (violates strict Base64 specification) */
- public final static int DONT_BREAK_LINES = 8;
-
- /**
- * Encode using Base64-like encoding that is URL- and Filename-safe as described
- * in Section 4 of RFC3548:
- * <a href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
- * It is important to note that data encoded this way is <em>not</em> officially valid Base64,
- * or at the very least should not be called Base64 without also specifying that is
- * was encoded using the URL- and Filename-safe dialect.
- */
- public final static int URL_SAFE = 16;
-
-
- /**
- * Encode using the special "ordered" dialect of Base64 described here:
- * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
- */
- public final static int ORDERED = 32;
-
-
-/* ******** P R I V A T E F I E L D S ******** */
-
-
- /** Maximum line length (76) of Base64 output. */
- private final static int MAX_LINE_LENGTH = 76;
-
-
- /** The equals sign (=) as a byte. */
- private final static byte EQUALS_SIGN = (byte)'=';
-
-
- /** The new line character (\n) as a byte. */
- private final static byte NEW_LINE = (byte)'\n';
-
-
- /** Preferred encoding. */
- private final static String PREFERRED_ENCODING = "UTF-8";
-
-
- // I think I end up not using the BAD_ENCODING indicator.
- //private final static byte BAD_ENCODING = -9; // Indicates error in encoding
- private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
- private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
-
-
-/* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */
-
- /** The 64 valid Base64 values. */
- //private final static byte[] ALPHABET;
- /* Host platform me be something funny like EBCDIC, so we hardcode these values. */
- private final static byte[] _STANDARD_ALPHABET =
- {
- (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
- (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
- (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
- (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
- (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
- (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
- (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
- (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
- (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
- (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
- };
-
-
- /**
- * Translates a Base64 value to either its 6-bit reconstruction value
- * or a negative number indicating some other meaning.
- **/
- private final static byte[] _STANDARD_DECODABET =
- {
- -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8
- -5,-5, // Whitespace: Tab and Linefeed
- -9,-9, // Decimal 11 - 12
- -5, // Whitespace: Carriage Return
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 14 - 26
- -9,-9,-9,-9,-9, // Decimal 27 - 31
- -5, // Whitespace: Space
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 33 - 42
- 62, // Plus sign at decimal 43
- -9,-9,-9, // Decimal 44 - 46
- 63, // Slash at decimal 47
- 52,53,54,55,56,57,58,59,60,61, // Numbers zero through nine
- -9,-9,-9, // Decimal 58 - 60
- -1, // Equals sign at decimal 61
- -9,-9,-9, // Decimal 62 - 64
- 0,1,2,3,4,5,6,7,8,9,10,11,12,13, // Letters 'A' through 'N'
- 14,15,16,17,18,19,20,21,22,23,24,25, // Letters 'O' through 'Z'
- -9,-9,-9,-9,-9,-9, // Decimal 91 - 96
- 26,27,28,29,30,31,32,33,34,35,36,37,38, // Letters 'a' through 'm'
- 39,40,41,42,43,44,45,46,47,48,49,50,51, // Letters 'n' through 'z'
- -9,-9,-9,-9 // Decimal 123 - 126
- /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */
- };
-
-
-/* ******** U R L S A F E B A S E 6 4 A L P H A B E T ******** */
-
- /**
- * Used in the URL- and Filename-safe dialect described in Section 4 of RFC3548:
- * <a href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
- * Notice that the last two bytes become "hyphen" and "underscore" instead of "plus" and "slash."
- */
- private final static byte[] _URL_SAFE_ALPHABET =
- {
- (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
- (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
- (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
- (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
- (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
- (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
- (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
- (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
- (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
- (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'-', (byte)'_'
- };
-
- /**
- * Used in decoding URL- and Filename-safe dialects of Base64.
- */
- private final static byte[] _URL_SAFE_DECODABET =
- {
- -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8
- -5,-5, // Whitespace: Tab and Linefeed
- -9,-9, // Decimal 11 - 12
- -5, // Whitespace: Carriage Return
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 14 - 26
- -9,-9,-9,-9,-9, // Decimal 27 - 31
- -5, // Whitespace: Space
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 33 - 42
- -9, // Plus sign at decimal 43
- -9, // Decimal 44
- 62, // Minus sign at decimal 45
- -9, // Decimal 46
- -9, // Slash at decimal 47
- 52,53,54,55,56,57,58,59,60,61, // Numbers zero through nine
- -9,-9,-9, // Decimal 58 - 60
- -1, // Equals sign at decimal 61
- -9,-9,-9, // Decimal 62 - 64
- 0,1,2,3,4,5,6,7,8,9,10,11,12,13, // Letters 'A' through 'N'
- 14,15,16,17,18,19,20,21,22,23,24,25, // Letters 'O' through 'Z'
- -9,-9,-9,-9, // Decimal 91 - 94
- 63, // Underscore at decimal 95
- -9, // Decimal 96
- 26,27,28,29,30,31,32,33,34,35,36,37,38, // Letters 'a' through 'm'
- 39,40,41,42,43,44,45,46,47,48,49,50,51, // Letters 'n' through 'z'
- -9,-9,-9,-9 // Decimal 123 - 126
- /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */
- };
-
-
-
-/* ******** O R D E R E D B A S E 6 4 A L P H A B E T ******** */
-
- /**
- * I don't get the point of this technique, but it is described here:
- * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
- */
- private final static byte[] _ORDERED_ALPHABET =
- {
- (byte)'-',
- (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4',
- (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9',
- (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
- (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
- (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
- (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
- (byte)'_',
- (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
- (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
- (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
- (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z'
- };
-
- /**
- * Used in decoding the "ordered" dialect of Base64.
- */
- private final static byte[] _ORDERED_DECODABET =
- {
- -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8
- -5,-5, // Whitespace: Tab and Linefeed
- -9,-9, // Decimal 11 - 12
- -5, // Whitespace: Carriage Return
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 14 - 26
- -9,-9,-9,-9,-9, // Decimal 27 - 31
- -5, // Whitespace: Space
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 33 - 42
- -9, // Plus sign at decimal 43
- -9, // Decimal 44
- 0, // Minus sign at decimal 45
- -9, // Decimal 46
- -9, // Slash at decimal 47
- 1,2,3,4,5,6,7,8,9,10, // Numbers zero through nine
- -9,-9,-9, // Decimal 58 - 60
- -1, // Equals sign at decimal 61
- -9,-9,-9, // Decimal 62 - 64
- 11,12,13,14,15,16,17,18,19,20,21,22,23, // Letters 'A' through 'M'
- 24,25,26,27,28,29,30,31,32,33,34,35,36, // Letters 'N' through 'Z'
- -9,-9,-9,-9, // Decimal 91 - 94
- 37, // Underscore at decimal 95
- -9, // Decimal 96
- 38,39,40,41,42,43,44,45,46,47,48,49,50, // Letters 'a' through 'm'
- 51,52,53,54,55,56,57,58,59,60,61,62,63, // Letters 'n' through 'z'
- -9,-9,-9,-9 // Decimal 123 - 126
- /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */
- };
-
-
-/* ******** D E T E R M I N E W H I C H A L H A B E T ******** */
-
-
- /**
- * Returns one of the _SOMETHING_ALPHABET byte arrays depending on
- * the options specified.
- * It's possible, though silly, to specify ORDERED and URLSAFE
- * in which case one of them will be picked, though there is
- * no guarantee as to which one will be picked.
- */
- private final static byte[] getAlphabet( int options )
- {
- if( (options & URL_SAFE) == URL_SAFE ) return _URL_SAFE_ALPHABET;
- else if( (options & ORDERED) == ORDERED ) return _ORDERED_ALPHABET;
- else return _STANDARD_ALPHABET;
-
- } // end getAlphabet
-
-
- /**
- * Returns one of the _SOMETHING_DECODABET byte arrays depending on
- * the options specified.
- * It's possible, though silly, to specify ORDERED and URL_SAFE
- * in which case one of them will be picked, though there is
- * no guarantee as to which one will be picked.
- */
- private final static byte[] getDecodabet( int options )
- {
- if( (options & URL_SAFE) == URL_SAFE ) return _URL_SAFE_DECODABET;
- else if( (options & ORDERED) == ORDERED ) return _ORDERED_DECODABET;
- else return _STANDARD_DECODABET;
-
- } // end getAlphabet
-
-
-
- /** Defeats instantiation. */
- private Base64(){}
-
-
- /**
- * Encodes or decodes two files from the command line;
- * <strong>feel free to delete this method (in fact you probably should)
- * if you're embedding this code into a larger program.</strong>
- */
- public final static void main( String[] args )
- {
- if( args.length < 3 ){
- usage("Not enough arguments.");
- } // end if: args.length < 3
- else {
- String flag = args[0];
- String infile = args[1];
- String outfile = args[2];
- if( flag.equals( "-e" ) ){
- Base64.encodeFileToFile( infile, outfile );
- } // end if: encode
- else if( flag.equals( "-d" ) ) {
- Base64.decodeFileToFile( infile, outfile );
- } // end else if: decode
- else {
- usage( "Unknown flag: " + flag );
- } // end else
- } // end else
- } // end main
-
- /**
- * Prints command line usage.
- *
- * @param msg A message to include with usage info.
- */
- private final static void usage( String msg )
- {
- System.err.println( msg );
- System.err.println( "Usage: java Base64 -e|-d inputfile outputfile" );
- } // end usage
-
-
-/* ******** E N C O D I N G M E T H O D S ******** */
-
-
- /**
- * Encodes up to the first three bytes of array <var>threeBytes</var>
- * and returns a four-byte array in Base64 notation.
- * The actual number of significant bytes in your array is
- * given by <var>numSigBytes</var>.
- * The array <var>threeBytes</var> needs only be as big as
- * <var>numSigBytes</var>.
- * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
- *
- * @param b4 A reusable byte array to reduce array instantiation
- * @param threeBytes the array to convert
- * @param numSigBytes the number of significant bytes in your array
- * @return four byte array in Base64 notation.
- * @since 1.5.1
- */
- private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes, int options )
- {
- encode3to4( threeBytes, 0, numSigBytes, b4, 0, options );
- return b4;
- } // end encode3to4
-
-
- /**
- * <p>Encodes up to three bytes of the array <var>source</var>
- * and writes the resulting four Base64 bytes to <var>destination</var>.
- * The source and destination arrays can be manipulated
- * anywhere along their length by specifying
- * <var>srcOffset</var> and <var>destOffset</var>.
- * This method does not check to make sure your arrays
- * are large enough to accomodate <var>srcOffset</var> + 3 for
- * the <var>source</var> array or <var>destOffset</var> + 4 for
- * the <var>destination</var> array.
- * The actual number of significant bytes in your array is
- * given by <var>numSigBytes</var>.</p>
- * <p>This is the lowest level of the encoding methods with
- * all possible parameters.</p>
- *
- * @param source the array to convert
- * @param srcOffset the index where conversion begins
- * @param numSigBytes the number of significant bytes in your array
- * @param destination the array to hold the conversion
- * @param destOffset the index where output will be put
- * @return the <var>destination</var> array
- * @since 1.3
- */
- private static byte[] encode3to4(
- byte[] source, int srcOffset, int numSigBytes,
- byte[] destination, int destOffset, int options )
- {
- byte[] ALPHABET = getAlphabet( options );
-
- // 1 2 3
- // 01234567890123456789012345678901 Bit position
- // --------000000001111111122222222 Array position from threeBytes
- // --------| || || || | Six bit groups to index ALPHABET
- // >>18 >>12 >> 6 >> 0 Right shift necessary
- // 0x3f 0x3f 0x3f Additional AND
-
- // Create buffer with zero-padding if there are only one or two
- // significant bytes passed in the array.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list