Repository: karaf Updated Branches: refs/heads/karaf-2.x 5442ae049 -> 96d04da22
[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/96d04da2 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/96d04da2 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/96d04da2 Branch: refs/heads/karaf-2.x Commit: 96d04da22424bcfe90ea2fd27e0c8586c4ed00da Parents: 5442ae0 Author: Freeman Fang <[email protected]> Authored: Tue Aug 25 11:41:50 2015 +0800 Committer: Freeman Fang <[email protected]> Committed: Tue Aug 25 11:41:50 2015 +0800 ---------------------------------------------------------------------- assemblies/apache-karaf/pom.xml | 9 +++++ .../src/main/descriptors/unix-bin-release.xml | 2 + .../src/main/descriptors/unix-bin-snapshot.xml | 2 + .../descriptors/unix-minimal-bin-release.xml | 2 + .../descriptors/unix-minimal-bin-snapshot.xml | 2 + .../main/descriptors/windows-bin-release.xml | 2 + .../main/descriptors/windows-bin-snapshot.xml | 2 + .../descriptors/windows-minimal-bin-release.xml | 2 + .../windows-minimal-bin-snapshot.xml | 2 + .../distribution/text/etc/system.properties | 4 ++ .../filtered-resources/etc/config.properties | 42 ++++++++++++++++++++ pom.xml | 12 ++++++ 12 files changed, 83 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 798cd7f..95728fa 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -461,6 +461,15 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xalan</artifactId> + </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml index f46482f..947865e 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml @@ -123,6 +123,8 @@ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml index c1a4bfc..f577325 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml @@ -123,6 +123,8 @@ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml index 7a1576f..206f6c4 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml @@ -119,6 +119,8 @@ <include>org.apache.karaf:org.apache.karaf.exception</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml index 3428108..0b7d5ad 100644 --- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml @@ -119,6 +119,8 @@ <include>org.apache.karaf:org.apache.karaf.exception</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml index 90a5b34..b31ddc5 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml @@ -131,6 +131,8 @@ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml index ae67c2e..807e6f8 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml @@ -131,6 +131,8 @@ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml index 83c419f..e78d943 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml @@ -126,6 +126,8 @@ <include>org.apache.karaf:org.apache.karaf.exception</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml index e710293..872f121 100644 --- a/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml +++ b/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml @@ -126,6 +126,8 @@ <include>org.apache.karaf:org.apache.karaf.exception</include> <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include> <include>xerces:xercesImpl</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include> + <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include> </includes> </dependencySet> http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties b/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties index f12ecb9..ed4a715 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties @@ -94,6 +94,10 @@ karaf.clean.cache = false 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/96d04da2/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties index f49a2c9..caf95af 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties @@ -119,6 +119,48 @@ org.osgi.framework.system.packages.extra= \ org.apache.xerces.impl.xs; version="2.11.0", \ org.apache.xerces.impl.validation; version="2.11.0", \ org.apache.xml.serialize; 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", \ sun.misc org.osgi.framework.system.capabilities= \ http://git-wip-us.apache.org/repos/asf/karaf/blob/96d04da2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index db81068..b0bc5f9 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,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> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory> @@ -695,6 +697,16 @@ <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.json</groupId> <artifactId>json</artifactId> <version>${org.json.version}</version>
