|
 |
b1beb92 |
From db698b1878a38c732e73bf0e5ab06368b1a5f29a Mon Sep 17 00:00:00 2001
|
|
|
b1beb92 |
From: David Tardon <dtardon@redhat.com>
|
|
|
b1beb92 |
Date: Wed, 19 Sep 2012 12:54:24 +0200
|
|
|
b1beb92 |
Subject: [PATCH 1/4] convert java XSL transformer into extension
|
|
|
b1beb92 |
|
|
|
b1beb92 |
Change-Id: Ided6c480969764073056830722c8996e0df52285
|
|
|
b1beb92 |
(cherry picked from commit 25113cd050d931b0e195fda6d6da9864a575070e)
|
|
|
b1beb92 |
---
|
|
|
b1beb92 |
filter/Extension_xslt2_transformer.mk | 18 +++++++++++++++++
|
|
|
b1beb92 |
filter/Module_filter.mk | 1 +
|
|
|
b1beb92 |
filter/source/xsltfilter/components.rdb | 8 ++++++++
|
|
|
b1beb92 |
filter/source/xsltfilter/description-en-US.txt | 1 +
|
|
|
b1beb92 |
filter/source/xsltfilter/description.xml | 28 ++++++++++++++++++++++++++
|
|
|
b1beb92 |
filter/source/xsltfilter/manifest.xml | 6 ++++++
|
|
|
b1beb92 |
postprocess/packcomponents/makefile.mk | 1 -
|
|
|
b1beb92 |
scp2/InstallModule_ooo.mk | 3 ---
|
|
|
b1beb92 |
scp2/source/ooo/common_brand.scp | 3 ---
|
|
|
b1beb92 |
scp2/source/ooo/file_library_ooo.scp | 1 -
|
|
|
b1beb92 |
scp2/source/ooo/file_ooo.scp | 6 ------
|
|
|
b1beb92 |
scp2/source/ooo/module_hidden_ooo.scp | 1 -
|
|
|
b1beb92 |
12 files changed, 62 insertions(+), 15 deletions(-)
|
|
|
b1beb92 |
create mode 100644 filter/Extension_xslt2_transformer.mk
|
|
|
b1beb92 |
create mode 100644 filter/source/xsltfilter/components.rdb
|
|
|
b1beb92 |
create mode 100644 filter/source/xsltfilter/description-en-US.txt
|
|
|
b1beb92 |
create mode 100644 filter/source/xsltfilter/description.xml
|
|
|
b1beb92 |
create mode 100644 filter/source/xsltfilter/manifest.xml
|
|
|
b1beb92 |
|
|
|
b1beb92 |
diff --git a/filter/Extension_xslt2_transformer.mk b/filter/Extension_xslt2_transformer.mk
|
|
|
b1beb92 |
new file mode 100644
|
|
|
b1beb92 |
index 0000000..ab239d8
|
|
|
b1beb92 |
--- /dev/null
|
|
|
b1beb92 |
+++ b/filter/Extension_xslt2_transformer.mk
|
|
|
b1beb92 |
@@ -0,0 +1,18 @@
|
|
|
b1beb92 |
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
|
b1beb92 |
+#
|
|
|
b1beb92 |
+# This file is part of the LibreOffice project.
|
|
|
b1beb92 |
+#
|
|
|
b1beb92 |
+# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
b1beb92 |
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
b1beb92 |
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
b1beb92 |
+#
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+$(eval $(call gb_Extension_Extension,xslt2-transformer,filter/source/xsltfilter))
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+$(eval $(call gb_Extension_add_files,xslt2-transformer,,\
|
|
|
b1beb92 |
+ $(call gb_Jar_get_outdir_target,saxon9) \
|
|
|
b1beb92 |
+ $(call gb_Jar_get_outdir_target,XSLTFilter) \
|
|
|
b1beb92 |
+ $(SRCDIR)/filter/source/xsltfilter/components.rdb \
|
|
|
b1beb92 |
+))
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+# vim: set noet sw=4 ts=4:
|
|
|
b1beb92 |
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
|
|
|
b1beb92 |
index 922d4f5..9c18157 100644
|
|
|
b1beb92 |
--- a/filter/Module_filter.mk
|
|
|
b1beb92 |
+++ b/filter/Module_filter.mk
|
|
|
b1beb92 |
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_targets,filter,\
|
|
|
b1beb92 |
|
|
|
b1beb92 |
ifneq ($(SOLAR_JAVA),)
|
|
|
b1beb92 |
$(eval $(call gb_Module_add_targets,filter,\
|
|
|
b1beb92 |
+ Extension_xslt2_transformer \
|
|
|
b1beb92 |
Jar_XSLTFilter \
|
|
|
b1beb92 |
Jar_XSLTValidate \
|
|
|
b1beb92 |
))
|
|
|
b1beb92 |
diff --git a/filter/source/xsltfilter/components.rdb b/filter/source/xsltfilter/components.rdb
|
|
|
b1beb92 |
new file mode 100644
|
|
|
b1beb92 |
index 0000000..080cb7a
|
|
|
b1beb92 |
--- /dev/null
|
|
|
b1beb92 |
+++ b/filter/source/xsltfilter/components.rdb
|
|
|
b1beb92 |
@@ -0,0 +1,8 @@
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+<components xmlns="http://openoffice.org/2010/uno-components">
|
|
|
b1beb92 |
+ <component loader="com.sun.star.loader.Java2" uri="./XSLTFilter.jar">
|
|
|
b1beb92 |
+ <implementation name="XSLTransformer">
|
|
|
b1beb92 |
+ <service name="com.sun.star.comp.JAXTHelper"/>
|
|
|
b1beb92 |
+ </implementation>
|
|
|
b1beb92 |
+ </component>
|
|
|
b1beb92 |
+</components>
|
|
|
b1beb92 |
diff --git a/filter/source/xsltfilter/description-en-US.txt b/filter/source/xsltfilter/description-en-US.txt
|
|
|
b1beb92 |
new file mode 100644
|
|
|
b1beb92 |
index 0000000..88c8abf
|
|
|
b1beb92 |
--- /dev/null
|
|
|
b1beb92 |
+++ b/filter/source/xsltfilter/description-en-US.txt
|
|
|
b1beb92 |
@@ -0,0 +1 @@
|
|
|
b1beb92 |
+The xslt2-transformer implements a transformer for XSLT import/export filters with support for XSLT 2.0.
|
|
|
b1beb92 |
diff --git a/filter/source/xsltfilter/description.xml b/filter/source/xsltfilter/description.xml
|
|
|
b1beb92 |
new file mode 100644
|
|
|
b1beb92 |
index 0000000..ae6abcb
|
|
|
b1beb92 |
--- /dev/null
|
|
|
b1beb92 |
+++ b/filter/source/xsltfilter/description.xml
|
|
|
b1beb92 |
@@ -0,0 +1,28 @@
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ xmlns="http://openoffice.org/extensions/description/2006"
|
|
|
b1beb92 |
+ xmlns:dep="http://libreoffice.org/extensions/description/2011"
|
|
|
b1beb92 |
+ xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ <identifier value="org.libreoffice.JavaXSLT2Transformer"/>
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ <dependencies>
|
|
|
b1beb92 |
+ <dep:LibreOffice-minimal-version value="3.7"/>
|
|
|
b1beb92 |
+ </dependencies>
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ <version value="1.0.0"/>
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ <publisher>
|
|
|
b1beb92 |
+ <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
|
|
|
b1beb92 |
+ </publisher>
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ <display-name>
|
|
|
b1beb92 |
+ <name lang="en-US">XSLT 2.0 transformer</name>
|
|
|
b1beb92 |
+ </display-name>
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ <extension-description>
|
|
|
b1beb92 |
+ <src xlink:href="description-en-US.txt" lang="en-US" />
|
|
|
b1beb92 |
+ </extension-description>
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+</description>
|
|
|
b1beb92 |
diff --git a/filter/source/xsltfilter/manifest.xml b/filter/source/xsltfilter/manifest.xml
|
|
|
b1beb92 |
new file mode 100644
|
|
|
b1beb92 |
index 0000000..a443e65
|
|
|
b1beb92 |
--- /dev/null
|
|
|
b1beb92 |
+++ b/filter/source/xsltfilter/manifest.xml
|
|
|
b1beb92 |
@@ -0,0 +1,6 @@
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
|
|
|
b1beb92 |
+
|
|
|
b1beb92 |
+ manifest:full-path="components.rdb"/>
|
|
|
b1beb92 |
+</manifest:manifest>
|
|
|
b1beb92 |
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
|
|
|
b1beb92 |
index 09e296b..ccb87f0 100644
|
|
|
b1beb92 |
--- a/postprocess/packcomponents/makefile.mk
|
|
|
b1beb92 |
+++ b/postprocess/packcomponents/makefile.mk
|
|
|
b1beb92 |
@@ -288,7 +288,6 @@ my_components += component/framework/util/lomenubar
|
|
|
b1beb92 |
.IF "$(SOLAR_JAVA)" == "TRUE"
|
|
|
b1beb92 |
my_components += \
|
|
|
b1beb92 |
component/xmerge/source/bridge/XMergeBridge \
|
|
|
b1beb92 |
- component/filter/source/xsltfilter/XSLTFilter.jar \
|
|
|
b1beb92 |
component/filter/source/xsltvalidate/XSLTValidate \
|
|
|
b1beb92 |
component/scripting/java/ScriptFramework \
|
|
|
b1beb92 |
component/scripting/java/ScriptProviderForJava \
|
|
|
b1beb92 |
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
|
|
|
b1beb92 |
index 0c49414..640ea3a 100644
|
|
|
b1beb92 |
--- a/scp2/InstallModule_ooo.mk
|
|
|
b1beb92 |
+++ b/scp2/InstallModule_ooo.mk
|
|
|
b1beb92 |
@@ -158,9 +158,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
|
|
|
b1beb92 |
$(if $(filter YES,$(SYSTEM_HSQLDB)),\
|
|
|
b1beb92 |
-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
|
|
|
b1beb92 |
) \
|
|
|
b1beb92 |
- $(if $(filter YES,$(SYSTEM_SAXON)),\
|
|
|
b1beb92 |
- -DSAXON_JAR=\""$(call gb_Helper_make_path,$(SAXON_JAR))"\" \
|
|
|
b1beb92 |
- ) \
|
|
|
b1beb92 |
$(if $(filter-out YES,$(WITH_MOZILLA)),\
|
|
|
b1beb92 |
-DWITHOUT_MOZILLA \
|
|
|
b1beb92 |
) \
|
|
|
b1beb92 |
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
|
|
|
b1beb92 |
index 997a142..83c5c21 100644
|
|
|
b1beb92 |
--- a/scp2/source/ooo/common_brand.scp
|
|
|
b1beb92 |
+++ b/scp2/source/ooo/common_brand.scp
|
|
|
b1beb92 |
@@ -1259,9 +1259,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
|
|
|
b1beb92 |
#ifdef SYSTEM_HSQLDB
|
|
|
b1beb92 |
ValueList1 = HSQLDB_JAR;
|
|
|
b1beb92 |
#endif
|
|
|
b1beb92 |
-#ifdef SYSTEM_SAXON
|
|
|
b1beb92 |
- ValueList2 = SAXON_JAR;
|
|
|
b1beb92 |
-#endif
|
|
|
b1beb92 |
End
|
|
|
b1beb92 |
|
|
|
b1beb92 |
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
|
|
|
b1beb92 |
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
|
|
|
b1beb92 |
index 66c50e2..f3448e5 100644
|
|
|
b1beb92 |
--- a/scp2/source/ooo/file_library_ooo.scp
|
|
|
b1beb92 |
+++ b/scp2/source/ooo/file_library_ooo.scp
|
|
|
b1beb92 |
@@ -1382,7 +1382,6 @@ STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
|
|
|
b1beb92 |
STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
|
|
|
b1beb92 |
|
|
|
b1beb92 |
#ifdef SOLAR_JAVA
|
|
|
b1beb92 |
-STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
|
|
|
b1beb92 |
STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
|
|
|
b1beb92 |
#endif
|
|
|
b1beb92 |
|
|
|
b1beb92 |
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
|
|
|
b1beb92 |
index ebdcf25..e274fc3 100644
|
|
|
b1beb92 |
--- a/scp2/source/ooo/file_ooo.scp
|
|
|
b1beb92 |
+++ b/scp2/source/ooo/file_ooo.scp
|
|
|
b1beb92 |
@@ -469,12 +469,6 @@ End
|
|
|
b1beb92 |
|
|
|
b1beb92 |
#endif
|
|
|
b1beb92 |
|
|
|
b1beb92 |
-#ifdef SOLAR_JAVA
|
|
|
b1beb92 |
-#ifndef SYSTEM_SAXON
|
|
|
b1beb92 |
-STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
|
|
|
b1beb92 |
-#endif
|
|
|
b1beb92 |
-#endif
|
|
|
b1beb92 |
-
|
|
|
b1beb92 |
#ifndef AIX
|
|
|
b1beb92 |
#ifndef DISABLE_PYUNO
|
|
|
b1beb92 |
|
|
|
b1beb92 |
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
|
|
|
b1beb92 |
index 76e062b..e00a38b 100644
|
|
|
b1beb92 |
--- a/scp2/source/ooo/module_hidden_ooo.scp
|
|
|
b1beb92 |
+++ b/scp2/source/ooo/module_hidden_ooo.scp
|
|
|
b1beb92 |
@@ -129,7 +129,6 @@ Module gid_Module_Root_Files_3
|
|
|
b1beb92 |
Default = YES;
|
|
|
b1beb92 |
Styles = (HIDDEN_ROOT);
|
|
|
b1beb92 |
Files = (gid_File_Dat_Root3,
|
|
|
b1beb92 |
- gid_File_Jar_Saxon,
|
|
|
b1beb92 |
gid_File_Jar_Unoil,
|
|
|
b1beb92 |
gid_File_Jar_Hsqldb,
|
|
|
b1beb92 |
gid_File_Jar_Hsqldb_Sdbc,
|
|
|
b1beb92 |
--
|
|
|
b1beb92 |
1.7.11.7
|
|
|
b1beb92 |
|