svn commit: r1416804 - in /openejb/trunk/openejb: pom.xml server/openejb-cxf-rs/pom.xml server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java

[rmannibucau]

Author: rmannibucau
Date: Tue Dec  4 08:01:25 2012
New Revision: 1416804

URL: http://svn.apache.org/viewvc?rev=1416804&view=rev
Log:
cxf 2.6.3 with api change fix

Modified:
    openejb/trunk/openejb/pom.xml
    openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml
    
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java

Modified: openejb/trunk/openejb/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1416804&r1=1416803&r2=1416804&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Tue Dec  4 08:01:25 2012
@@ -123,7 +123,7 @@
     <tomcat.version>7.0.33</tomcat.version>
 
     <!-- used mainly by jetty modules -->
-    <cxf.version>2.7.0</cxf.version>
+    <cxf.version>2.6.3</cxf.version>
     <ehcache.version>2.6.0</ehcache.version> <!-- used by cxf for security 
(replay attack) -->
     <jetty.version>7.5.3.v20111011</jetty.version>
     <pax-url.version>1.3.5</pax-url.version>

Modified: openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml?rev=1416804&r1=1416803&r2=1416804&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/pom.xml Tue Dec  4 08:01:25 2012
@@ -60,6 +60,10 @@
           <artifactId>jsr311-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>javax.ws.rs-api</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.codehaus.woodstox</groupId>
           <artifactId>woodstox-core-asl</artifactId>
         </exclusion>

Modified: 
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java?rev=1416804&r1=1416803&r2=1416804&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
 Tue Dec  4 08:01:25 2012
@@ -147,14 +147,14 @@ public final class CxfUtil {
         }
     }
 
-    private static List<Feature> createFeatures(final Collection<ServiceInfo> 
availableServices, final String featuresIds) {
+    private static List<AbstractFeature> createFeatures(final 
Collection<ServiceInfo> availableServices, final String featuresIds) {
         final List<?> features = ServiceInfos.resolve(availableServices, 
featuresIds.split(","));
         for (Object instance : features) {
-            if (!Feature.class.isInstance(instance)) {
+            if (!AbstractFeature.class.isInstance(instance)) {
                 throw new OpenEJBRuntimeException("feature should inherit from 
" + AbstractFeature.class.getName());
             }
         }
-        return (List<Feature>) features;
+        return (List<AbstractFeature>) features;
     }
 
     private static List<Interceptor<? extends Message>> 
createInterceptors(final Collection<ServiceInfo> availableServices, final 
String ids) {
@@ -186,7 +186,7 @@ public final class CxfUtil {
 
             final String featuresIds = properties.getProperty(BUS_PREFIX + 
FEATURES);
             if (featuresIds != null) {
-                final List<Feature> features = createFeatures(serviceInfos, 
featuresIds);
+                final List<AbstractFeature> features = 
createFeatures(serviceInfos, featuresIds);
                 if (features != null) {
                     features.addAll(busImpl.getFeatures());
                     busImpl.setFeatures(features);