cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1227899 [1/2] - in /cxf/trunk: api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/transport/ api/src/main/java/org/apache/cxf/wsdl/ api/src/test/java/org/apache/cxf/phase/ api/src/test/java/org/apache/cxf/ws/policy/bu...
Date Thu, 05 Jan 2012 23:58:22 GMT
Author: dkulp
Date: Thu Jan  5 23:58:20 2012
New Revision: 1227899

URL: http://svn.apache.org/viewvc?rev=1227899&view=rev
Log:
Fix rawType warnings up to rt-core

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
    cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
    cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
    cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
    cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
    cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
    cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
    cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/OldSpringSupport.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PerRequestFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Thu Jan  5 23:58:20 2012
@@ -181,18 +181,17 @@ public class PhaseInterceptorChain imple
             return;
         }
 
-        for (Interceptor handler : newhandlers) {
+        for (Interceptor<? extends Message> handler : newhandlers) {
             add(handler, force);
         }
     }
 
-    public void add(Interceptor i) {
+    public void add(Interceptor<? extends Message> i) {
         add(i, false);
     }
     
-    public void add(Interceptor i, boolean force) {
-        @SuppressWarnings("unchecked")
-        PhaseInterceptor<? extends Message> pi = (PhaseInterceptor)i;
+    public void add(Interceptor<? extends Message> i, boolean force) {
+        PhaseInterceptor<? extends Message> pi = (PhaseInterceptor<? extends Message>)i;
 
         String phaseName = pi.getPhase();        
         Integer phase = nameMap.get(phaseName);
@@ -255,7 +254,7 @@ public class PhaseInterceptorChain imple
             }
             while (state == State.EXECUTING && iterator.hasNext()) {
                 try {
-                    Interceptor currentInterceptor = iterator.next();
+                    Interceptor<Message> currentInterceptor = (Interceptor<Message>)iterator.next();
                     if (isFineLogging) {
                         LOG.fine("Invoking handleMessage on interceptor " + currentInterceptor);
                     }
@@ -381,7 +380,8 @@ public class PhaseInterceptorChain imple
                                                          String startingAfterInterceptorID) {
         updateIterator();
         while (state == State.EXECUTING && iterator.hasNext()) {
-            PhaseInterceptor currentInterceptor = (PhaseInterceptor)iterator.next();
+            PhaseInterceptor<? extends Message> currentInterceptor 
+                = (PhaseInterceptor<? extends Message>)iterator.next();
             if (currentInterceptor.getId().equals(startingAfterInterceptorID)) {
                 break;
             }
@@ -401,7 +401,8 @@ public class PhaseInterceptorChain imple
                                                          String startingAtInterceptorID) {
         updateIterator();
         while (state == State.EXECUTING && iterator.hasNext()) {
-            PhaseInterceptor currentInterceptor = (PhaseInterceptor)iterator.next();
+            PhaseInterceptor<? extends Message> currentInterceptor 
+                = (PhaseInterceptor<? extends Message>)iterator.next();
             if (currentInterceptor.getId().equals(startingAtInterceptorID)) {
                 iterator.previous();
                 break;
@@ -423,7 +424,7 @@ public class PhaseInterceptorChain imple
     @SuppressWarnings("unchecked")
     public void unwind(Message message) {
         while (iterator.hasPrevious()) {
-            Interceptor currentInterceptor = iterator.previous();
+            Interceptor<Message> currentInterceptor = (Interceptor<Message>)iterator.previous();
             if (isFineLogging) {
                 LOG.fine("Invoking handleFault on interceptor " + currentInterceptor);
             }
@@ -439,7 +440,7 @@ public class PhaseInterceptorChain imple
         }
     }
 
-    public void remove(Interceptor i) {
+    public void remove(Interceptor<? extends Message> i) {
         PhaseInterceptorIterator it = new PhaseInterceptorIterator(heads);
         while (it.hasNext()) {
             InterceptorHolder holder = it.nextInterceptorHolder();
@@ -549,7 +550,7 @@ public class PhaseInterceptorChain imple
             
                 InterceptorHolder ih2 = heads[phase];
                 while (ih2 != tails[phase].next) {
-                    PhaseInterceptor cmp = ih2.interceptor;
+                    PhaseInterceptor<? extends Message> cmp = ih2.interceptor;
                     String cmpId = cmp.getId();
                     if (cmpId != null && firstBefore == null
                         && (beforeList.contains(cmpId)
@@ -715,7 +716,6 @@ public class PhaseInterceptorChain imple
             return prev.next != null;
         }
 
-        @SuppressWarnings("unchecked")
         public Interceptor<? extends Message> next() {
             if (prev == null) {
                 if (first == null) {
@@ -748,7 +748,6 @@ public class PhaseInterceptorChain imple
         public boolean hasPrevious() {
             return prev != null;
         }
-        @SuppressWarnings("unchecked")
         public Interceptor<? extends Message> previous() {
             if (prev == null) {
                 throw new NoSuchElementException();
@@ -764,10 +763,10 @@ public class PhaseInterceptorChain imple
         public int previousIndex() {
             throw new UnsupportedOperationException();
         }
-        public void add(Interceptor o) {
+        public void add(Interceptor<? extends Message> o) {
             throw new UnsupportedOperationException();
         }
-        public void set(Interceptor o) {
+        public void set(Interceptor<? extends Message> o) {
             throw new UnsupportedOperationException();
         }
         public void remove() {
@@ -777,12 +776,12 @@ public class PhaseInterceptorChain imple
 
     
     static final class InterceptorHolder {
-        PhaseInterceptor interceptor;
+        PhaseInterceptor<? extends Message> interceptor;
         InterceptorHolder next;
         InterceptorHolder prev;
         int phaseIdx;
         
-        InterceptorHolder(PhaseInterceptor i, int p) {
+        InterceptorHolder(PhaseInterceptor<? extends Message> i, int p) {
             interceptor = i;
             phaseIdx = p;
         }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultiplexDestination.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultiplexDestination.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/transport/MultiplexDestination.java Thu Jan  5 23:58:20 2012
@@ -47,5 +47,5 @@ public interface MultiplexDestination ex
      * the current invocation
      * @return the id associated with the current invocation
      */
-    String getId(Map contextMap);
+    String getId(Map<String, Object> contextMap);
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Thu Jan  5 23:58:20 2012
@@ -339,7 +339,7 @@ public final class EndpointReferenceUtil
                     return new QName(namespaceURI, service);
                 }
             } else if (obj instanceof JAXBElement) {
-                Object val = ((JAXBElement)obj).getValue();
+                Object val = ((JAXBElement<?>)obj).getValue();
                 if (val instanceof ServiceNameType) {
                     return ((ServiceNameType)val).getValue();
                 }
@@ -369,7 +369,7 @@ public final class EndpointReferenceUtil
                         return item != null ? item.getTextContent() : null;
                     }
                 } else if (obj instanceof JAXBElement) {
-                    Object val = ((JAXBElement)obj).getValue();
+                    Object val = ((JAXBElement<?>)obj).getValue();
                     if (val instanceof ServiceNameType) {
                         return ((ServiceNameType)val).getEndpointName();
                     }
@@ -399,7 +399,7 @@ public final class EndpointReferenceUtil
                         node.setAttribute(JAXWSAConstants.WSAM_ENDPOINT_NAME, portName);
                     }
                 } else if (obj instanceof JAXBElement) {
-                    Object val = ((JAXBElement)obj).getValue();
+                    Object val = ((JAXBElement<?>)obj).getValue();
                     if (val instanceof ServiceNameType) {
                         ((ServiceNameType)val).setEndpointName(portName);
                     }
@@ -459,7 +459,7 @@ public final class EndpointReferenceUtil
                     return new QName(namespaceURI, content);
                 }
             } else if (obj instanceof JAXBElement) {
-                Object val = ((JAXBElement)obj).getValue();
+                Object val = ((JAXBElement<?>)obj).getValue();
                 if (val instanceof AttributedQNameType) {
                     return ((AttributedQNameType)val).getValue();
                 }
@@ -761,7 +761,7 @@ public final class EndpointReferenceUtil
         for (Object obj : metadata.getAny()) {
             
             if (obj instanceof JAXBElement) {
-                Object jaxbVal = ((JAXBElement)obj).getValue();
+                Object jaxbVal = ((JAXBElement<?>)obj).getValue();
 
                 if (jaxbVal instanceof ServiceNameType) {
                     Port port = null;
@@ -1011,7 +1011,7 @@ public final class EndpointReferenceUtil
      * @param messageContext the current message context 
      * @return the id embedded in the current endpoint reference or null if not found
      */
-    public static String getEndpointReferenceId(Map messageContext) {
+    public static String getEndpointReferenceId(Map<String, Object> messageContext) {
         String id = null;
         Destination destination = (Destination) messageContext.get(Destination.class.getName());
         if (destination instanceof MultiplexDestination) {

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java Thu Jan  5 23:58:20 2012
@@ -53,6 +53,7 @@ import org.apache.cxf.common.classloader
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxb.JAXBContextCache;
 import org.apache.cxf.jaxb.JAXBContextCache.CachedContextAndSchemas;
 import org.apache.cxf.staxutils.StaxUtils;
@@ -201,7 +202,8 @@ public class JAXBExtensionHelper impleme
      *  javax.xml.namespace.QName, javax.wsdl.extensions.ExtensibilityElement,
      *   java.io.PrintWriter, javax.wsdl.Definition, javax.wsdl.extensions.ExtensionRegistry)
      */
-    public void marshall(Class parent, QName qname, ExtensibilityElement obj, PrintWriter pw,
+    public void marshall(@SuppressWarnings("rawtypes") Class parent, QName qname,
+                         ExtensibilityElement obj, PrintWriter pw,
                          final Definition wsdl, ExtensionRegistry registry) throws WSDLException {
         // TODO Auto-generated method stub
         try {
@@ -239,7 +241,7 @@ public class JAXBExtensionHelper impleme
                     }
                     
                     for (Object ent : wsdl.getNamespaces().entrySet()) {
-                        Map.Entry entry = (Map.Entry)ent;
+                        Map.Entry<?, ?> entry = (Map.Entry<?, ?>)ent;
                         if (arg.equals(entry.getValue())) {
                             return (String)entry.getKey();
                         }
@@ -247,11 +249,12 @@ public class JAXBExtensionHelper impleme
                     return null;
                 }
                 
-                public Iterator getPrefixes(String arg) {
+                public Iterator<String> getPrefixes(String arg) {
                     if (arg.equals(jaxbNamespace)) {
                         arg = namespace;
                     }
-                    return wsdl.getNamespaces().keySet().iterator();
+                    Iterator<String> ret = CastUtils.cast(wsdl.getNamespaces().keySet().iterator());
+                    return ret;
                 }
             });
             
@@ -271,7 +274,8 @@ public class JAXBExtensionHelper impleme
      *   javax.wsdl.Definition,
      *   javax.wsdl.extensions.ExtensionRegistry)
      */
-    public ExtensibilityElement unmarshall(Class parent, QName qname, Element element, Definition wsdl,
+    public ExtensibilityElement unmarshall(@SuppressWarnings("rawtypes") Class parent, 
+                                           QName qname, Element element, Definition wsdl,
                                            ExtensionRegistry registry) throws WSDLException {
         try {
             Unmarshaller u = getContext().createUnmarshaller();
@@ -328,6 +332,7 @@ public class JAXBExtensionHelper impleme
                     return ctx.getPrefix(namespaceURI);
                 }
 
+                @SuppressWarnings("rawtypes")
                 public Iterator getPrefixes(String namespaceURI) {
                     if (jaxbNamespace.equals(namespaceURI)) {
                         return ctx.getPrefixes(namespace);

Modified: cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java Thu Jan  5 23:58:20 2012
@@ -73,7 +73,7 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testState() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p = setUpPhaseInterceptor("phase1", "p1");
        
         control.replay();
         chain.add(p);
@@ -120,7 +120,7 @@ public class PhaseInterceptorChainTest e
     
     @Test
     public void testAddOneInterceptor() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p = setUpPhaseInterceptor("phase1", "p1");
         control.replay();
         chain.add(p);
         Iterator<Interceptor<? extends Message>> it = chain.iterator();
@@ -131,7 +131,7 @@ public class PhaseInterceptorChainTest e
     @Test
     public void testForceAddSameInterceptor() throws Exception {
 
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p = setUpPhaseInterceptor("phase1", "p1");
         control.replay();
         chain.add(p, false);
         chain.add(p, false);
@@ -148,8 +148,8 @@ public class PhaseInterceptorChainTest e
     @Test
     public void testForceAddSameInterceptorType() throws Exception {
 
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p2 = setUpPhaseInterceptor("phase1", "p1");
         control.replay();
         chain.add(p1, false);
         chain.add(p2, false);
@@ -165,10 +165,10 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testAddTwoInterceptorsSamePhase() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         Set<String> after = new HashSet<String>();
         after.add("p1");
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2", null, after);
+        AbstractPhaseInterceptor<? extends Message> p2 = setUpPhaseInterceptor("phase1", "p2", null, after);
         control.replay();
         chain.add(p1);
         chain.add(p2);
@@ -181,13 +181,13 @@ public class PhaseInterceptorChainTest e
         
     @Test
     public void testThreeInterceptorSamePhaseWithOrder() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<? extends Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         Set<String> before = new HashSet<String>();
         before.add("p1");
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2", before, null);
+        AbstractPhaseInterceptor<? extends Message> p2 = setUpPhaseInterceptor("phase1", "p2", before, null);
         Set<String> before1 = new HashSet<String>();
         before1.add("p2");
-        AbstractPhaseInterceptor p3 = setUpPhaseInterceptor("phase1", "p3", before1, null);
+        AbstractPhaseInterceptor<? extends Message> p3 = setUpPhaseInterceptor("phase1", "p3", before1, null);
         control.replay();
         chain.add(p3);
         chain.add(p1);
@@ -202,7 +202,7 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testSingleInterceptorPass() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, false, false);
         control.replay();
         chain.add(p);
@@ -211,7 +211,7 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testSingleInterceptorFail() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, true, true);
         control.replay();
         chain.add(p);
@@ -220,7 +220,7 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testSingleInterceptorFailWithCustomLogger() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, true, true);
         setUpCustomLogger(true, true, false);
         control.replay();
@@ -230,7 +230,7 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testSingleInterceptorFailWithCustomLoggerAndDefaultLogging() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, true, true);
         setUpCustomLogger(true, true, true);
         control.replay();
@@ -240,7 +240,7 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testSingleInterceptorFailWithoutCustomLogger() throws Exception {
-        AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, true, true);
         setUpCustomLogger(false, true, false);
         control.replay();
@@ -250,9 +250,9 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testTwoInterceptorsInSamePhasePass() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, false);
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase1", "p2");
         setUpPhaseInterceptorInvocations(p2, false, false);
         control.replay();
         chain.add(p2);
@@ -262,11 +262,11 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testThreeInterceptorsInSamePhaseSecondFail() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, true);
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase1", "p2");
         setUpPhaseInterceptorInvocations(p2, true, true);
-        AbstractPhaseInterceptor p3 = setUpPhaseInterceptor("phase1", "p3");
+        AbstractPhaseInterceptor<Message> p3 = setUpPhaseInterceptor("phase1", "p3");
         control.replay();
         chain.add(p1);
         chain.add(p2);
@@ -276,9 +276,9 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testTwoInterceptorsInSamePhaseSecondFail() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, true);
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase1", "p2");
         setUpPhaseInterceptorInvocations(p2, true, true);
         control.replay();
         chain.add(p1);
@@ -288,9 +288,9 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testTwoInterceptorsInDifferentPhasesPass() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, false);
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase2", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase2", "p2");
         setUpPhaseInterceptorInvocations(p2, false, false);
         control.replay();
         chain.add(p1);
@@ -300,9 +300,9 @@ public class PhaseInterceptorChainTest e
 
     @Test
     public void testTwoInterceptorsInDifferentPhasesSecondFail() throws Exception {
-        AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
+        AbstractPhaseInterceptor<Message> p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, true);
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase2", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase2", "p2");
         setUpPhaseInterceptorInvocations(p2, true, true);
         control.replay();
         chain.add(p1);
@@ -313,9 +313,9 @@ public class PhaseInterceptorChainTest e
     @Test
     public void testInsertionInDifferentPhasePass() throws Exception {
 
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase2", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase2", "p2");
         setUpPhaseInterceptorInvocations(p2, false, false);
-        AbstractPhaseInterceptor p3 = setUpPhaseInterceptor("phase3", "p3");
+        AbstractPhaseInterceptor<Message> p3 = setUpPhaseInterceptor("phase3", "p3");
         setUpPhaseInterceptorInvocations(p3, false, false);
         InsertingPhaseInterceptor p1 = new InsertingPhaseInterceptor(chain, p2,
                 "phase1", "p1");
@@ -330,11 +330,11 @@ public class PhaseInterceptorChainTest e
     @Test
     public void testInsertionInSamePhasePass() throws Exception {
 
-        AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2");
+        AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase1", "p2");
         setUpPhaseInterceptorInvocations(p2, false, false);
         Set<String> after3 = new HashSet<String>();
         after3.add("p2");
-        AbstractPhaseInterceptor p3 = setUpPhaseInterceptor("phase1", "p3", null, after3);
+        AbstractPhaseInterceptor<Message> p3 = setUpPhaseInterceptor("phase1", "p3", null, after3);
         setUpPhaseInterceptorInvocations(p3, false, false);
         InsertingPhaseInterceptor p1 = new InsertingPhaseInterceptor(chain, p3,
                 "phase1", "p1");
@@ -391,16 +391,17 @@ public class PhaseInterceptorChainTest e
         assertEquals(1, p3.invoked);
     }
     
-    AbstractPhaseInterceptor setUpPhaseInterceptor(String phase, String id) throws Exception {
+    AbstractPhaseInterceptor<Message> setUpPhaseInterceptor(String phase, String id) throws Exception {
         return setUpPhaseInterceptor(phase, id, null, null);
     }
 
-    AbstractPhaseInterceptor setUpPhaseInterceptor(final String phase, 
+    AbstractPhaseInterceptor<Message> setUpPhaseInterceptor(final String phase, 
                                                    final String id,
                                                    Set<String> b,
                                                    Set<String> a) throws Exception {
         
-        AbstractPhaseInterceptor p = control
+        @SuppressWarnings("unchecked")
+        AbstractPhaseInterceptor<Message> p = control
             .createMock(AbstractPhaseInterceptor.class);
         
         if (a == null) {
@@ -430,7 +431,7 @@ public class PhaseInterceptorChainTest e
     
     
     @SuppressWarnings("unchecked")
-    void setUpPhaseInterceptorInvocations(AbstractPhaseInterceptor p,
+    void setUpPhaseInterceptorInvocations(AbstractPhaseInterceptor<Message> p,
             boolean fail, boolean expectFault) {
         p.handleMessage(message);
         if (fail) {
@@ -482,10 +483,10 @@ public class PhaseInterceptorChainTest e
 
         private final PhaseInterceptorChain insertionChain;
 
-        private final AbstractPhaseInterceptor insertionInterceptor;
+        private final AbstractPhaseInterceptor<? extends Message> insertionInterceptor;
 
         public InsertingPhaseInterceptor(PhaseInterceptorChain c,
-                AbstractPhaseInterceptor i, String phase, String id) {
+                AbstractPhaseInterceptor<? extends Message> i, String phase, String id) {
             super(id, phase);
             insertionChain = c;
             insertionInterceptor = i;

Modified: cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java Thu Jan  5 23:58:20 2012
@@ -42,13 +42,13 @@ public class JaxbAssertionBuilderTest ex
     public void testConstructors() throws Exception {        
         QName qn = new QName("http://cxf.apache.org/test/assertions/foo", "FooType");
         try {
-            new JaxbAssertionBuilder("org.apache.cxf.test.assertions.foo.UnknownType", qn);
+            new JaxbAssertionBuilder<Object>("org.apache.cxf.test.assertions.foo.UnknownType", qn);
             fail("Expected ClassNotFoundException not thrown.");
         } catch (ClassNotFoundException ex) {
             // expected
         }
-        assertNotNull(new JaxbAssertionBuilder(qn)); 
-        assertNotNull(new JaxbAssertionBuilder(FooType.class.getName(), qn));   
+        assertNotNull(new JaxbAssertionBuilder<Object>(qn)); 
+        assertNotNull(new JaxbAssertionBuilder<Object>(FooType.class.getName(), qn));   
         assertNotNull(new JaxbAssertionBuilder<FooType>(FooType.class, qn));
     }
     

Modified: cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java Thu Jan  5 23:58:20 2012
@@ -24,10 +24,10 @@ import java.util.List;
 
 import javax.xml.namespace.QName;
 
-import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.test.assertions.foo.FooType;
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.All;
+import org.apache.neethi.Assertion;
 import org.apache.neethi.Constants;
 import org.apache.neethi.ExactlyOne;
 import org.apache.neethi.Policy;
@@ -111,7 +111,7 @@ public class JaxbAssertionTest extends A
         assertion.setName(qn);
         assertion.setData(data);
 
-        JaxbAssertion normalised = (JaxbAssertion)assertion.normalize();
+        JaxbAssertion<?> normalised = (JaxbAssertion<?>)assertion.normalize();
         assertTrue(normalised.equal(assertion));       
         assertSame(assertion.getData(), normalised.getData()); 
         
@@ -119,12 +119,11 @@ public class JaxbAssertionTest extends A
         PolicyComponent pc = assertion.normalize();
         assertEquals(Constants.TYPE_POLICY, pc.getType());
         Policy p = (Policy)pc; 
-        Iterator alternatives = p.getAlternatives();
+        Iterator<List<Assertion>> alternatives = p.getAlternatives();
 
         int total = 0;
         for (int i = 0; i < 2; i++) {
-            List<PolicyComponent> pcs = 
-                CastUtils.cast((List<?>)(alternatives.next()), PolicyComponent.class);
+            List<Assertion> pcs = alternatives.next();
             if (!pcs.isEmpty()) {
                 assertTrue(assertion.equal(pcs.get(0)));
                 total += pcs.size();

Modified: cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java Thu Jan  5 23:58:20 2012
@@ -96,7 +96,7 @@ public class JAXBExtensionHelperTest ext
 
         wsdlDefinition = wsdlReader.readWSDL(file);
 
-        List extList = wsdlDefinition.getExtensibilityElements();
+        List<?> extList = wsdlDefinition.getExtensibilityElements();
         NewServiceType newService = null;
         for (Object ext : extList) {
             if (ext instanceof NewServiceType) {
@@ -162,7 +162,7 @@ public class JAXBExtensionHelperTest ext
         Service s = wsdlDefinition.getService(new QName("http://cxf.apache.org/test/hello_world",
             "HelloWorldService"));
         Port p = s.getPort("HelloWorldPort");
-        List extPortList = p.getExtensibilityElements();
+        List<?> extPortList = p.getExtensibilityElements();
     
         TestPolicyType tp = null;
         AnotherPolicyType ap = null;

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/CastUtils.java Thu Jan  5 23:58:20 2012
@@ -20,6 +20,8 @@
 package org.apache.cxf.helpers;
 
 import java.util.Collection;
+import java.util.Dictionary;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +40,13 @@ public final class CastUtils {
     public static <T, U> Map<T, U> cast(Map<?, ?> p, Class<T> t, Class<U> u) {
         return (Map<T, U>)p;
     }
+
+    public static <T, U> Dictionary<T, U> cast(Dictionary<?, ?> p) {
+        return (Dictionary<T, U>)p;
+    }
+    public static <T, U> Dictionary<T, U> cast(Dictionary<?, ?> p, Class<T> t, Class<U> u) {
+        return (Dictionary<T, U>)p;
+    }
     
     public static <T> Collection<T> cast(Collection<?> p) {
         return (Collection<T>)p;
@@ -60,7 +69,15 @@ public final class CastUtils {
     public static <T> Iterator<T> cast(Iterator<?> p, Class<T> cls) {
         return (Iterator<T>)p;
     }
+
+    public static <T> Enumeration<T> cast(Enumeration<?> p) {
+        return (Enumeration<T>)p;
+    }
     
+    public static <T> Enumeration<T> cast(Enumeration<?> p, Class<T> cls) {
+        return (Enumeration<T>)p;
+    }
+
     public static <T> Set<T> cast(Set<?> p) {
         return (Set<T>)p;
     }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java Thu Jan  5 23:58:20 2012
@@ -29,14 +29,14 @@ import org.apache.cxf.bus.extension.Exte
 public class CXFBusFactory extends BusFactory {
     
     public Bus createBus() {
-        return createBus(new HashMap<Class, Object>());
+        return createBus(new HashMap<Class<?>, Object>());
     }
     
-    public Bus createBus(Map<Class, Object> e) {
+    public Bus createBus(Map<Class<?>, Object> e) {
         return createBus(e, new HashMap<String, Object>());
     }
     
-    public Bus createBus(Map<Class, Object> e, Map<String, Object> properties) {
+    public Bus createBus(Map<Class<?>, Object> e, Map<String, Object> properties) {
         ExtensionManagerBus bus = new ExtensionManagerBus(e, properties);
         possiblySetDefaultBus(bus);
         initializeBus(bus);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java Thu Jan  5 23:58:20 2012
@@ -53,7 +53,7 @@ public class CXFBusImpl extends Abstract
         FORCE_LOGGING = b;
     }
     
-    protected final Map<Class, Object> extensions;
+    protected final Map<Class<?>, Object> extensions;
     protected String id;
     private BusState state;      
     private final Collection<AbstractFeature> features = new CopyOnWriteArrayList<AbstractFeature>();
@@ -63,11 +63,11 @@ public class CXFBusImpl extends Abstract
         this(null);
     }
 
-    public CXFBusImpl(Map<Class, Object> extensions) {
+    public CXFBusImpl(Map<Class<?>, Object> extensions) {
         if (extensions == null) {
-            extensions = new ConcurrentHashMap<Class, Object>();
+            extensions = new ConcurrentHashMap<Class<?>, Object>();
         } else {
-            extensions = new ConcurrentHashMap<Class, Object>(extensions);
+            extensions = new ConcurrentHashMap<Class<?>, Object>(extensions);
         }
         this.extensions = extensions;
         

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java Thu Jan  5 23:58:20 2012
@@ -72,7 +72,7 @@ public class BlueprintBeanLocator implem
             if (cls == null) {
                 try {
                     Method m = ReflectionUtil.findMethod(container.getClass(), "loadClass", String.class);
-                    cls = (Class)ReflectionUtil.setAccessible(m).invoke(container, bm.getClassName());
+                    cls = (Class<?>)ReflectionUtil.setAccessible(m).invoke(container, bm.getClassName());
                 } catch (Exception e) {
                     //ignore
                 }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java Thu Jan  5 23:58:20 2012
@@ -105,7 +105,7 @@ public class BundleDelegatingClassLoader
     }
 
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-        Class clazz;
+        Class<?> clazz;
         try {
             clazz = findClass(name);
         } catch (ClassNotFoundException cnfe) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java Thu Jan  5 23:58:20 2012
@@ -84,6 +84,7 @@ public class CXFCoreNamespaceHandler imp
         return null;
     }
 
+    @SuppressWarnings("rawtypes")
     public Set<Class> getManagedClasses() {
         //probably should have the various stuff in cxf-api in here?
         return null;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java Thu Jan  5 23:58:20 2012
@@ -53,7 +53,7 @@ public class ExtensionManagerBus extends
     private static final String BUS_ID_PROPERTY_NAME = "org.apache.cxf.bus.id";
     private final ExtensionManagerImpl extensionManager;
     
-    public ExtensionManagerBus(Map<Class, Object> e, Map<String, Object> properties,
+    public ExtensionManagerBus(Map<Class<?>, Object> e, Map<String, Object> properties,
           ClassLoader extensionClassLoader) {
         super(e);
 
@@ -135,7 +135,7 @@ public class ExtensionManagerBus extends
         
     }
     
-    public ExtensionManagerBus(Map<Class, Object> e, Map<String, Object> properties) {
+    public ExtensionManagerBus(Map<Class<?>, Object> e, Map<String, Object> properties) {
        this(e, properties, Thread.currentThread().getContextClassLoader());
     }
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Thu Jan  5 23:58:20 2012
@@ -56,10 +56,10 @@ public class ExtensionManagerImpl implem
     private final ClassLoader loader;
     private ResourceManager resourceManager;
     private Map<String, Extension> all = new LinkedHashMap<String, Extension>();
-    private final Map<Class, Object> activated;
+    private final Map<Class<?>, Object> activated;
     private final Bus bus;
 
-    public ExtensionManagerImpl(ClassLoader cl, Map<Class, Object> initialExtensions, 
+    public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object> initialExtensions, 
                                 ResourceManager rm, Bus b) {
         this(new String[] {BUS_EXTENSION_RESOURCE, BUS_EXTENSION_RESOURCE_XML,
                            BUS_EXTENSION_RESOURCE_OLD_XML},
@@ -67,14 +67,14 @@ public class ExtensionManagerImpl implem
     }
     public ExtensionManagerImpl(String resource, 
                                 ClassLoader cl, 
-                                Map<Class, Object> initialExtensions, 
+                                Map<Class<?>, Object> initialExtensions, 
                                 ResourceManager rm,
                                 Bus b) {
         this(new String[] {resource}, cl, initialExtensions, rm, b);
     }    
     public ExtensionManagerImpl(String resources[], 
                                 ClassLoader cl, 
-                                Map<Class, Object> initialExtensions, 
+                                Map<Class<?>, Object> initialExtensions, 
                                 ResourceManager rm,
                                 Bus b) {
 
@@ -241,15 +241,15 @@ public class ExtensionManagerImpl implem
     }
     
     private void invokeSetterActivationNSMethod(Object target, Object value) {
-        Class clazz = target.getClass();
+        Class<?> clazz = target.getClass();
         String methodName = ACTIVATION_NAMESPACES_SETTER_METHOD_NAME;
         while (clazz != Object.class) {
             Method[] methods = clazz.getMethods();
             for (int i = 0; i < methods.length; i++) {
                 Method method = methods[i];
-                Class params[] = method.getParameterTypes();
+                Class<?> params[] = method.getParameterTypes();
                 if (method.getName().equals(methodName) && params.length == 1) {
-                    Class paramType = params[0];
+                    Class<?> paramType = params[0];
                     if (paramType.isInstance(value)) {
                         try {
                             method.invoke(target, new Object[] {value});

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java Thu Jan  5 23:58:20 2012
@@ -27,6 +27,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.service.factory.AbstractServiceFactoryBean;
 import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
 import org.osgi.service.cm.Configuration;
@@ -49,10 +50,12 @@ public class ManagedWorkQueueList implem
         return FACTORY_PID;
     }
 
-    public void updated(String pid, Dictionary properties) throws ConfigurationException {
+    public void updated(String pid, @SuppressWarnings("rawtypes") Dictionary props) 
+        throws ConfigurationException {
         if (pid == null) {
             return;
         }
+        Dictionary<String, String> properties = CastUtils.cast(props);
         String queueName = (String)properties.get(AutomaticWorkQueueImpl.PROPERTY_NAME);
         if (queues.containsKey(queueName)) {
             queues.get(queueName).update(properties);
@@ -76,7 +79,7 @@ public class ManagedWorkQueueList implem
             if (configurationAdmin != null) {
                 Configuration selectedConfig = findConfigForQueueName(queue, configurationAdmin);
                 if (selectedConfig != null) {
-                    Dictionary properties = queue.getProperties();
+                    Dictionary<String, String> properties = queue.getProperties();
                     selectedConfig.update(properties);
                 }
             }
@@ -91,6 +94,7 @@ public class ManagedWorkQueueList implem
         String filter = "(service.factoryPid=" + ManagedWorkQueueList.FACTORY_PID + ")";
         Configuration[] configs = configurationAdmin.listConfigurations(filter);
         for (Configuration configuration : configs) {
+            @SuppressWarnings("rawtypes")
             Dictionary props = configuration.getProperties();
             String name = (String)props.get(AutomaticWorkQueueImpl.PROPERTY_NAME);
             if (queue.getName().equals(name)) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Thu Jan  5 23:58:20 2012
@@ -48,6 +48,7 @@ import org.apache.cxf.endpoint.ClientLif
 import org.apache.cxf.endpoint.ClientLifeCycleManager;
 import org.apache.cxf.endpoint.ServerLifeCycleListener;
 import org.apache.cxf.endpoint.ServerLifeCycleManager;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
 import org.apache.cxf.workqueue.WorkQueueManager;
 import org.osgi.framework.Bundle;
@@ -152,7 +153,7 @@ public class OSGiExtensionLocator implem
     
     protected void register(final Bundle bundle) throws IOException {
         List<Extension> list = extensions.get(bundle.getBundleId());
-        Enumeration e = bundle.findEntries("META-INF/cxf/", "bus-extensions.txt", false);
+        Enumeration<URL> e = CastUtils.cast(bundle.findEntries("META-INF/cxf/", "bus-extensions.txt", false));
         if (e != null) {
             while (e.hasMoreElements()) {
                 final URL u = (URL)e.nextElement();
@@ -273,6 +274,7 @@ public class OSGiExtensionLocator implem
             return !pvt.booleanValue();
         }
         private Version getBundleVersion(Bundle bundle) {
+            @SuppressWarnings("rawtypes")
             Dictionary headers = bundle.getHeaders();
             String version = (String) headers.get(Constants.BUNDLE_VERSION);
             return (version != null) ? Version.parseVersion(version) : Version.emptyVersion;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java Thu Jan  5 23:58:20 2012
@@ -48,16 +48,18 @@ public class BusExtensionPostProcessor i
         return bean;
     }
 
-    @SuppressWarnings("unchecked")
     public Object postProcessBeforeInitialization(Object bean, String beanId) throws BeansException {
         if (bean instanceof BusExtension && null != getBus()) {
-            Class cls = ((BusExtension)bean).getRegistrationType();
-            getBus().setExtension(bean, cls);
+            Class<? extends Object> cls = ((BusExtension)bean).getRegistrationType();
+            registerExt(bean, cls);
         } else if (bean instanceof Bus && Bus.DEFAULT_BUS_ID.equals(beanId)) {
             bus = (Bus)bean;
         }
         return bean;
     }
+    private <T> void registerExt(Object bean, Class<T> cls) {
+        getBus().setExtension(cls.cast(bean), cls);
+    }
     
     private Bus getBus() {
         if (bus == null) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/OldSpringSupport.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/OldSpringSupport.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/OldSpringSupport.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/OldSpringSupport.java Thu Jan  5 23:58:20 2012
@@ -30,7 +30,7 @@ import org.springframework.beans.factory
 /**
  * 
  */
-public final class OldSpringSupport implements FactoryBean, BeanNameAware {
+public final class OldSpringSupport implements FactoryBean<Object>, BeanNameAware {
     public static final Logger LOG = LogUtils.getL7dLogger(OldSpringSupport.class);
     Bus bus;
     Class<?> cls;
@@ -60,7 +60,7 @@ public final class OldSpringSupport impl
         return bus.getExtension(cls);
     }
 
-    public Class getObjectType() {
+    public Class<?> getObjectType() {
         return cls;
     }
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java Thu Jan  5 23:58:20 2012
@@ -236,7 +236,7 @@ public class SpringBeanLocator implement
             } 
             
             if (ids != null) {
-                for (Iterator itr = ids.iterator(); itr.hasNext();) {
+                for (Iterator<?> itr = ids.iterator(); itr.hasNext();) {
                     Object o = itr.next();
                     if (o instanceof TypedStringValue) {
                         if (searchValue.equals(((TypedStringValue) o).getValue())) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java Thu Jan  5 23:58:20 2012
@@ -44,7 +44,7 @@ import org.springframework.context.suppo
  * 
  */
 public class SpringBus extends ExtensionManagerBus 
-    implements ApplicationContextAware, ApplicationListener {
+    implements ApplicationContextAware, ApplicationListener<ApplicationEvent> {
 
     AbstractApplicationContext ctx;
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java Thu Jan  5 23:58:20 2012
@@ -82,7 +82,7 @@ public class FailoverTargetSelector exte
                 exchange.getBindingOperationInfo();
             Object[] params = message.getContent(List.class).toArray();
             Map<String, Object> context =
-                CastUtils.cast((Map)message.get(Message.INVOCATION_CONTEXT));
+                CastUtils.cast((Map<?, ?>)message.get(Message.INVOCATION_CONTEXT));
             InvocationContext invocation = 
                 new InvocationContext(endpoint, 
                                       bindingOperationInfo,
@@ -282,7 +282,7 @@ public class FailoverTargetSelector exte
      */
     protected void overrideAddressProperty(Map<String, Object> context) {
         Map<String, Object> requestContext =
-            CastUtils.cast((Map)context.get(Client.REQUEST_CONTEXT));
+            CastUtils.cast((Map<?, ?>)context.get(Client.REQUEST_CONTEXT));
         if (requestContext != null) {
             requestContext.put(Message.ENDPOINT_ADDRESS,
                                getEndpoint().getEndpointInfo().getAddress());

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java Thu Jan  5 23:58:20 2012
@@ -51,7 +51,7 @@ public class NodeDataReader implements D
         return read(input);
     }
 
-    public Object read(QName name, Node input, Class type) {
+    public Object read(QName name, Node input, Class<?> type) {
         if (SAXSource.class.isAssignableFrom(type)) {
             XMLStreamReader reader = StaxUtils.createXMLStreamReader((Element)input);
             return new StaxSource(reader);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java Thu Jan  5 23:58:20 2012
@@ -66,7 +66,7 @@ public class XMLStreamDataReader impleme
         return read(null, input, part.getTypeClass());
     }
 
-    public Object read(final QName name, XMLStreamReader input, Class type) {
+    public Object read(final QName name, XMLStreamReader input, Class<?> type) {
         if (Source.class.equals(type) && message != null) {
             //generic Source, find the preferred type
             String s = (String)message.getContextualProperty(SourceDataBinding.PREFERRED_FORMAT);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java Thu Jan  5 23:58:20 2012
@@ -30,8 +30,9 @@ import org.apache.ws.commons.schema.exte
 
 public class MimeSerializer implements ExtensionSerializer {
     
-    public void serialize(XmlSchemaObject schemaObject, Class classOfType, Node domNode) {
-        Map metaInfoMap = schemaObject.getMetaInfoMap();
+    public void serialize(XmlSchemaObject schemaObject, 
+                          @SuppressWarnings("rawtypes") Class classOfType, Node domNode) {
+        Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
         MimeAttribute mimeType = (MimeAttribute)metaInfoMap.get(MimeAttribute.MIME_QNAME);
 
         Element elt = (Element)domNode;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java Thu Jan  5 23:58:20 2012
@@ -92,7 +92,7 @@ public class StaxDataBinding extends Abs
             return read(null, input, part.getTypeClass());
         }
 
-        public Object read(QName name, XMLStreamReader input, Class type) {
+        public Object read(QName name, XMLStreamReader input, Class<?> type) {
             return input;
         }
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java Thu Jan  5 23:58:20 2012
@@ -55,9 +55,9 @@ public class StaxDataBindingFeature exte
 
     private void removeInterceptor(List<Interceptor<? extends Message>> inInterceptors, String name) {
 
-        for (Interceptor i : inInterceptors) {
+        for (Interceptor<? extends Message> i : inInterceptors) {
             if (i instanceof PhaseInterceptor) {
-                PhaseInterceptor p = (PhaseInterceptor)i;
+                PhaseInterceptor<? extends Message> p = (PhaseInterceptor<? extends Message>)i;
 
                 if (p.getId().equals(name)) {
                     inInterceptors.remove(p);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Thu Jan  5 23:58:20 2012
@@ -493,8 +493,8 @@ public class ClientImpl
             if (context == null) {
                 context = new HashMap<String, Object>();
             }
-            reqContext = CastUtils.cast((Map)context.get(REQUEST_CONTEXT));
-            resContext = CastUtils.cast((Map)context.get(RESPONSE_CONTEXT));
+            reqContext = CastUtils.cast((Map<?, ?>)context.get(REQUEST_CONTEXT));
+            resContext = CastUtils.cast((Map<?, ?>)context.get(RESPONSE_CONTEXT));
             if (reqContext == null) { 
                 reqContext = new HashMap<String, Object>(getRequestContext());
                 context.put(REQUEST_CONTEXT, reqContext);
@@ -629,7 +629,7 @@ public class ClientImpl
         }
 
         // Grab the response objects if there are any
-        List resList = null;
+        List<Object> resList = null;
         Message inMsg = exchange.getInMessage();
         if (inMsg != null) {
             if (null != resContext) {
@@ -639,7 +639,7 @@ public class ClientImpl
                 }
                 responseContext.put(Thread.currentThread(), resContext);
             }
-            resList = inMsg.getContent(List.class);
+            resList = CastUtils.cast(inMsg.getContent(List.class));
         }
 
         // check for an incoming fault

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractEndpointSelectionInterceptor.java Thu Jan  5 23:58:20 2012
@@ -48,7 +48,7 @@ public abstract class AbstractEndpointSe
 
     public void handleMessage(Message message) throws Fault {
         Exchange ex = message.getExchange();
-        Set<Endpoint> endpoints = CastUtils.cast((Set)ex.get(MultipleEndpointObserver.ENDPOINTS));
+        Set<Endpoint> endpoints = CastUtils.cast((Set<?>)ex.get(MultipleEndpointObserver.ENDPOINTS));
 
         Endpoint ep = selectEndpoint(message, endpoints);
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java Thu Jan  5 23:58:20 2012
@@ -161,7 +161,7 @@ public abstract class AbstractInDatabind
                 continue;
             }
             
-            Collection bodyParts = msgInfo.getMessageParts();
+            Collection<MessagePartInfo> bodyParts = msgInfo.getMessageParts();
             if (bodyParts.size() == 0 || bodyParts.size() <= index) {
                 itr.remove();
                 continue;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java Thu Jan  5 23:58:20 2012
@@ -97,14 +97,14 @@ public class AnnotationInterceptors {
         return theAnnotationObjects;
     }
     
-    @SuppressWarnings("unchecked")
     private List<Interceptor<? extends Message>> getAnnotationInterceptorList(Class<? extends Annotation> t) {
+        @SuppressWarnings("rawtypes")
         List<Interceptor> i = getAnnotationObject(t, Interceptor.class);
         if (i == null) {
             return null;
         }
         List<Interceptor<? extends Message>> m = new ArrayList<Interceptor<? extends Message>>();
-        for (Interceptor i2 : i) {
+        for (Interceptor<?> i2 : i) {
             m.add(i2);
         }
         return m;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java Thu Jan  5 23:58:20 2012
@@ -124,7 +124,7 @@ public class FaultOutInterceptor extends
 
     private boolean isDOMSupported(DataBinding db) {
         boolean supportsDOM = false;
-        for (Class c : db.getSupportedWriterFormats()) {
+        for (Class<?> c : db.getSupportedWriterFormats()) {
             if (c.equals(Node.class)) {
                 supportsDOM = true;
             }
@@ -155,11 +155,11 @@ public class FaultOutInterceptor extends
      * @param class1
      * @return
      */
-    public FaultInfo getFaultForClass(BindingOperationInfo op, Class class1) {
+    public FaultInfo getFaultForClass(BindingOperationInfo op, Class<?> class1) {
         for (BindingFaultInfo bfi : op.getFaults()) {
 
             FaultInfo faultInfo = bfi.getFaultInfo();
-            Class<?> c = (Class)faultInfo.getProperty(Class.class.getName());
+            Class<?> c = (Class<?>)faultInfo.getProperty(Class.class.getName());
             if (c.isAssignableFrom(class1)) {
                 return faultInfo;
             }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java Thu Jan  5 23:58:20 2012
@@ -72,7 +72,7 @@ public class ServiceInvokerInterceptor e
                         if (result instanceof MessageContentsList) {
                             resList = (MessageContentsList)result;
                         } else if (result instanceof List) {
-                            resList = new MessageContentsList((List)result);
+                            resList = new MessageContentsList((List<?>)result);
                         } else if (result.getClass().isArray()) {
                             resList = new MessageContentsList((Object[])result);
                         } else {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java Thu Jan  5 23:58:20 2012
@@ -123,9 +123,9 @@ public class StaxInInterceptor extends A
         } else if (o != null) {
             XMLInputFactory xif = (XMLInputFactory)factories.get(o);
             if (xif == null) {
-                Class cls;
+                Class<?> cls;
                 if (o instanceof Class) {
-                    cls = (Class)o;
+                    cls = (Class<?>)o;
                 } else if (o instanceof String) {
                     try {
                         cls = ClassLoaderUtils.loadClass((String)o, StaxInInterceptor.class);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java Thu Jan  5 23:58:20 2012
@@ -120,9 +120,9 @@ public class StaxOutInterceptor extends 
         } else if (o != null) {
             XMLOutputFactory xif = (XMLOutputFactory)factories.get(o);
             if (xif == null) {
-                Class cls;
+                Class<?> cls;
                 if (o instanceof Class) {
-                    cls = (Class)o;
+                    cls = (Class<?>)o;
                 } else if (o instanceof String) {
                     try {
                         cls = ClassLoaderUtils.loadClass((String)o, StaxInInterceptor.class);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Thu Jan  5 23:58:20 2012
@@ -147,10 +147,10 @@ public class URIMappingInterceptor exten
             LOG.fine(order.size()
                      + " parameters definded in WSDL but found " 
                      + params.size() + " in request!");            
-            Collection rest = CollectionUtils.diff(order, params.keySet());
+            Collection<String> rest = CollectionUtils.diff(order, params.keySet());
             if (rest != null && rest.size() > 0) {
                 LOG.fine("Set the following parameters to null: " + rest);
-                for (Iterator iter = rest.iterator(); iter.hasNext();) {
+                for (Iterator<String> iter = rest.iterator(); iter.hasNext();) {
                     String key = (String)iter.next();
                     orderedParameters.put(key, null);
                 }
@@ -186,7 +186,7 @@ public class URIMappingInterceptor exten
         
         Method method = getMethod(message, operation);        
         
-        Class[] types = method.getParameterTypes();        
+        Class<?>[] types = method.getParameterTypes();        
         
         for (String key : queries.keySet()) {
             MessagePartInfo inf = null;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java Thu Jan  5 23:58:20 2012
@@ -37,7 +37,7 @@ public class NamePasswordCallbackHandler
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(NamePasswordCallbackHandler.class);
     private static final Logger LOG = LogUtils.getL7dLogger(NamePasswordCallbackHandler.class);
     private static final String PASSWORD_CALLBACK_NAME = "setObject";
-    private static final Class[] PASSWORD_CALLBACK_TYPES = 
+    private static final Class<?>[] PASSWORD_CALLBACK_TYPES = 
         new Class[]{Object.class, char[].class, String.class};
     
     private String username;  

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java Thu Jan  5 23:58:20 2012
@@ -222,7 +222,7 @@ public abstract class AbstractInvoker im
      */
     private static Method matchMethod(Method methodToMatch, Object targetObject) {
         if (isJdkDynamicProxy(targetObject)) {
-            Class[] interfaces = targetObject.getClass().getInterfaces();
+            Class<?>[] interfaces = targetObject.getClass().getInterfaces();
             for (int i = 0; i < interfaces.length; i++) {
                 Method m = getMostSpecificMethod(methodToMatch, interfaces[i]);
                 if (!methodToMatch.equals(m)) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PerRequestFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PerRequestFactory.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PerRequestFactory.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PerRequestFactory.java Thu Jan  5 23:58:20 2012
@@ -36,9 +36,9 @@ import org.apache.cxf.resource.ResourceM
 public class PerRequestFactory implements Factory {
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(PerRequestFactory.class);
 
-    private final Class svcClass;
+    private final Class<?> svcClass;
 
-    public PerRequestFactory(final Class svcClass) {
+    public PerRequestFactory(final Class<?> svcClass) {
         super();
         this.svcClass = svcClass;
     }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java Thu Jan  5 23:58:20 2012
@@ -42,7 +42,7 @@ public class PooledFactory implements Fa
      * @param svcClass the class to create
      * @param max the absolute maximum number to create and pool
      */
-    public PooledFactory(final Class svcClass, int max) {
+    public PooledFactory(final Class<?> svcClass, int max) {
         this(new PerRequestFactory(svcClass), max, false);
     }
     /**

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java Thu Jan  5 23:58:20 2012
@@ -203,7 +203,7 @@ public final class XPathAssert {
             return null;
         }
 
-        public Iterator getPrefixes(String namespaceURI) {
+        public Iterator<String> getPrefixes(String namespaceURI) {
             return null;
         }
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java Thu Jan  5 23:58:20 2012
@@ -75,7 +75,7 @@ public abstract class AbstractMultiplexD
      * @return the id from the reference parameters of the  ws-a-to address or null if not found
      * @see org.apache.cxf.transport.MultiplexDestination#getId(java.util.Map)
      */
-    public String getId(Map contextMap) {
+    public String getId(Map<String, Object> contextMap) {
         String markedParam = null;
         AddressingProperties maps = (AddressingProperties)contextMap
             .get(SERVER_ADDRESSING_PROPERTIES_INBOUND);
@@ -93,7 +93,7 @@ public abstract class AbstractMultiplexD
         if (null != epr.getReferenceParameters()) {
             for (Object o : epr.getReferenceParameters().getAny()) {
                 if (o instanceof JAXBElement) {
-                    JAXBElement el = (JAXBElement)o;
+                    JAXBElement<?> el = (JAXBElement<?>)o;
                     if (el.getName().equals(elementQName)) {
                         elementStringValue = (String)el.getValue();
                     }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java Thu Jan  5 23:58:20 2012
@@ -556,7 +556,7 @@ public class AutomaticWorkQueueImpl impl
         }
         return executor.getActiveCount();
     }
-    public void update(Dictionary config) {
+    public void update(Dictionary<String, String> config) {
         String s = (String)config.get("highWaterMark");
         if (s != null) {
             this.highWaterMark = Integer.parseInt(s);
@@ -578,7 +578,7 @@ public class AutomaticWorkQueueImpl impl
             this.maxQueueSize = Integer.parseInt(s);
         } 
     }
-    public Dictionary getProperties() {
+    public Dictionary<String, String> getProperties() {
         Dictionary<String, String> properties = new Hashtable<String, String>();
         NumberFormat nf = NumberFormat.getIntegerInstance();
         properties.put("name", nf.format(getName()));

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaSerializer.java Thu Jan  5 23:58:20 2012
@@ -43,7 +43,8 @@ import org.apache.cxf.helpers.XMLUtils;
  */
 public class SchemaSerializer implements ExtensionSerializer {
 
-    public void marshall(Class parentType, QName elementType, ExtensibilityElement extension, PrintWriter pw,
+    public void marshall(@SuppressWarnings("rawtypes") Class parentType, 
+                         QName elementType, ExtensibilityElement extension, PrintWriter pw,
                          Definition def, ExtensionRegistry extReg) throws WSDLException {
         try {
             writeXml(((Schema)extension).getElement(), pw);

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java Thu Jan  5 23:58:20 2012
@@ -163,7 +163,7 @@ public final class SchemaUtil {
     private void getSchemaList(Definition def) {
         Types typesElement = def.getTypes();
         if (typesElement != null) {
-            Iterator ite = typesElement.getExtensibilityElements().iterator();
+            Iterator<?> ite = typesElement.getExtensibilityElements().iterator();
             while (ite.hasNext()) {
                 Object obj = ite.next();
                 if (obj instanceof Schema) {
@@ -189,7 +189,7 @@ public final class SchemaUtil {
             }
         }
 
-        Map<String, List> imports = CastUtils.cast(schema.getImports());
+        Map<String, List<?>> imports = CastUtils.cast(schema.getImports());
         if (imports != null && imports.size() > 0) {
             Collection<String> importKeys = imports.keySet();
             for (String importNamespace : importKeys) {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java Thu Jan  5 23:58:20 2012
@@ -100,10 +100,10 @@ public class WSDLDefinitionBuilder imple
 
     public static Collection<Import> getImports(final Definition wsdlDef) {
         Collection<Import> importList = new ArrayList<Import>();
-        Map imports = wsdlDef.getImports();
-        for (Iterator iter = imports.keySet().iterator(); iter.hasNext();) {
+        Map<?, ?> imports = wsdlDef.getImports();
+        for (Iterator<?> iter = imports.keySet().iterator(); iter.hasNext();) {
             String uri = (String)iter.next();
-            List<Import> lst = CastUtils.cast((List)imports.get(uri));
+            List<Import> lst = CastUtils.cast((List<?>)imports.get(uri));
             importList.addAll(lst);
         }
         return importList;
@@ -136,7 +136,7 @@ public class WSDLDefinitionBuilder imple
             throw new RuntimeException(ex);
         }
 
-        for (Iterator it = initialExtensions.keySet().iterator(); it.hasNext();) {
+        for (Iterator<?> it = initialExtensions.keySet().iterator(); it.hasNext();) {
             String key = (String) it.next();
             String pluginClz = initialExtensions.getProperty(key);
             try {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1227899&r1=1227898&r2=1227899&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Thu Jan  5 23:58:20 2012
@@ -263,7 +263,7 @@ public class WSDLManagerImpl implements 
             throw new BusException(ex);
         }
 
-        for (Iterator it = initialExtensions.keySet().iterator(); it.hasNext();) {
+        for (Iterator<?> it = initialExtensions.keySet().iterator(); it.hasNext();) {
             StringTokenizer st = new StringTokenizer(initialExtensions.getProperty((String) it.next()), "=");
             String parentType = st.nextToken();
             String elementType = st.nextToken();



Mime
View raw message