cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1374260 - in /cxf/trunk: api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/feature/ rt/core/src/main/java/org/apache/cxf/service/factory/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ rt/frontend/jaxrs/src...
Date Fri, 17 Aug 2012 13:55:25 GMT
Author: dkulp
Date: Fri Aug 17 13:55:24 2012
New Revision: 1374260

URL: http://svn.apache.org/viewvc?rev=1374260&view=rev
Log:
Change the API's that use AbstractFeature to just Feature

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
    cxf/trunk/api/src/main/java/org/apache/cxf/feature/AbstractFeature.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
    cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java Fri Aug
17 13:55:24 2012
@@ -34,7 +34,7 @@ import org.apache.cxf.binding.BindingCon
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.databinding.DataBinding;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
 import org.apache.cxf.interceptor.AnnotationInterceptors;
 import org.apache.cxf.message.MessageUtils;
@@ -58,7 +58,7 @@ public abstract class AbstractEndpointFa
     protected QName endpointName;
     protected QName serviceName;
     protected Map<String, Object> properties;
-    protected List<AbstractFeature> features;
+    protected List<Feature> features;
     protected BindingConfiguration bindingConfig;
     protected EndpointReferenceType endpointReference;
     protected ConduitSelector conduitSelector;
@@ -160,15 +160,15 @@ public abstract class AbstractEndpointFa
         this.properties = properties;
     }
 
