Repository: karaf Updated Branches: refs/heads/master 23668b681 -> cada98736
[KARAF-3956]should also add xalan into the endorse folder of distributions Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cada9873 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cada9873 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cada9873 Branch: refs/heads/master Commit: cada9873641070445925d62cf4b58e2e311240ad Parents: 23668b6 Author: Freeman Fang <[email protected]> Authored: Tue Aug 25 14:04:48 2015 +0800 Committer: Freeman Fang <[email protected]> Committed: Tue Aug 25 14:04:48 2015 +0800 ---------------------------------------------------------------------- assemblies/apache-karaf/pom.xml | 2 + .../resources/etc/config.properties | 42 ++++++++++++++++++++ .../resources/resources/etc/system.properties | 3 ++ pom.xml | 13 +++++- 4 files changed, 59 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/cada9873/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 5b31b00..201b9b5 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -191,6 +191,8 @@ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library> <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library> <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library> + <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library> + <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library> <library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library> <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library> http://git-wip-us.apache.org/repos/asf/karaf/blob/cada9873/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties index f203154..e344f19 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties @@ -155,6 +155,48 @@ org.osgi.framework.system.packages.extra= \ org.apache.xerces.xs.datatypes;uses:=\"javax.xml.datatype,javax.xml.namespace,org.apache.xerces.xni,org.apache.xerces.xs\";version=2.11.0, \ org.apache.xerces.xs;uses:=\"org.apache.xerces.xs.datatypes,org.w3c.dom,org.w3c.dom.ls\";version=2.11.0, \ org.apache.xml.serialize;uses:=\"org.apache.xerces.dom,org.apache.xerces.util,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext\";version=2.11.0, \ + org.apache.xalan.extensions; version="2.7.2", \ + org.apache.xalan.xsltc.compiler; version="2.7.2", \ + org.apache.xalan.xsltc.cmdline.getopt; version="2.7.2", \ + org.apache.xalan.xsltc.util; version="2.7.2", \ + org.apache.xalan.transformer; version="2.7.2", \ + org.apache.xalan.xsltc.trax; version="2.7.2", \ + org.apache.xalan.processor; version="2.7.2", \ + org.apache.xalan.lib; version="2.7.2", \ + org.apache.xalan.trace; version="2.7.2", \ + org.apache.xalan.xsltc.compiler.util; version="2.7.2", \ + org.apache.xalan.templates; version="2.7.2", \ + org.apache.xalan.xsltc; version="2.7.2", \ + org.apache.xalan.xsltc.runtime; version="2.7.2", \ + org.apache.xalan; version="2.7.2", \ + org.apache.xalan.xslt; version="2.7.2", \ + org.apache.xalan.lib.sql; version="2.7.2", \ + org.apache.xalan.xsltc.runtime.output; version="2.7.2", \ + org.apache.xalan.xsltc.dom; version="2.7.2", \ + org.apache.xalan.client; version="2.7.2", \ + org.apache.xalan.xsltc.cmdline; version="2.7.2", \ + org.apache.xalan.serialize; version="2.7.2", \ + org.apache.xalan.res; version="2.7.2", \ + org.apache.xml.dtm.ref; version="2.7.2", \ + org.apache.xml.dtm; version="2.7.2", \ + org.apache.xml.dtm.ref.sax2dtm; version="2.7.2", \ + org.apache.xml.dtm.ref.dom2dtm; version="2.7.2", \ + org.apache.xml.res; version="2.7.2", \ + org.apache.xml.serializer.dom3; version="2.7.2", \ + org.apache.xml.serializer; version="2.7.2", \ + org.apache.xml.serializer.utils; version="2.7.2", \ + org.apache.xml.utils.res; version="2.7.2", \ + org.apache.xml.utils; version="2.7.2", \ + org.apache.xpath.functions; version="2.7.2", \ + org.apache.xpath.jaxp; version="2.7.2", \ + org.apache.xpath.patterns; version="2.7.2", \ + org.apache.xpath.objects; version="2.7.2", \ + org.apache.xpath.res; version="2.7.2", \ + org.apache.xpath; version="2.7.2", \ + org.apache.xpath.axes; version="2.7.2", \ + org.apache.xpath.compiler; version="2.7.2", \ + org.apache.xpath.operations; version="2.7.2", \ + org.apache.xpath.domapi; version="2.7.2", \ org.w3c.dom.bootstrap;uses:=org.w3c.dom;version=1.0, \ org.w3c.dom.css;uses:=\"org.w3c.dom,org.w3c.dom.stylesheets,org.w3c.dom.views\";version=1.0, \ org.w3c.dom.events;uses:=\"org.w3c.dom,org.w3c.dom.views\";version=1.0, \ http://git-wip-us.apache.org/repos/asf/karaf/blob/cada9873/assemblies/features/base/src/main/resources/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/etc/system.properties b/assemblies/features/base/src/main/resources/resources/etc/system.properties index 8e3cb68..e329bb0 100644 --- a/assemblies/features/base/src/main/resources/resources/etc/system.properties +++ b/assemblies/features/base/src/main/resources/resources/etc/system.properties @@ -99,6 +99,9 @@ jline.nobell = true org.apache.servicemix.specs.debug = false org.apache.servicemix.specs.timeout = 0 +javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl +javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl + # # Settings for the OSGi 4.3 Weaving # By default, we will not weave any classes. Change this setting to include classes http://git-wip-us.apache.org/repos/asf/karaf/blob/cada9873/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f675848..0b09a79 100644 --- a/pom.xml +++ b/pom.xml @@ -258,6 +258,8 @@ <struts.bundle.version>1.3.10_1</struts.bundle.version> <xbean.version>3.18</xbean.version> <xerces.version>2.11.0</xerces.version> + <xalan.bundle.version>2.7.2_2</xalan.bundle.version> + <xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version> <javax.mail.version>1.4.5</javax.mail.version> <!-- Furter used maven plugin versions; e.g. in the docs --> @@ -1024,7 +1026,16 @@ <artifactId>xercesImpl</artifactId> <version>${xerces.version}</version> </dependency> - + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xalan</artifactId> + <version>${xalan.bundle.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId> + <version>${xalan-serializer.bundle.version}</version> + </dependency> <dependency> <groupId>org.springframework.osgi</groupId> <artifactId>spring-osgi-core</artifactId>
