svn commit: r1414826 - in /cxf/dosgi/trunk: distribution/features/src/main/resources/ distribution/multi-bundle/ distribution/multi-bundle/src/main/resources/ dsw/cxf-dsw/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/

[cschneider]

Author: cschneider
Date: Wed Nov 28 17:13:39 2012
New Revision: 1414826

URL: http://svn.apache.org/viewvc?rev=1414826&view=rev
Log:
DOSGI-127 Optimize distros and feature

Modified:
    cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml
    cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
    
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
    cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
    
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java

Modified: cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml?rev=1414826&r1=1414825&r2=1414826&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml 
(original)
+++ cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml Wed 
Nov 28 17:13:39 2012
@@ -3,7 +3,11 @@
     
<repository>mvn:org.apache.cxf.karaf/apache-cxf/2.7.0/xml/features</repository>
 
     <feature name="cxf-dosgi-core" version="${project.version}">
-        <feature>cxf</feature>
+        <feature>cxf-specs</feature>
+        <feature>cxf-jaxws</feature>
+        <feature>cxf-jaxrs</feature>
+        <feature>cxf-databinding-aegis</feature>
+        <feature>cxf-http-jetty</feature>
         <bundle>mvn:org.osgi/org.osgi.enterprise/4.2.0</bundle>        
         
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/1.1_3</bundle>
         
<bundle>mvn:${project.groupId}/cxf-dosgi-ri-topology-manager/${project.version}</bundle>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1414826&r1=1414825&r2=1414826&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed Nov 28 17:13:39 2012
@@ -206,11 +206,6 @@
             <artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
             <version>1.5.2_4</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
-            <version>2.4.1_1</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.aries</groupId>

Modified: 
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=1414826&r1=1414825&r2=1414826&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml 
(original)
+++ 
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml 
Wed Nov 28 17:13:39 2012
@@ -32,7 +32,6 @@
   
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.2-${servicemix.specs.version}.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr339-api-m10-${servicemix.specs.version}.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar</bundle>
-  
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.util-0.3.1.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.proxy-0.3.1.jar</bundle>
   
<bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint-0.3.2.jar</bundle>

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1414826&r1=1414825&r2=1414826&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Wed Nov 28 17:13:39 2012
@@ -33,7 +33,6 @@
     <properties>
         <topDirectoryLocation>../..</topDirectoryLocation>
         <bundle.import.package>
-            org.apache.cxf.ws.policy.*,
             
org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2.0)",
             javax.servlet*;version="[0.0,4)",
             javax.xml.ws*;version="[2.1,3)",

Modified: 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java?rev=1414826&r1=1414825&r2=1414826&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/DefaultIntentMapFactory.java
 Wed Nov 28 17:13:39 2012
@@ -26,13 +26,10 @@ import org.apache.cxf.binding.soap.Soap1
 import org.apache.cxf.binding.soap.SoapBindingConfiguration;
 import org.apache.cxf.binding.soap.SoapVersion;
 import org.apache.cxf.feature.LoggingFeature;
-import org.apache.cxf.ws.policy.WSPolicyFeature;
-import org.apache.neethi.Policy;
 
 public class DefaultIntentMapFactory {
     public Map<String, Object> create() {
         Map<String,Object> intentMap = new HashMap<String, Object>();
-        intentMap.put("addressing", getNonDecoupledAddressing());
         intentMap.put("logging", getLoggingFeature());
         Object soap11 = getSoapBinding(Soap11.getInstance());
         intentMap.put("SOAP", soap11);
@@ -42,12 +39,6 @@ public class DefaultIntentMapFactory {
         return intentMap;
     }
 
-    private Object getNonDecoupledAddressing() {
-        Policy wsAddressing = new Policy();
-        WSPolicyFeature wsPolicy = new WSPolicyFeature(wsAddressing );
-        return wsPolicy;
-    }
-    
     private Object getLoggingFeature() {
         return new LoggingFeature();
     }