Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x f3a549ed6 -> 6b99eafdd
[KARAF-3956]should also add xalan into the endorse folder of distributions
(cherry picked from commit 96d04da22424bcfe90ea2fd27e0c8586c4ed00da)
Conflicts:
assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6b99eafd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6b99eafd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6b99eafd
Branch: refs/heads/karaf-3.0.x
Commit: 6b99eafdd4dd8767f7058f68cd92d32e57d0c58f
Parents: f3a549e
Author: Freeman Fang <[email protected]>
Authored: Tue Aug 25 11:41:50 2015 +0800
Committer: Freeman Fang <[email protected]>
Committed: Tue Aug 25 13:13:23 2015 +0800
----------------------------------------------------------------------
assemblies/features/framework/pom.xml | 10 +++++
.../resources/etc/config.properties | 42 ++++++++++++++++++++
.../resources/resources/etc/system.properties | 4 ++
pom.xml | 12 ++++++
4 files changed, 68 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6b99eafd/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml
b/assemblies/features/framework/pom.xml
index 3d3871f..0771b98 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -350,6 +350,16 @@
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
+
<groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.xalan</artifactId>
+
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+
<groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
+
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<outputDirectory>target/classes/resources/system/org/eclipse/org.eclipse.osgi/${equinox.version}</outputDirectory>
http://git-wip-us.apache.org/repos/asf/karaf/blob/6b99eafd/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git
a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index 2cf400a..e5cedd6 100644
---
a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++
b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -118,6 +118,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/6b99eafd/assemblies/features/framework/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git
a/assemblies/features/framework/src/main/resources/resources/etc/system.properties
b/assemblies/features/framework/src/main/resources/resources/etc/system.properties
index 801117d..95cb83c 100644
---
a/assemblies/features/framework/src/main/resources/resources/etc/system.properties
+++
b/assemblies/features/framework/src/main/resources/resources/etc/system.properties
@@ -94,6 +94,10 @@ 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/6b99eafd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e8305f8..91b1527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,6 +249,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 -->
@@ -1075,6 +1077,16 @@
<version>${spring31.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</groupId>
<artifactId>spring-struts</artifactId>
<version>${spring31.version}</version>