-    public List<AbstractFeature> getFeatures() {
+    public List<Feature> getFeatures() {
         if (features == null) {
-            features = new ArrayList<AbstractFeature>();
+            features = new ArrayList<Feature>();
         }
         return features;
     }
 
-    public void setFeatures(List<AbstractFeature> features) {
-        this.features = features;
+    public void setFeatures(List<? extends Feature> features2) {
+        this.features = new ArrayList<Feature>(features2);
     }
 
     public BindingFactory getBindingFactory() {

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Endpoint.java Fri Aug 17 13:55:24
2012
@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.concurrent.Executor;
 
 import org.apache.cxf.binding.Binding;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.interceptor.InterceptorProvider;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -54,5 +54,5 @@ public interface Endpoint extends Map<St
     
     void setOutFaultObserver(MessageObserver observer);
 
-    List<AbstractFeature> getActiveFeatures();
+    List<Feature> getActiveFeatures();
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java Fri Aug 17 13:55:24
2012
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.endpoint;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -36,7 +37,7 @@ import org.apache.cxf.binding.BindingFac
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.Configurable;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.interceptor.AbstractAttributedInterceptorProvider;
 import org.apache.cxf.interceptor.ClientFaultConverter;
 import org.apache.cxf.interceptor.InFaultChainInitiatorObserver;
@@ -60,7 +61,7 @@ public class EndpointImpl extends Abstra
     private Bus bus;
     private MessageObserver inFaultObserver;
     private MessageObserver outFaultObserver;
-    private List<AbstractFeature> activeFeatures;
+    private List<Feature> activeFeatures;
 
     public EndpointImpl(Bus bus, Service s, QName endpointName) throws EndpointException
{
         this(bus, s, s.getEndpointInfo(endpointName));
@@ -169,15 +170,15 @@ public class EndpointImpl extends Abstra
     /**
      * @return the list of fearures <b>already</b> activated for this endpoint.
      */
-    public List<AbstractFeature> getActiveFeatures() {
+    public List<Feature> getActiveFeatures() {
         return activeFeatures;
     }
 
     /**
      * @param the list of fearures <b>already</b> activated for this endpoint.
      */
-    public void initializeActiveFeatures(List<AbstractFeature> features) {
-        activeFeatures = features;
+    public void initializeActiveFeatures(List<? extends Feature> features) {
+        activeFeatures = new ArrayList<Feature>(features);
     }
 
     /**

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/feature/AbstractFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/feature/AbstractFeature.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/feature/AbstractFeature.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/feature/AbstractFeature.java Fri Aug 17 13:55:24
2012
@@ -62,11 +62,11 @@ public abstract class AbstractFeature im
      * @param type the feature type required
      * @return the feature of the specified type if active
      */
-    public static <T> T getActive(List<AbstractFeature> features,
+    public static <T> T getActive(List<? extends Feature> features,
                                   Class<T> type) {
         T active = null;
         if (features != null) {
-            for (AbstractFeature feature : features) {
+            for (Feature feature : features) {
                 if (type.isInstance(feature)) {
                     active = type.cast(feature);
                     break;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Fri Aug 17 13:55:24 2012
@@ -77,7 +77,7 @@ import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.MethodComparator;
 import org.apache.cxf.interceptor.Fault;
@@ -168,7 +168,7 @@ public class ReflectionServiceFactoryBea
     private boolean qualifiedSchemas = true;
     private boolean validate;
 
-    private List<AbstractFeature> features;
+    private List<? extends Feature> features;
 
     private Map<Method, Boolean> wrappedCache = new HashMap<Method, Boolean>();
     private Map<Method, Boolean> isRpcCache = new HashMap<Method, Boolean>();
@@ -398,7 +398,7 @@ public class ReflectionServiceFactoryBea
         WSDLServiceFactory factory = new WSDLServiceFactory(getBus(), url, getServiceQName());
         boolean setEPName = true;
         if (features != null) {
-            for (AbstractFeature f : features) {
+            for (Feature f : features) {
                 if (f.getClass().isAnnotationPresent(EvaluateAllEndpoints.class)) {
                     setEPName = false;
                 }
@@ -2534,12 +2534,12 @@ public class ReflectionServiceFactoryBea
         this.ignoredMethods = ignoredMethods;
     }
 
-    public List<AbstractFeature> getFeatures() {
+    public List<? extends Feature> getFeatures() {
         return features;
     }
 
-    public void setFeatures(List<AbstractFeature> f) {
-        this.features = f;
+    public void setFeatures(List<? extends Feature> features2) {
+        this.features = features2;
     }
 
     private boolean isValidate() {

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
Fri Aug 17 13:55:24 2012
@@ -35,7 +35,7 @@ import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxrs.ext.ResourceComparator;
 import org.apache.cxf.jaxrs.impl.RequestPreprocessor;
@@ -203,7 +203,7 @@ public class JAXRSServerFactoryBean exte
 
     protected void applyFeatures() {
         if (getFeatures() != null) {
-            for (AbstractFeature feature : getFeatures()) {
+            for (Feature feature : getFeatures()) {
                 feature.initialize(server, getBus());
             }
         }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
Fri Aug 17 13:55:24 2012
@@ -31,7 +31,7 @@ import org.apache.cxf.configuration.secu
 import org.apache.cxf.endpoint.ConduitSelector;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.UpfrontConduitSelector;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
 import org.apache.cxf.jaxrs.JAXRSServiceImpl;
@@ -367,7 +367,7 @@ public class JAXRSClientFactoryBean exte
     
     protected void applyFeatures(AbstractClient client) {
         if (getFeatures() != null) {
-            for (AbstractFeature feature : getFeatures()) {
+            for (Feature feature : getFeatures()) {
                 feature.initialize(client.getConfiguration(), getBus());
             }
         }

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java Fri Aug
17 13:55:24 2012
@@ -68,7 +68,7 @@ import org.apache.cxf.databinding.DataWr
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientCallback;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.Fault;
@@ -322,18 +322,18 @@ public class DispatchImpl<T> implements 
             // if the addressing feature is enabled, set findDispatchOp to true
             if (!findDispatchOp) {
                 // the feature list to be searched is the endpoint and the bus's lists
-                List<AbstractFeature> endpointFeatures 
+                List<Feature> endpointFeatures 
                     = ((JaxWsClientEndpointImpl)client.getEndpoint()).getFeatures();
-                List<AbstractFeature> allFeatures;
+                List<Feature> allFeatures;
                 if (client.getBus().getFeatures() != null) {
-                    allFeatures = new ArrayList<AbstractFeature>(endpointFeatures.size()

+                    allFeatures = new ArrayList<Feature>(endpointFeatures.size() 
                         + client.getBus().getFeatures().size());
                     allFeatures.addAll(endpointFeatures);
                     allFeatures.addAll(client.getBus().getFeatures());
                 } else {
                     allFeatures = endpointFeatures;
                 }
-                for (AbstractFeature feature : allFeatures) {
+                for (Feature feature : allFeatures) {
                     if (feature instanceof WSAddressingFeature) {
                         findDispatchOp = true; 
                     }

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Fri Aug
17 13:55:24 2012
@@ -70,7 +70,7 @@ import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
@@ -648,7 +648,7 @@ public class ServiceImpl extends Service
         
         // create the client object, then initialize the endpoint features against it
         Client client = new ClientImpl(clientBus, endpoint, clientFac.getConduitSelector());
-        for (AbstractFeature af : endpoint.getFeatures()) {
+        for (Feature af : endpoint.getFeatures()) {
             af.initialize(client, clientBus);
         }
         //CXF-2822

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
Fri Aug 17 13:55:24 2012
@@ -52,7 +52,7 @@ import org.apache.cxf.common.classloader
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
 import org.apache.cxf.interceptor.Interceptor;
@@ -106,7 +106,7 @@ public class JaxWsEndpointImpl extends E
     private Binding jaxwsBinding;
     private JaxWsImplementorInfo implInfo; 
     private List<WebServiceFeature> wsFeatures;
-    private List<AbstractFeature> features;
+    private List<Feature> features;
     
     //interceptors added/removed to chains as needed
     private SOAPHandlerInterceptor soapHandlerInterceptor;
@@ -123,20 +123,16 @@ public class JaxWsEndpointImpl extends E
     
     public JaxWsEndpointImpl(Bus bus, Service s, EndpointInfo ei, 
                              List<WebServiceFeature> wf) throws EndpointException {
-        this(bus, s, ei, null, wf, new ArrayList<AbstractFeature>(), true);
+        this(bus, s, ei, null, wf, new ArrayList<Feature>(), true);
     }    
 
     public JaxWsEndpointImpl(Bus bus, Service s, EndpointInfo ei, JaxWsImplementorInfo implementorInfo,

-                             List<WebServiceFeature> wf, List<AbstractFeature>
af, boolean isFromWsdl)
+                             List<WebServiceFeature> wf, List<? extends Feature>
af, boolean isFromWsdl)
         throws EndpointException {
         super(bus, s, ei);
         this.implInfo = implementorInfo;
         this.wsFeatures = wf;
-        this.features = af;
-
-        if (features == null) {
-            features = new ArrayList<AbstractFeature>();
-        }
+        features = new ArrayList<Feature>(af);
         createJaxwsBinding();
         
         List<Interceptor<? extends Message>> in = super.getInInterceptors();
      
@@ -433,7 +429,7 @@ public class JaxWsEndpointImpl extends E
         }
     }
     
-    public List<AbstractFeature> getFeatures() {
+    public List<Feature> getFeatures() {
         return features;
     }
 
@@ -441,7 +437,7 @@ public class JaxWsEndpointImpl extends E
         if (features == null) {
             return null;
         }
-        for (AbstractFeature f : features) {
+        for (Feature f : features) {
             if (f instanceof WSAddressingFeature) {
                 return (WSAddressingFeature)f;
             }
@@ -449,15 +445,15 @@ public class JaxWsEndpointImpl extends E
         return null;
     }
 
-    private void addAddressingFeature(AbstractFeature a) {
-        AbstractFeature f = getWSAddressingFeature();
+    private void addAddressingFeature(WSAddressingFeature a) {
+        Feature f = getWSAddressingFeature();
         if (f == null) {
             features.add(a);
         }
     }
 
     private void removeAddressingFeature() {
-        AbstractFeature f = getWSAddressingFeature();
+        Feature f = getWSAddressingFeature();
         if (f != null) {
             features.remove(f);
         }

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
Fri Aug 17 13:55:24 2012
@@ -23,7 +23,7 @@ import java.util.List;
 
 import javax.jws.WebService;
 
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.feature.Features;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.interceptor.InFaultInterceptors;
@@ -80,7 +80,7 @@ public class AnnotationInterceptorTest e
         fb.setServiceBean(hello);
         fb.create();
         
-        List<AbstractFeature> features = fb.getFeatures();
+        List<Feature> features = fb.getFeatures();
         assertTrue(hasAnnotationFeature(features));
     }
     
@@ -94,7 +94,7 @@ public class AnnotationInterceptorTest e
         List<Interceptor<? extends Message>> interceptors = fb.getServer().getEndpoint().getInInterceptors();
         assertFalse(hasTestInterceptor(interceptors));
         
-        List<AbstractFeature> features = fb.getFeatures();
+        List<Feature> features = fb.getFeatures();
         assertFalse(hasAnnotationFeature(features));
     }
     
@@ -108,7 +108,7 @@ public class AnnotationInterceptorTest e
         List<Interceptor<? extends Message>> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
         assertFalse(hasTestInterceptor(interceptors));
         
-        List<AbstractFeature> features = fb.getFeatures();
+        List<Feature> features = fb.getFeatures();
         assertFalse(hasAnnotationFeature(features));
     }
     
@@ -127,7 +127,7 @@ public class AnnotationInterceptorTest e
         assertFalse(hasTestInterceptor(inFaultInterceptors));
         assertTrue(hasTest2Interceptor(inFaultInterceptors));
         
-        List<AbstractFeature> features = jfb.getFeatures();
+        List<Feature> features = jfb.getFeatures();
         assertTrue(hasAnnotationFeature(features));
     }
     
@@ -156,7 +156,7 @@ public class AnnotationInterceptorTest e
         List<Interceptor<? extends Message>> interceptors = jfb.getServer().getEndpoint().getInInterceptors();
         assertTrue(hasTestInterceptor(interceptors));
         
-        List<AbstractFeature> features = jfb.getFeatures();
+        List<Feature> features = jfb.getFeatures();
         assertTrue(hasAnnotationFeature(features));
     }
     
@@ -192,9 +192,9 @@ public class AnnotationInterceptorTest e
         return flag;
     }
     
-    private boolean hasAnnotationFeature(List<AbstractFeature> features) {
+    private boolean hasAnnotationFeature(List<Feature> features) {
         boolean flag = false;
-        for (AbstractFeature af : features) {
+        for (Feature af : features) {
             if (af instanceof AnnotationFeature) {
                 flag = true;
             }

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java
Fri Aug 17 13:55:24 2012
@@ -28,7 +28,7 @@ import org.apache.cxf.bus.CXFBusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.ws.policy.PolicyEngine;
@@ -89,7 +89,7 @@ public class PolicyFeatureTest extends A
         c.configureBean("test", sf);
         sf.setStart(false);
         
-        List<AbstractFeature> features = sf.getFeatures();
+        List<Feature> features = sf.getFeatures();
         assertEquals(1, features.size());
         
         Server server = sf.create();
@@ -117,7 +117,7 @@ public class PolicyFeatureTest extends A
         Configurer c = bus.getExtension(Configurer.class);
         c.configureBean("test2004", sf);
         
-        List<AbstractFeature> features = sf.getFeatures();
+        List<? extends Feature> features = sf.getFeatures();
         assertEquals(1, features.size());
         sf.setStart(false);
         
@@ -146,7 +146,7 @@ public class PolicyFeatureTest extends A
         Configurer c = bus.getExtension(Configurer.class);
         c.configureBean("testExternal", sf);
         
-        List<AbstractFeature> features = sf.getFeatures();
+        List<Feature> features = sf.getFeatures();
         assertEquals(1, features.size());
         sf.setStart(false);
         Server server = sf.create();

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
Fri Aug 17 13:55:24 2012
@@ -26,7 +26,7 @@ import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.service.factory.FactoryBeanListener;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -108,7 +108,7 @@ public class ClientFactoryBean extends A
 
     protected void applyFeatures(Client client) {
         if (getFeatures() != null) {
-            for (AbstractFeature feature : getFeatures()) {
+            for (Feature feature : getFeatures()) {
                 feature.initialize(client, getBus());
             }
         }

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
Fri Aug 17 13:55:24 2012
@@ -38,7 +38,7 @@ import org.apache.cxf.configuration.secu
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ConduitSelector;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
 import org.apache.cxf.service.factory.FactoryBeanListener;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
@@ -64,7 +64,7 @@ public class ClientProxyFactoryBean exte
     private String password;
     private Map<String, Object> properties;
     private Bus bus;
-    private List<AbstractFeature> features = new ArrayList<AbstractFeature>();
+    private List<Feature> features = new ArrayList<Feature>();
     private DataBinding dataBinding;
 
     public ClientProxyFactoryBean() {
@@ -366,12 +366,12 @@ public class ClientProxyFactoryBean exte
         this.properties = properties;
     }
 
-    public List<AbstractFeature> getFeatures() {
+    public List<Feature> getFeatures() {
         return features;
     }
 
-    public void setFeatures(List<AbstractFeature> f) {
-        this.features = f;
+    public void setFeatures(List<? extends Feature> f) {
+        this.features = new ArrayList<Feature>(f);
     }
 
     public DataBinding getDataBinding() {

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
Fri Aug 17 13:55:24 2012
@@ -30,7 +30,7 @@ import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.service.factory.FactoryBeanListener;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
@@ -244,7 +244,7 @@ public class ServerFactoryBean extends A
 
     protected void applyFeatures() {
         if (getFeatures() != null) {
-            for (AbstractFeature feature : getFeatures()) {
+            for (Feature feature : getFeatures()) {
                 feature.initialize(server, getBus());
             }
         }

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
(original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java
Fri Aug 17 13:55:24 2012
@@ -27,7 +27,7 @@ import java.util.Set;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -103,7 +103,7 @@ public class BasicNameManager implements
 
     private JavascriptOptionsFeature getOptions(Endpoint endpoint) {
         if (endpoint != null) {
-            for (AbstractFeature feature : endpoint.getActiveFeatures()) {
+            for (Feature feature : endpoint.getActiveFeatures()) {
                 if (feature instanceof JavascriptOptionsFeature) {
                     return (JavascriptOptionsFeature) feature;
                 }

Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
(original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
Fri Aug 17 13:55:24 2012
@@ -46,7 +46,7 @@ import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientLifeCycleListener;
 import org.apache.cxf.endpoint.ClientLifeCycleManager;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.io.CachedOutputStream;
@@ -281,7 +281,7 @@ public class MAPAggregatorImpl extends M
         if (message.getExchange() != null && message.getExchange().getEndpoint()
!= null) {
             Endpoint endpoint = message.getExchange().getEndpoint();
             if (endpoint.getActiveFeatures() != null) {
-                for (AbstractFeature feature : endpoint.getActiveFeatures()) {
+                for (Feature feature : endpoint.getActiveFeatures()) {
                     if (feature instanceof WSAddressingFeature) {
                         return (WSAddressingFeature)feature;
                     }

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/WrappedEndpoint.java Fri Aug 17
13:55:24 2012
@@ -27,7 +27,7 @@ import java.util.concurrent.Executor;
 
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
@@ -162,7 +162,7 @@ public class WrappedEndpoint implements 
     /**
      * @return the list of fearures <b>already</b> activated for this endpoint.
      */
-    public List<AbstractFeature> getActiveFeatures() {
+    public List<Feature> getActiveFeatures() {
         return wrappedEndpoint.getActiveFeatures();
     }
 }

Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
(original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
Fri Aug 17 13:55:24 2012
@@ -45,7 +45,7 @@ import org.apache.cxf.BusException;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.AbstractAttributedInterceptorProvider;
 import org.apache.cxf.message.Message;
@@ -551,7 +551,7 @@ public abstract class AbstractPolicySecu
         }
         
         
-        public List<AbstractFeature> getActiveFeatures() {
+        public List<Feature> getActiveFeatures() {
             return null;
         }
 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java?rev=1374260&r1=1374259&r2=1374260&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
Fri Aug 17 13:55:24 2012
@@ -38,6 +38,7 @@ import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.endpoint.ServerLifeCycleListener;
 import org.apache.cxf.endpoint.ServerLifeCycleManager;
 import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
 import org.apache.cxf.greeter_control.ControlImpl;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.cxf.ws.addressing.WSAddressingFeature;
@@ -183,7 +184,7 @@ public class LifeCycleTest extends Asser
                     endpoint.getEndpointInfo().getName().getLocalPart();
                 if ("SoapPort".equals(portName)) {
                     
-                    List<AbstractFeature> active = endpoint.getActiveFeatures();
+                    List<Feature> active = endpoint.getActiveFeatures();
                     assertNotNull(active);
                     assertEquals(1, active.size());
                     assertTrue(active.get(0) instanceof WSAddressingFeature);
@@ -191,7 +192,7 @@ public class LifeCycleTest extends Asser
                                AbstractFeature.getActive(active,
                                                          WSAddressingFeature.class));
                 } else {
-                    List<AbstractFeature> active = endpoint.getActiveFeatures();
+                    List<Feature> active = endpoint.getActiveFeatures();
                     assertNotNull(active);
                     assertEquals(0, active.size());
                     assertNull(AbstractFeature.getActive(active,



Mime
View raw message