cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1231235 [2/2] - in /cxf/branches/2.5.x-fixes: ./ integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/ integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc...
Date Fri, 13 Jan 2012 18:42:37 GMT
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java Fri Jan 13 18:42:35 2012
@@ -62,7 +62,7 @@ public class JAXWSMethodDispatcher exten
                     i++;
                     continue;
                 }
-                Class endpointClass = implInfo.getImplementorClass();
+                Class<?> endpointClass = implInfo.getImplementorClass();
                 Message msg = new Message("SEI_METHOD_NOT_FOUND", LOG, 
                                           m.getName(), endpointClass.getName());
                 throw new ServiceConstructionException(msg, e);
@@ -89,14 +89,14 @@ public class JAXWSMethodDispatcher exten
                                                  (Class[])method.getParameterTypes());
                 if (Modifier.isVolatile(m2.getModifiers())) {
                     //bridge method, need to map the generics
-                    Class params[] = method.getParameterTypes();
+                    Class<?> params[] = method.getParameterTypes();
                     for (Type t : method.getGenericParameterTypes()) {
                         if (t instanceof TypeVariable) {
-                            TypeVariable tv = (TypeVariable)t;
+                            TypeVariable<?> tv = (TypeVariable<?>)t;
                             for (int x = 0; x < implInfo.getSEIClass().getTypeParameters().length; x++) {
-                                TypeVariable t2 = implInfo.getSEIClass().getTypeParameters()[x];
+                                TypeVariable<?> t2 = implInfo.getSEIClass().getTypeParameters()[x];
                                 if (t2.getName().equals(tv.getName())) {
-                                    params[x] = (Class)implInfo.getSEIType().getActualTypeArguments()[x];
+                                    params[x] = (Class<?>)implInfo.getSEIType().getActualTypeArguments()[x];
                                 }
                             }
                         }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Fri Jan 13 18:42:35 2012
@@ -46,7 +46,9 @@ public class JAXWSMethodInvoker extends 
     }
      
     @Override
-    protected Object invoke(Exchange exchange, final Object serviceObject, Method m, List<Object> params) {
+    protected Object invoke(Exchange exchange, 
+                            final Object serviceObject, Method m,
+                            List<Object> params) {
         // set up the webservice request context 
         WrappedMessageContext ctx = new WrappedMessageContext(exchange.getInMessage(), Scope.APPLICATION);
         
@@ -58,7 +60,7 @@ public class JAXWSMethodInvoker extends 
             if ((params == null || params.isEmpty()) && m.getDeclaringClass().equals(Provider.class)) {
                 params = Collections.singletonList(null);
             }
-            res = CastUtils.cast((List)super.invoke(exchange, serviceObject, m, params));
+            res = CastUtils.cast((List<?>)super.invoke(exchange, serviceObject, m, params));
             if ((serviceObject instanceof Provider) 
                 && Boolean.TRUE.equals(exchange.getInMessage().
                                        getContextualProperty("jaxws.provider.interpretNullAsOneway"))

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Fri Jan 13 18:42:35 2012
@@ -254,13 +254,13 @@ public class JaxWsClientProxy extends or
         
         AsyncHandler<Object> handler;
         if (params.length > 0 && params[params.length - 1] instanceof AsyncHandler) {
-            handler = (AsyncHandler)params[params.length - 1];
+            handler = (AsyncHandler<Object>)params[params.length - 1];
         } else {
             handler = null;
         }
-        ClientCallback callback = new JaxwsClientCallback(handler);
+        ClientCallback callback = new JaxwsClientCallback<Object>(handler);
              
-        Response<Object> ret = new JaxwsResponseCallback(callback);
+        Response<Object> ret = new JaxwsResponseCallback<Object>(callback);
         client.invoke(callback, oi, params);
         return ret;
     }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/JAXWSBPNamespaceHandler.java Fri Jan 13 18:42:35 2012
@@ -63,6 +63,7 @@ public class JAXWSBPNamespaceHandler imp
         return null;
     }
 
+    @SuppressWarnings("rawtypes")
     public Set<Class> getManagedClasses() {
         return null;
     }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Fri Jan 13 18:42:35 2012
@@ -233,14 +233,14 @@ public class WrappedMessageContext imple
                     ret = reqMessage.get(Message.PROTOCOL_HEADERS);
                 }
             } else if (MessageContext.HTTP_RESPONSE_HEADERS.equals(key)) {
-                Map mp = null;
+                Map<?, ?> mp = null;
                 if (isResponse()) {
-                    mp = (Map)message.get(Message.PROTOCOL_HEADERS);
+                    mp = (Map<?, ?>)message.get(Message.PROTOCOL_HEADERS);
                 } else if (exchange != null) {
                     //may have to create the out message and add the headers
                     Message tmp = createResponseMessage();
                     if (tmp != null) {
-                        ret = (Map)tmp.get(Message.PROTOCOL_HEADERS);
+                        ret = (Map<?, ?>)tmp.get(Message.PROTOCOL_HEADERS);
                     }
                 }
                 ret = mp;

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java Fri Jan 13 18:42:35 2012
@@ -122,7 +122,7 @@ public class SOAPMessageContextImpl exte
         Object o = super.get(key);
         if (MessageContext.HTTP_RESPONSE_HEADERS.equals(key)
             || MessageContext.HTTP_REQUEST_HEADERS.equals(key)) {
-            Map mp = (Map)o;
+            Map<?, ?> mp = (Map<?, ?>)o;
             if (mp != null) {
                 if (mp.isEmpty()) {
                     return null;

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderOutInterceptor.java Fri Jan 13 18:42:35 2012
@@ -86,7 +86,7 @@ public class HolderOutInterceptor extend
             }
             for (MessagePartInfo part : parts) {
                 if (part.getIndex() > 0 && part.getTypeClass() != null) {
-                    Holder holder = (Holder)outObjects.get(part);
+                    Holder<?> holder = (Holder<?>)outObjects.get(part);
                     outObjects.put(part, holder.value);
                 }
             }
@@ -95,7 +95,7 @@ public class HolderOutInterceptor extend
             for (int x = 0; x < outObjects.size(); x++) {
                 Object o = outObjects.get(x);
                 if (o instanceof Holder) {
-                    outObjects.set(x, ((Holder)o).value);
+                    outObjects.set(x, ((Holder<?>)o).value);
                 } else {
                     holders.set(x, null);
                 }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java Fri Jan 13 18:42:35 2012
@@ -85,14 +85,15 @@ public class ProviderImpl extends javax.
     }
     
     @Override
-    public ServiceDelegate createServiceDelegate(URL url, QName qname, Class cls) {
+    public ServiceDelegate createServiceDelegate(URL url, QName qname,
+                                                 @SuppressWarnings("rawtypes") Class cls) {
         Bus bus = BusFactory.getThreadDefaultBus();
         return new ServiceImpl(bus, url, qname, cls);
     }
     //new in 2.2
     public ServiceDelegate createServiceDelegate(URL wsdlDocumentLocation,
                                                  QName serviceName,
-                                                 Class serviceClass,
+                                                 @SuppressWarnings("rawtypes") Class serviceClass,
                                                  WebServiceFeature ... features) {
         Bus bus = BusFactory.getThreadDefaultBus();
         for (WebServiceFeature f : features) {

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java Fri Jan 13 18:42:35 2012
@@ -119,7 +119,7 @@ public class EndpointDefinitionParser ex
         while (elem != null) {
             String name = elem.getLocalName();
             if ("properties".equals(name)) {
-                Map map = ctx.getDelegate().parseMapElement(elem, bean.getBeanDefinition());
+                Map<?, ?> map = ctx.getDelegate().parseMapElement(elem, bean.getBeanDefinition());
                 bean.addPropertyValue("properties", map);
             } else if ("binding".equals(name)) {
                 setFirstChildAsProperty(elem, ctx, bean, "bindingConfig");
@@ -127,7 +127,7 @@ public class EndpointDefinitionParser ex
                 || "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)
                 || "features".equals(name) || "schemaLocations".equals(name)
                 || "handlers".equals(name)) {
-                List list = ctx.getDelegate().parseListElement(elem, bean.getBeanDefinition());
+                List<?> list = ctx.getDelegate().parseListElement(elem, bean.getBeanDefinition());
                 bean.addPropertyValue(name, list);
             } else if (IMPLEMENTOR.equals(name)) {
                 ctx.getDelegate()

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java Fri Jan 13 18:42:35 2012
@@ -72,7 +72,7 @@ public class JaxWsImplementorInfo {
     }
     
     public Class<?> getEndpointClass() {
-        Class endpointInterface = getSEIClass();
+        Class<?> endpointInterface = getSEIClass();
         if (null == endpointInterface) {
             endpointInterface = getImplementorClass();
         }
@@ -228,7 +228,7 @@ public class JaxWsImplementorInfo {
         return new QName(namespace, name);
     }
 
-    private String getDefaultNamespace(Class clazz) {
+    private String getDefaultNamespace(Class<?> clazz) {
         String pkg = PackageUtils.getNamespace(PackageUtils.getPackageName(clazz));
         return StringUtils.isEmpty(pkg) ? "http://unknown.namespace/" : pkg;
     }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Fri Jan 13 18:42:35 2012
@@ -347,7 +347,7 @@ public class ConfiguredEndpointTest exte
       
     
     private TestInterceptor findTestInterceptor(List<Interceptor<? extends Message>> interceptors) {
-        for (Interceptor i : interceptors) {
+        for (Interceptor<? extends Message> i : interceptors) {
             if (i instanceof TestInterceptor) {
                 return (TestInterceptor)i;
             }
@@ -363,7 +363,7 @@ public class ConfiguredEndpointTest exte
     }
     
     
-    static final class TestInterceptor extends AbstractPhaseInterceptor {
+    static final class TestInterceptor extends AbstractPhaseInterceptor<Message> {
         public TestInterceptor(String name) {
             super(name, "");
         }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java Fri Jan 13 18:42:35 2012
@@ -57,7 +57,6 @@ public class JaxWsServerFactoryBeanTest 
         assertNotNull(server);
     }
     
-    @SuppressWarnings("unchecked")
     @Test
     public void testJaxbExtraClass() {
         JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
@@ -65,7 +64,7 @@ public class JaxWsServerFactoryBeanTest 
         sf.setAddress("http://localhost:9000/test");
         sf.setServiceClass(Hello.class);
         sf.setStart(false);
-        Map props = sf.getProperties();
+        Map<String, Object> props = sf.getProperties();
         if (props == null) {
             props = new HashMap<String, Object>();
         }
@@ -74,7 +73,7 @@ public class JaxWsServerFactoryBeanTest 
         sf.setProperties(props);
         Server server = sf.create();
         assertNotNull(server);
-        Class[] extraClass = ((JAXBDataBinding)sf.getServiceFactory().getDataBinding()).getExtraClass();
+        Class<?>[] extraClass = ((JAXBDataBinding)sf.getServiceFactory().getDataBinding()).getExtraClass();
         assertEquals(extraClass.length, 2);
         assertEquals(extraClass[0], DescriptionType.class);
         assertEquals(extraClass[1], DisplayNameType.class);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java Fri Jan 13 18:42:35 2012
@@ -61,7 +61,7 @@ public class ServiceModelUtilsTest exten
         bean.setBus(getBus());
     }
     
-    private Service getService(URL wsdl, Class implClz, QName port) throws EndpointException {
+    private Service getService(URL wsdl, Class<?> implClz, QName port) throws EndpointException {
         assertNotNull(wsdl);
         bean.setWsdlURL(wsdl.toString());
         bean.setServiceClass(implClz);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java Fri Jan 13 18:42:35 2012
@@ -153,11 +153,11 @@ public class URIMappingInterceptorDocLit
     private void assertion() throws Exception {
         Object parameters = message.getContent(List.class);
         assertNotNull(parameters);
-        assertEquals(2, ((List)parameters).size());
+        assertEquals(2, ((List<?>)parameters).size());
                  
-        Integer value = (Integer) ((List)parameters).get(0);       
+        Integer value = (Integer) ((List<?>)parameters).get(0);       
         assertEquals(1, value.intValue());
-        value = (Integer) ((List)parameters).get(1);
+        value = (Integer) ((List<?>)parameters).get(1);
         assertEquals(0, value.intValue());
         BindingOperationInfo boi = message.getExchange().get(BindingOperationInfo.class);
         assertNotNull(boi);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java Fri Jan 13 18:42:35 2012
@@ -93,7 +93,7 @@ public class URIMappingInterceptorRPCTes
         
         Object parameters = message.getContent(List.class);
         assertNotNull(parameters);
-        assertEquals(0, ((List)parameters).size());
+        assertEquals(0, ((List<?>)parameters).size());
         BindingOperationInfo boi = message.getExchange().get(BindingOperationInfo.class);
         assertNotNull(boi);
         assertEquals(new QName(ns, "sayHi"), boi.getName());
@@ -110,8 +110,8 @@ public class URIMappingInterceptorRPCTes
         
         Object parameters = message.getContent(List.class);
         assertNotNull(parameters);
-        assertEquals(1, ((List)parameters).size());
-        String value = (String) ((List)parameters).get(0);
+        assertEquals(1, ((List<?>)parameters).size());
+        String value = (String) ((List<?>)parameters).get(0);
         assertEquals("king author", value);
     }
     
@@ -160,8 +160,8 @@ public class URIMappingInterceptorRPCTes
     private void assertion() throws Exception {
         Object parameters = message.getContent(List.class);
         assertNotNull(parameters);
-        assertEquals(1, ((List)parameters).size());
-        String value = (String) ((List)parameters).get(0);
+        assertEquals(1, ((List<?>)parameters).size());
+        String value = (String) ((List<?>)parameters).get(0);
         assertEquals("king", value);        
     }
     
@@ -177,8 +177,8 @@ public class URIMappingInterceptorRPCTes
         
         Object parameters = message.getContent(List.class);
         assertNotNull(parameters);
-        assertEquals(1, ((List)parameters).size());
-        String value = (String) ((List)parameters).get(0);        
+        assertEquals(1, ((List<?>)parameters).size());
+        String value = (String) ((List<?>)parameters).get(0);        
         assertEquals("king author", value);
     }
 }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/WrapperClassGeneratorTest.java Fri Jan 13 18:42:35 2012
@@ -59,8 +59,8 @@ public class WrapperClassGeneratorTest e
         
         InterfaceInfo interfaceInfo = serviceInfo.getInterface();
         OperationInfo inf = interfaceInfo.getOperations().iterator().next();
-        Class requestClass = inf.getInput().getMessagePart(0).getTypeClass();
-        Class responseClass = inf.getOutput().getMessagePart(0).getTypeClass();
+        Class<?> requestClass = inf.getInput().getMessagePart(0).getTypeClass();
+        Class<?> responseClass = inf.getOutput().getMessagePart(0).getTypeClass();
                         
         // Create request wrapper Object
         List<String> partNames = Arrays.asList(new String[] {"arg0"});

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Fri Jan 13 18:42:35 2012
@@ -81,11 +81,10 @@ public class WebServiceContextImplTest e
     
     // CXF-3989
     @Test
-    @SuppressWarnings("unchecked")
     public void testSetHttpRequestHeadersScope() {
         MessageImpl msg = new MessageImpl();
         MessageContext context = new WrappedMessageContext(msg);
-        Map headers = new HashMap<String, List<String>>();
+        Map<String, List<String>> headers = new HashMap<String, List<String>>();
         List<String> values = new ArrayList<String>();
         values.add("Value1");
         headers.put("Header1", values);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java Fri Jan 13 18:42:35 2012
@@ -161,7 +161,7 @@ public class DispatchTest extends Abstra
         List<Interceptor<? extends Message>> interceptors = ((DispatchImpl)disp).getClient()
             .getInInterceptors();
         boolean exists = false;
-        for (Interceptor interceptor : interceptors) {
+        for (Interceptor<? extends Message> interceptor : interceptors) {
             if (interceptor instanceof LoggingInInterceptor) {
                 exists = true;
             }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AnnotationInterceptorTest.java Fri Jan 13 18:42:35 2012
@@ -174,7 +174,7 @@ public class AnnotationInterceptorTest e
     
     private boolean hasTestInterceptor(List<Interceptor<? extends Message>> interceptors) {
         boolean flag = false;
-        for (Interceptor it : interceptors) {
+        for (Interceptor<? extends Message> it : interceptors) {
             if (it instanceof TestInterceptor) {
                 flag = true;
             }
@@ -184,7 +184,7 @@ public class AnnotationInterceptorTest e
         
     private boolean hasTest2Interceptor(List<Interceptor<? extends Message>> interceptors) {
         boolean flag = false;
-        for (Interceptor it : interceptors) {
+        for (Interceptor<? extends Message> it : interceptors) {
             if (it instanceof Test2Interceptor) {
                 flag = true;
             }
@@ -204,7 +204,7 @@ public class AnnotationInterceptorTest e
     
     private boolean hasAnnotationFeatureInterceptor(List<Interceptor<? extends Message>> interceptors) {
         boolean flag = false;
-        for (Interceptor it : interceptors) {
+        for (Interceptor<? extends Message> it : interceptors) {
             if (it instanceof AnnotationFeatureInterceptor) {
                 flag = true;
             }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Test2Interceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Test2Interceptor.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Test2Interceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Test2Interceptor.java Fri Jan 13 18:42:35 2012
@@ -23,7 +23,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
-public class Test2Interceptor extends AbstractPhaseInterceptor {
+public class Test2Interceptor extends AbstractPhaseInterceptor<Message> {
 
     public Test2Interceptor() {
         super(Phase.SEND);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/TestInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/TestInterceptor.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/TestInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/TestInterceptor.java Fri Jan 13 18:42:35 2012
@@ -23,7 +23,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
-public class TestInterceptor extends AbstractPhaseInterceptor {
+public class TestInterceptor extends AbstractPhaseInterceptor<Message> {
 
     public TestInterceptor() {
         super(Phase.SEND);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java Fri Jan 13 18:42:35 2012
@@ -32,6 +32,7 @@ import javax.xml.ws.handler.MessageConte
 
 import org.apache.cxf.attachment.AttachmentImpl;
 import org.apache.cxf.attachment.ByteDataSource;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxws.context.WrappedMessageContext;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.message.Exchange;
@@ -89,11 +90,10 @@ public class ContextPropertiesMappingTes
         Object inAttachments = ctx.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
         assertNotNull("inbound attachments object must be initialized", inAttachments);
         assertTrue("inbound attachments must be in a Map", inAttachments instanceof Map);
-        assertTrue("no inbound attachments expected", ((Map)inAttachments).isEmpty());
+        assertTrue("no inbound attachments expected", ((Map<?, ?>)inAttachments).isEmpty());
     }
     
     @Test
-    @SuppressWarnings("unchecked")
     public void testCreateWebServiceContextWithInAttachments() {
         Exchange exchange = new ExchangeImpl();
         Message inMessage = new MessageImpl();
@@ -117,7 +117,7 @@ public class ContextPropertiesMappingTes
         Object inAttachments = ctx.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
         assertNotNull("inbound attachments object must be initialized", inAttachments);
         assertTrue("inbound attachments must be in a Map", inAttachments instanceof Map);
-        Map<String, DataHandler> dataHandlers = (Map)inAttachments;
+        Map<String, DataHandler> dataHandlers = CastUtils.cast((Map<?, ?>)inAttachments);
         assertEquals("two inbound attachments expected", 2, dataHandlers.size());
         
         assertTrue("part1 attachment is missing", dataHandlers.containsKey("part1"));

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Fri Jan 13 18:42:35 2012
@@ -105,10 +105,10 @@ public class JaxWsServiceFactoryBeanTest
         
         OperationInfo op = intf.getOperation(new QName(ns, "sayHi"));
         
-        Class wrapper = (Class) op.getInput().getMessageParts().get(0).getTypeClass();
+        Class<?> wrapper = op.getInput().getMessageParts().get(0).getTypeClass();
         assertNotNull(wrapper);
         
-        wrapper = (Class) op.getOutput().getMessageParts().get(0).getTypeClass();
+        wrapper = op.getOutput().getMessageParts().get(0).getTypeClass();
         assertNotNull(wrapper);
     
         assertEquals(invoker, service.getInvoker());
@@ -119,7 +119,7 @@ public class JaxWsServiceFactoryBeanTest
         
         FaultInfo f = op.getFault(new QName(ns, "BadRecordLitFault"));
         assertNotNull(f);
-        Class c = f.getProperty(Class.class.getName(), Class.class);
+        Class<?> c = f.getProperty(Class.class.getName(), Class.class);
         assertNotNull(c);
         
         assertEquals(1, f.getMessageParts().size());

Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java Fri Jan 13 18:42:35 2012
@@ -116,7 +116,7 @@ public class ClientFactoryBean extends A
 
     protected void applyProperties(Endpoint ep) {
         //Apply the AuthorizationPolicy to the endpointInfo
-        Map props = this.getProperties();
+        Map<String, Object> props = this.getProperties();
         if (props != null && props.get(AuthorizationPolicy.class.getName()) != null) {
             AuthorizationPolicy ap = (AuthorizationPolicy)props.get(AuthorizationPolicy.class.getName());
             ep.getEndpointInfo().addExtensor(ap);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/SimpleBPNamespaceHandler.java Fri Jan 13 18:42:35 2012
@@ -55,6 +55,7 @@ public class SimpleBPNamespaceHandler im
         return null;
     }
 
+    @SuppressWarnings("rawtypes")
     public Set<Class> getManagedClasses() {
         return null;
     }

Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java Fri Jan 13 18:42:35 2012
@@ -62,7 +62,7 @@ public class ServerFactoryBeanDefinition
     @Override
     protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element el, String name) {
         if ("properties".equals(name)) {
-            Map map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
+            Map<?, ?> map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
             bean.addPropertyValue("properties", map);
         } else if ("executor".equals(name)) {
             setFirstChildAsProperty(el, ctx, bean, "serviceFactory.executor");
@@ -73,7 +73,7 @@ public class ServerFactoryBeanDefinition
         } else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
             || "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)
             || "features".equals(name) || "schemaLocations".equals(name)) {
-            List list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
+            List<?> list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
             bean.addPropertyValue(name, list);
         } else {
             setFirstChildAsProperty(el, ctx, bean, name);            

Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java Fri Jan 13 18:42:35 2012
@@ -74,7 +74,6 @@ public class ClientFactoryBeanTest exten
         assertEquals("document", sop.getStyle());
     }
     
-    @SuppressWarnings("unchecked")
     @Test
     public void testJaxbExtraClass() throws Exception {
         
@@ -82,7 +81,7 @@ public class ClientFactoryBeanTest exten
         cfBean.setAddress("http://localhost/Hello");
         cfBean.setBus(getBus());
         cfBean.setServiceClass(HelloService.class);
-        Map props = cfBean.getProperties();
+        Map<String, Object> props = cfBean.getProperties();
         if (props == null) {
             props = new HashMap<String, Object>();
         }
@@ -91,7 +90,8 @@ public class ClientFactoryBeanTest exten
         cfBean.setProperties(props);
         Client client = cfBean.create();
         assertNotNull(client);
-        Class[] extraClass = ((JAXBDataBinding)cfBean.getServiceFactory().getDataBinding()).getExtraClass();
+        Class<?>[] extraClass = ((JAXBDataBinding)cfBean.getServiceFactory().getDataBinding())
+            .getExtraClass();
         assertEquals(extraClass.length, 2);
         assertEquals(extraClass[0], GreetMe.class);
         assertEquals(extraClass[1], GreetMeOneWay.class);

Modified: cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java Fri Jan 13 18:42:35 2012
@@ -96,7 +96,7 @@ public class ServerFactoryTest extends A
                   new Class[] {GreetMe.class, GreetMeOneWay.class});
         svrBean.setProperties(props);
         Server serv = svrBean.create();
-        Class[] extraClass = ((JAXBDataBinding)serv.getEndpoint().getService()
+        Class<?>[] extraClass = ((JAXBDataBinding)serv.getEndpoint().getService()
                 .getDataBinding()).getExtraClass();
         assertEquals(extraClass.length, 2);
         assertEquals(extraClass[0], GreetMe.class);

Modified: cxf/branches/2.5.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java Fri Jan 13 18:42:35 2012
@@ -234,9 +234,9 @@ public class JavascriptUtils {
             return false;
         }
         
-        Map metaInfoMap = schemaObject.getMetaInfoMap();
+        Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
         if (metaInfoMap != null) {
-            Map attribMap = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
+            Map<?, ?> attribMap = (Map<?, ?>)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
             Attr ctAttr = (Attr)attribMap.get(MimeAttribute.MIME_QNAME);
             if (ctAttr != null) {
                 return true;

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java Fri Jan 13 18:42:35 2012
@@ -135,7 +135,7 @@ public class HttpConduitBeanDefinitionPa
     protected void mapBeanOrClassElement(
         Element               element, 
         BeanDefinitionBuilder bean,
-        Class                 elementClass
+        Class<?>              elementClass
     ) {
         String elementName = element.getLocalName();
     

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java Fri Jan 13 18:42:35 2012
@@ -484,7 +484,7 @@ public class VersionTransformer {
         JAXBContext ctx = getExposedJAXBContext(tns);
         Object o = ctx.createUnmarshaller().unmarshal(ref, getExposedReferenceType(tns));
         if (o instanceof JAXBElement) {
-            o = ((JAXBElement)o).getValue();
+            o = ((JAXBElement<?>)o).getValue();
         }
         return convertToNative(o);
         
@@ -585,7 +585,7 @@ public class VersionTransformer {
         public static JAXBContext getJAXBContext() throws JAXBException {
             synchronized (Names200408.class) {
                 if (jaxbContext == null) {
-                    Class clz = org.apache.cxf.ws.addressing.v200408.ObjectFactory.class;
+                    Class<?> clz = org.apache.cxf.ws.addressing.v200408.ObjectFactory.class;
                     jaxbContext =
                         JAXBContext.newInstance(PackageUtils.getPackageName(clz),
                                                 clz.getClassLoader());
@@ -631,7 +631,7 @@ public class VersionTransformer {
         public static JAXBContext getJAXBContext() throws JAXBException {
             synchronized (Names200403.class) {
                 if (jaxbContext == null) {
-                    Class clz = org.apache.cxf.ws.addressing.v200403.ObjectFactory.class;
+                    Class<?> clz = org.apache.cxf.ws.addressing.v200403.ObjectFactory.class;
                     jaxbContext = JAXBContext.newInstance(clz.getPackage().getName(), clz.getClassLoader());
                 }
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/blueprint/WsBPHandler.java Fri Jan 13 18:42:35 2012
@@ -36,6 +36,7 @@ public class WsBPHandler implements Name
         return getClass().getClassLoader().getResource("/schemas/ws-addr-conf.xsd");
     }
 
+    @SuppressWarnings("rawtypes")
     public Set<Class> getManagedClasses() {
         return null;
     }

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionBuilder.java Fri Jan 13 18:42:35 2012
@@ -90,7 +90,7 @@ public class EndpointReferenceDomainExpr
         }
         
         try {
-            Class clz = EndpointReferenceType.class;
+            Class<?> clz = EndpointReferenceType.class;
             String pkg = PackageUtils.getPackageName(clz);
             JAXBContext context = JAXBContext.newInstance(pkg, clz.getClassLoader());
             unmarshaller = context.createUnmarshaller();

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyBeanDefinitionParser.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyBeanDefinitionParser.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyBeanDefinitionParser.java Fri Jan 13 18:42:35 2012
@@ -45,7 +45,7 @@ public class PolicyBeanDefinitionParser 
     }
 
     @Override
-    protected Class getBeanClass(Element el) {
+    protected Class<?> getBeanClass(Element el) {
         return PolicyBean.class;
     }
 

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java Fri Jan 13 18:42:35 2012
@@ -30,7 +30,6 @@ import org.apache.neethi.Constants;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;
 import org.apache.neethi.PolicyReference;
-import org.apache.neethi.builders.AssertionBuilder;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -45,7 +44,7 @@ public class PolicyBuilderTest extends A
         builder = new PolicyBuilderImpl();
         AssertionBuilderRegistry abr = new AssertionBuilderRegistryImpl();
         builder.setAssertionBuilderRegistry(abr);
-        AssertionBuilder ab = new PrimitiveAssertionBuilder();
+        PrimitiveAssertionBuilder ab = new PrimitiveAssertionBuilder();
         abr.registerBuilder(new QName("http://sample.org/Assertions", "A"), ab);
         abr.registerBuilder(new QName("http://sample.org/Assertions", "B"), ab);
         abr.registerBuilder(new QName("http://sample.org/Assertions", "C"), ab);

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java Fri Jan 13 18:42:35 2012
@@ -59,7 +59,7 @@ public class PolicyExtensionsTest extend
 
             AssertionBuilderRegistry abr = bus.getExtension(AssertionBuilderRegistry.class);
             assertNotNull(abr);
-            AssertionBuilder ab = abr.getBuilder(KNOWN);
+            AssertionBuilder<?> ab = abr.getBuilder(KNOWN);
             assertNotNull(ab);
             ab = abr.getBuilder(UNKNOWN);
             assertNull(ab);

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SamlTokenInterceptor.java Fri Jan 13 18:42:35 2012
@@ -192,7 +192,7 @@ public class SamlTokenInterceptor extend
                         if (o instanceof Validator) {
                             return (Validator)o;
                         } else if (o instanceof Class) {
-                            return (Validator)((Class)o).newInstance();
+                            return (Validator)((Class<?>)o).newInstance();
                         } else if (o instanceof String) {
                             return (Validator)ClassLoaderUtils.loadClass(o.toString(),
                                                                          SamlTokenInterceptor.class)

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Fri Jan 13 18:42:35 2012
@@ -677,7 +677,7 @@ public class WSS4JInInterceptor extends 
                     if (o instanceof Validator) {
                         return (Validator)o;
                     } else if (o instanceof Class) {
-                        return (Validator)((Class)o).newInstance();
+                        return (Validator)((Class<?>)o).newInstance();
                     } else if (o instanceof String) {
                         return (Validator)ClassLoaderUtils.loadClass(o.toString(),
                                                                      WSS4JInInterceptor.class)

Modified: cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java (original)
+++ cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java Fri Jan 13 18:42:35 2012
@@ -31,7 +31,7 @@ public class FaultBeanTest extends Asser
 
     @Test
     public void testTransform() throws Exception {
-        Class faultClass = Class.forName("org.apache.cxf.tools.fortest.cxf523.DBServiceFault");
+        Class<?> faultClass = Class.forName("org.apache.cxf.tools.fortest.cxf523.DBServiceFault");
         FaultBean bean = new FaultBean();
         WrapperBeanClass beanClass = bean.transform(faultClass, "org.apache.cxf.tools.fortest.cxf523.jaxws");
 

Modified: cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original)
+++ cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Fri Jan 13 18:42:35 2012
@@ -253,7 +253,7 @@ public class JaxwsServiceBuilderTest ext
     // TODO: assertFileEquals
     @Test
     public void testCXF188() throws Exception {
-        Class clz = AnnotationUtil.loadClass("org.apache.cxf.tools.fortest.cxf188.Demo", getClass()
+        Class<?> clz = AnnotationUtil.loadClass("org.apache.cxf.tools.fortest.cxf188.Demo", getClass()
             .getClassLoader());
         builder.setServiceClass(clz);
         ServiceInfo service = builder.createService();

Modified: cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java?rev=1231235&r1=1231234&r2=1231235&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java (original)
+++ cxf/branches/2.5.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java Fri Jan 13 18:42:35 2012
@@ -33,7 +33,7 @@ import org.junit.Test;
 public class ResponseWrapperTest extends Assert {
     JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
 
-    private OperationInfo getOperation(Class clz, String opName) {
+    private OperationInfo getOperation(Class<?> clz, String opName) {
         builder.setServiceClass(clz);
         ServiceInfo serviceInfo = builder.createService();
 
@@ -49,7 +49,7 @@ public class ResponseWrapperTest extends
     @Test
     public void testBuildFields() {
         // Test String[]
-        Class testingClass = GreeterArray.class;
+        Class<?> testingClass = GreeterArray.class;
         OperationInfo opInfo = getOperation(testingClass, "sayStringArray");
         assertNotNull(opInfo);
         
@@ -90,7 +90,7 @@ public class ResponseWrapperTest extends
     @Test
     public void testWithAnnotationWithClass() throws Exception {
         String pkgName = "org.apache.cxf.tools.fortest.withannotation.doc";
-        Class testingClass = Class.forName(pkgName + ".Greeter");
+        Class<?> testingClass = Class.forName(pkgName + ".Greeter");
 
         OperationInfo opInfo = getOperation(testingClass, "sayHi");
         



Mime
View raw message