You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2013/02/26 09:40:24 UTC
svn commit: r1450075 - in /servicemix/smx4/features/trunk/assemblies:
apache-servicemix-full/src/main/filtered-resources/etc/
apache-servicemix-jbi/src/main/filtered-resources/etc/
apache-servicemix/src/main/filtered-resources/ apache-servicemix/src/ma...
Author: ffang
Date: Tue Feb 26 08:40:24 2013
New Revision: 1450075
URL: http://svn.apache.org/r1450075
Log:
[SMX4-1380]remove saaj-api from endorse folder and ensure install correct saaj api/impl bundle
Modified:
servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml
servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1450075&r1=1450074&r2=1450075&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Feb 26 08:40:24 2013
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1450075&r1=1450074&r2=1450075&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix-jbi/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Feb 26 08:40:24 2013
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,cxf-specs,camel,camel-activemq,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,camel-activemq,camel-nmr,camel-cxf,camel-blueprint,jbi-cluster,war,servicemix-cxf-bc,servicemix-file,servicemix-ftp,servicemix-http,servicemix-jms,servicemix-mail,servicemix-smpp,servicemix-snmp,servicemix-vfs,servicemix-bean,servicemix-camel,servicemix-cxf-se,servicemix-drools,servicemix-eip,servicemix-osworkflow,servicemix-quartz,servicemix-scripting,servicemix-validation,servicemix-saxon,servicemix-wsn2005,servicemix-exec
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1450075&r1=1450074&r2=1450075&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Feb 26 08:40:24 2013
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker,activemq-spring,saaj,cxf-specs,camel,camel-activemq,camel-cxf,camel-blueprint,war
Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1450075&r1=1450074&r2=1450075&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Tue Feb 26 08:40:24 2013
@@ -367,5 +367,11 @@
<bundle>mvn:org.activiti/activiti-camel/${activiti.version}</bundle>
<bundle>mvn:org.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
</feature>
+
+ <feature name="saaj" resolver='(obr)'>
+ <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
+ <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
+ <bundle start-level='10' dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
+ </feature>
</features>
Modified: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml?rev=1450075&r1=1450074&r2=1450075&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/common-bin.xml Tue Feb 26 08:40:24 2013
@@ -49,7 +49,6 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
<include>xalan:xalan</include>
<include>xalan:serializer</include>
</includes>
Modified: servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties?rev=1450075&r1=1450074&r2=1450075&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties (original)
+++ servicemix/smx4/features/trunk/assemblies/shared/src/main/resources/etc/jre.properties Tue Feb 26 08:40:24 2013
@@ -120,7 +120,6 @@ jre-1.6= \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
javax.xml.stream;version="1.2", \
javax.xml.stream.events;version="1.2", \
javax.xml.stream.util;version="1.2", \
@@ -283,7 +282,6 @@ jre-1.7= \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
javax.xml.stream;version="1.2", \
javax.xml.stream.events;version="1.2", \
javax.xml.stream.util;version="1.2", \