cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1227822 [1/4] - in /cxf/trunk: api/src/main/java/org/apache/cxf/databinding/ api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/service/ api/src/main/java/org/apache/cxf/ws/addressing/ common/common/src/main/java/org/...
Date Thu, 05 Jan 2012 20:46:03 GMT
Author: dkulp
Date: Thu Jan  5 20:45:57 2012
New Revision: 1227822

URL: http://svn.apache.org/viewvc?rev=1227822&view=rev
Log:
Update common-utilities and codegen plugin (and some users of it) to fix usage of raw types, change to new style for loops, etc...

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
    cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataReader.java
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
    cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
    cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceBuilder.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/AddressingBuilder.java
    cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/JarResource.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PackageUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SimpleBeanDefinitionParser.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MethodComparator.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java
    cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
    cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java
    cxf/trunk/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
    cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java
    cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
    cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
    cxf/trunk/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
    cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
    cxf/trunk/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
    cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
    cxf/trunk/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
    cxf/trunk/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
    cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
    cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpBindingFactory.java
    cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/URIMapper.java
    cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/ContentTypeOutInterceptor.java
    cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ObjectBindingBPHandler.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandler.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapBindingInfoConfigBeanDefinitionParser.java
    cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
    cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/SpringResourceFactoryTest.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ClientProxyFactoryBeanDefinitionParser.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/PersistOutInterceptor.java
    cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
    cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
    cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/jmx/BusRegistrationTest.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/MessageTrustDeciderBeanDefinitionParser.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java
    cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java
    cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/spring/AddressingBeanDefinitionParser.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/ExternalAttachmentProviderBeanDefinitionParser.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyEngineBeanDefinitionParser.java
    cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMFeatureBeanDefinitionParser.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMManagerBeanDefinitionParser.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/spring/RMTxStoreBeanDefinitionParser.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
    cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/BaseGreeterImpl.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotation.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlJavaTypeAdapterAnnotator.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/XmlSeeAlsoAnnotatorTest.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java Thu Jan  5 20:45:57 2012
@@ -32,7 +32,7 @@ import org.apache.cxf.interceptor.Fault;
  */
 public abstract class AbstractWrapperHelper implements WrapperHelper {
     
-    public static final Class NO_CLASSES[] = new Class[0];
+    public static final Class<?> NO_CLASSES[] = new Class[0];
     public static final Object NO_PARAMS[] = new Object[0];
         
     protected final Class<?> wrapperType;
@@ -54,7 +54,7 @@ public abstract class AbstractWrapperHel
         return "" + System.identityHashCode(this);
     }
     
-    protected abstract Object createWrapperObject(Class typeClass) throws Exception;
+    protected abstract Object createWrapperObject(Class<?> typeClass) throws Exception;
     
     protected abstract Object getWrapperObject(Object object) throws Exception;
     
@@ -83,7 +83,7 @@ public abstract class AbstractWrapperHel
                 Object o = lst.get(x);
                 o = getPartObject(x, o);                
                 if (o instanceof List && getMethods[x] != null) {
-                    List<Object> col = CastUtils.cast((List)getMethods[x].invoke(wrapperObject));
+                    List<Object> col = CastUtils.cast((List<?>)getMethods[x].invoke(wrapperObject));
                     if (col == null) {
                         //broken generated java wrappers
                         if (setMethods[x] != null) {
@@ -92,7 +92,7 @@ public abstract class AbstractWrapperHel
                             fields[x].set(wrapperObject, lst.get(x));
                         }
                     } else {
-                        List<Object> olst = CastUtils.cast((List)o);
+                        List<Object> olst = CastUtils.cast((List<?>)o);
                         col.addAll(olst);
                     }
                 } else if (setMethods[x] != null) {                        

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataReader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataReader.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/databinding/DataReader.java Thu Jan  5 20:45:57 2012
@@ -55,5 +55,5 @@ public interface DataReader<T> extends B
      * mapping processing, instead.
      * @return item read.
      */
-    Object read(QName elementQName, T input, Class type);
+    Object read(QName elementQName, T input, Class<?> type);
 }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/Phase.java Thu Jan  5 20:45:57 2012
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.phase;
 
-public class Phase implements Comparable {
+public class Phase implements Comparable<Object> {
     
     // can be removed from once defined as default value in configuration metadata for bus
   
@@ -99,12 +99,15 @@ public class Phase implements Comparable
     }
 
     public int compareTo(Object o) {
-        Phase p = (Phase)o;
-        
-        if (priority == p.priority) {
-            return name.compareTo(p.name); 
+        if (o instanceof Phase) {
+            Phase p = (Phase)o;
+            
+            if (priority == p.priority) {
+                return name.compareTo(p.name); 
+            }
+            return priority - p.priority;
         }
-        return priority - p.priority;
+        return 1;
     }
     
     public String toString() {

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseChainCache.java Thu Jan  5 20:45:57 2012
@@ -118,7 +118,7 @@ public final class PhaseChainCache {
                     }
                     
                     if (providers[x].getClass() == ModCountCopyOnWriteArrayList.class) {
-                        if (((ModCountCopyOnWriteArrayList)providers[x]).getModCount()
+                        if (((ModCountCopyOnWriteArrayList<?>)providers[x]).getModCount()
                             != lists.get(x).getModCount()) {
                             return false;
                         }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceBuilder.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceBuilder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/ServiceBuilder.java Thu Jan  5 20:45:57 2012
@@ -31,7 +31,7 @@ public interface ServiceBuilder {
     void setTransportId(String id);
     void setBus(Bus bus);
     void setAddress(String addr);
-    void setServiceClass(Class clz);
+    void setServiceClass(Class<?> clz);
 
     File getOutputFile();
 

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/AddressingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/AddressingBuilder.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/AddressingBuilder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/AddressingBuilder.java Thu Jan  5 20:45:57 2012
@@ -58,7 +58,7 @@ public abstract class AddressingBuilder 
             if (builder == null) {
                 String className = DEFAULT_ADDRESSING_BUILDER;
                 try {
-                    Class cls = Class.forName(className);
+                    Class<?> cls = Class.forName(className);
                     builder = (AddressingBuilder)cls.newInstance();
                 } catch (ClassNotFoundException cnfe) {
                     cnfe.printStackTrace();

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java Thu Jan  5 20:45:57 2012
@@ -47,7 +47,7 @@ public final class NSManager {
         resolveConstants(WSDLConstants.class);
     }
 
-    private void resolveConstants(final Class clz) {
+    private void resolveConstants(final Class<?> clz) {
         for (Field field : clz.getFields()) {
             if (field.getName().endsWith("_PREFIX") && isPulicStaticFinal(field)) {
                 try {

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java Thu Jan  5 20:45:57 2012
@@ -72,7 +72,7 @@ public final class ClassLoaderUtils {
      * @param resourceName The name of the resource to load
      * @param callingClass The Class object of the calling object
      */
-    public static URL getResource(String resourceName, Class callingClass) {
+    public static URL getResource(String resourceName, Class<?> callingClass) {
         URL url = Thread.currentThread().getContextClassLoader().getResource(resourceName);
         if (url == null && resourceName.startsWith("/")) {
             //certain classloaders need it without the leading /
@@ -123,7 +123,7 @@ public final class ClassLoaderUtils {
      * @param resourceName The name of the resource to load
      * @param callingClass The Class object of the calling object
      */
-    public static List<URL> getResources(String resourceName, Class callingClass) {
+    public static List<URL> getResources(String resourceName, Class<?> callingClass) {
         List<URL> ret = new ArrayList<URL>();
         Enumeration<URL> urls = new Enumeration<URL>() {
             public boolean hasMoreElements() {
@@ -207,7 +207,7 @@ public final class ClassLoaderUtils {
      * @param resourceName The name of the resource to load
      * @param callingClass The Class object of the calling object
      */
-    public static InputStream getResourceAsStream(String resourceName, Class callingClass) {
+    public static InputStream getResourceAsStream(String resourceName, Class<?> callingClass) {
         URL url = getResource(resourceName, callingClass);
 
         try {

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java Thu Jan  5 20:45:57 2012
@@ -98,7 +98,7 @@ public class Log4jLogger extends Abstrac
     }
     public synchronized Handler[] getHandlers() {
         List<Handler> ret = new ArrayList<Handler>();
-        Enumeration en = log.getAllAppenders();
+        Enumeration<?> en = log.getAllAppenders();
         while (en.hasMoreElements()) {
             Appender ap = (Appender)en.nextElement();
             if (ap instanceof HandlerWrapper) {

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Thu Jan  5 20:45:57 2012
@@ -213,7 +213,7 @@ public final class LogUtils {
                                          String loggerName) {
         if (loggerClass != null) {
             try {
-                Constructor cns = loggerClass.getConstructor(String.class, String.class);
+                Constructor<?> cns = loggerClass.getConstructor(String.class, String.class);
                 if (name == null) {
                     try {
                         return (Logger) cns.newInstance(loggerName, BundleUtils.getBundleName(cls));

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java Thu Jan  5 20:45:57 2012
@@ -98,12 +98,12 @@ public class ASMHelper {
     }
     public static String getClassCode(Type type) {
         if (type instanceof Class) {
-            return getClassCode((Class)type);
+            return getClassCode((Class<?>)type);
         } else if (type instanceof GenericArrayType) {
             GenericArrayType at = (GenericArrayType)type;
             return "[" + getClassCode(at.getGenericComponentType());
         } else if (type instanceof TypeVariable) {
-            TypeVariable tv = (TypeVariable)type;
+            TypeVariable<?> tv = (TypeVariable<?>)type;
             Type[] bounds = tv.getBounds();
             if (bounds != null && bounds.length == 1) {
                 return getClassCode(bounds[0]);
@@ -182,7 +182,7 @@ public class ASMHelper {
     }
     
     
-    public Class<?> loadClass(String className, Class clz , byte[] bytes) { 
+    public Class<?> loadClass(String className, Class<?> clz , byte[] bytes) { 
         TypeHelperClassLoader loader = getTypeHelperClassLoader(clz);
         synchronized (loader) {
             Class<?> cls = loader.lookupDefinedClass(className);
@@ -192,7 +192,7 @@ public class ASMHelper {
             return cls;
         }
     }
-    public Class<?> findClass(String className, Class clz) { 
+    public Class<?> findClass(String className, Class<?> clz) { 
         TypeHelperClassLoader loader = getTypeHelperClassLoader(clz);
         return loader.lookupDefinedClass(className);
     }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java Thu Jan  5 20:45:57 2012
@@ -39,13 +39,13 @@ class CglibProxyHelper extends ProxyHelp
     }
     
     @Override
-    protected Object getProxyInternal(ClassLoader loader, Class[] interfaces, 
+    protected Object getProxyInternal(ClassLoader loader, Class<?>[] interfaces, 
                                       final java.lang.reflect.InvocationHandler h) {
         
-        Class superClass = null;
-        List<Class> theInterfaces = new ArrayList<Class>();
+        Class<?> superClass = null;
+        List<Class<?>> theInterfaces = new ArrayList<Class<?>>();
         
-        for (Class c : interfaces) {
+        for (Class<?> c : interfaces) {
             if (!c.isInterface()) {
                 if (superClass != null) {
                     throw new IllegalArgumentException("Only a single superclass is supported");

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java Thu Jan  5 20:45:57 2012
@@ -38,11 +38,11 @@ public class ClassHelper {
     protected ClassHelper() {
     }
     
-    protected Class getRealClassInternal(Object o) {
+    protected Class<?> getRealClassInternal(Object o) {
         return o.getClass();
     }
     
-    protected Class getRealClassFromClassInternal(Class cls) {
+    protected Class<?> getRealClassFromClassInternal(Class<?> cls) {
         return cls;
     }
     protected Object getRealObjectInternal(Object o) {
@@ -51,11 +51,11 @@ public class ClassHelper {
     
     
     
-    public static Class getRealClass(Object o) {
+    public static Class<?> getRealClass(Object o) {
         return HELPER.getRealClassInternal(o);
     }
     
-    public static Class getRealClassFromClass(Class cls) {
+    public static Class<?> getRealClassFromClass(Class<?> cls) {
         return HELPER.getRealClassFromClassInternal(cls);
     }
     

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassReader.java Thu Jan  5 20:45:57 2012
@@ -86,7 +86,7 @@ public class ClassReader extends ByteArr
      * @return a byte array containing the bytecode
      * @throws IOException
      */
-    protected static byte[] getBytes(Class c) throws IOException {
+    protected static byte[] getBytes(Class<?> c) throws IOException {
         InputStream fin = c.getResourceAsStream('/' + c.getName().replace('.', '/') + ".class");
         if (fin == null) {
             throw new IOException();
@@ -111,7 +111,7 @@ public class ClassReader extends ByteArr
         return desc.replace('/', '.');
     }
 
-    protected static Map<String, Method> findAttributeReaders(Class c) {
+    protected static Map<String, Method> findAttributeReaders(Class<?> c) {
         Map<String, Method> map = new HashMap<String, Method>();
         Method[] methods = c.getMethods();
 
@@ -125,7 +125,7 @@ public class ClassReader extends ByteArr
         return map;
     }
 
-    protected static String getSignature(Member method, Class[] paramTypes) {
+    protected static String getSignature(Member method, Class<?>[] paramTypes) {
         // compute the method descriptor
 
         StringBuilder b = new StringBuilder((method instanceof Method) ? method.getName() : "<init>");
@@ -145,7 +145,7 @@ public class ClassReader extends ByteArr
         return b.toString();
     }
 
-    private static void addDescriptor(StringBuilder b, Class c) {
+    private static void addDescriptor(StringBuilder b, Class<?> c) {
         if (c.isPrimitive()) {
             if (c == void.class) {
                 b.append('V');
@@ -209,11 +209,11 @@ public class ClassReader extends ByteArr
             Member m = (Member)cpool[index];
             if (m == null) {
                 pos = cpoolIndex[index];
-                Class owner = resolveClass(readShort());
+                Class<?> owner = resolveClass(readShort());
                 NameAndType nt = resolveNameAndType(readShort());
                 String signature = nt.name + nt.type;
                 if ("<init>".equals(nt.name)) {
-                    Constructor[] ctors = owner.getConstructors();
+                    Constructor<?>[] ctors = owner.getConstructors();
                     for (int i = 0; i < ctors.length; i++) {
                         String sig = getSignature(ctors[i], ctors[i].getParameterTypes());
                         if (sig.equals(signature)) {
@@ -249,7 +249,7 @@ public class ClassReader extends ByteArr
             Field f = (Field)cpool[i];
             if (f == null) {
                 pos = cpoolIndex[i];
-                Class owner = resolveClass(readShort());
+                Class<?> owner = resolveClass(readShort());
                 NameAndType nt = resolveNameAndType(readShort());
                 cpool[i] = owner.getDeclaredField(nt.name);
                 f = owner.getDeclaredField(nt.name);
@@ -277,10 +277,10 @@ public class ClassReader extends ByteArr
         }
     }
 
-    protected final Class resolveClass(int i) throws IOException, ClassNotFoundException {
+    protected final Class<?> resolveClass(int i) throws IOException, ClassNotFoundException {
         int oldPos = pos;
         try {
-            Class c = (Class)cpool[i];
+            Class<?> c = (Class<?>)cpool[i];
             if (c == null) {
                 pos = cpoolIndex[i];
                 String name = resolveUtf8(readShort());

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/JarResource.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/JarResource.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/JarResource.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/JarResource.java Thu Jan  5 20:45:57 2012
@@ -49,8 +49,8 @@ public final class JarResource {
         List<String> jarContents = new ArrayList<String>();
         try {
             ZipFile zf = new ZipFile(jarFile);
-            for (Enumeration e = zf.entries(); e.hasMoreElements();) {
-                ZipEntry ze = (ZipEntry) e.nextElement();
+            for (Enumeration<? extends ZipEntry> e = zf.entries(); e.hasMoreElements();) {
+                ZipEntry ze = e.nextElement();
                 if (ze.isDirectory()) {
                     continue;
                 }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java Thu Jan  5 20:45:57 2012
@@ -32,7 +32,7 @@ public final class ModCountCopyOnWriteAr
     public ModCountCopyOnWriteArrayList(Collection<? extends T> c) {
         super(c);
         if (c instanceof ModCountCopyOnWriteArrayList) {
-            modCount.set(((ModCountCopyOnWriteArrayList)c).getModCount());
+            modCount.set(((ModCountCopyOnWriteArrayList<?>)c).getModCount());
         }
     }
     
@@ -120,7 +120,7 @@ public final class ModCountCopyOnWriteAr
     }
 
     @Override
-    public boolean removeAll(Collection c) {
+    public boolean removeAll(Collection<?> c) {
         if (super.removeAll(c)) {
             modCount.incrementAndGet();
             return true;
@@ -129,7 +129,7 @@ public final class ModCountCopyOnWriteAr
     }
 
     @Override
-    public boolean retainAll(Collection c) {
+    public boolean retainAll(Collection<?> c) {
         if (super.retainAll(c)) {
             modCount.incrementAndGet();
             return true;
@@ -143,7 +143,8 @@ public final class ModCountCopyOnWriteAr
     
     public boolean equals(Object o) {
         if (o instanceof ModCountCopyOnWriteArrayList) {
-            return super.equals(o) && modCount.get() == ((ModCountCopyOnWriteArrayList)o).getModCount();
+            return super.equals(o) && modCount.get() 
+                == ((ModCountCopyOnWriteArrayList<?>)o).getModCount();
         }
         return false;
     }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PackageUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PackageUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PackageUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PackageUtils.java Thu Jan  5 20:45:57 2012
@@ -166,7 +166,7 @@ public final class PackageUtils {
         return newToken.toString();
     }
 
-    private static String combine(List r, char sep) {
+    private static String combine(List<?> r, char sep) {
         StringBuilder buf = new StringBuilder(r.get(0).toString());
 
         for (int i = 1; i < r.size(); i++) {

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ParamReader.java Thu Jan  5 20:45:57 2012
@@ -48,7 +48,7 @@ import java.util.Map;
 public class ParamReader extends ClassReader {
     private String methodName;
     private Map<String, MethodInfo> methods = new HashMap<String, MethodInfo>();
-    private Class[] paramTypes;
+    private Class<?>[] paramTypes;
 
     /**
      * process a class file, given it's class. We'll use the defining
@@ -57,7 +57,7 @@ public class ParamReader extends ClassRe
      * @param c
      * @throws IOException
      */
-    public ParamReader(Class c) throws IOException {
+    public ParamReader(Class<?> c) throws IOException {
         this(getBytes(c));
     }
 
@@ -122,7 +122,7 @@ public class ParamReader extends ClassRe
         }
         
         // get declaring class
-        Class c = method.getDeclaringClass();
+        Class<?> c = method.getDeclaringClass();
 
         // Don't worry about it if the class is a Java dynamic proxy
         if (Proxy.isProxyClass(c)) {
@@ -166,7 +166,7 @@ public class ParamReader extends ClassRe
      * @param ctor
      * @return String[] array of names, one per parameter, or null
      */
-    public String[] getParameterNames(Constructor ctor) {
+    public String[] getParameterNames(Constructor<?> ctor) {
         paramTypes = ctor.getParameterTypes();
         return getParameterNames(ctor, paramTypes);
     }
@@ -185,7 +185,7 @@ public class ParamReader extends ClassRe
         return getParameterNames(method, paramTypes);
     }
 
-    protected String[] getParameterNames(Member member, Class[] pTypes) {
+    protected String[] getParameterNames(Member member, Class<?>[] pTypes) {
         // look up the names for this method
         MethodInfo info = (MethodInfo)methods.get(getSignature(member, pTypes));
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java Thu Jan  5 20:45:57 2012
@@ -25,8 +25,8 @@ public final class PrimitiveUtils {
         
     }
     
-    public static Class getClass(String value) {
-        Class clz = null;        
+    public static Class<?> getClass(String value) {
+        Class<?> clz = null;        
         if ("int".equals(value)) {
             clz = int.class;
         }
@@ -54,7 +54,7 @@ public final class PrimitiveUtils {
         return clz;
     }
 
-    public static Object read(String value, Class type) {
+    public static Object read(String value, Class<?> type) {
         Object ret = value;
         if (Integer.TYPE.equals(type)) {
             ret = Integer.valueOf(value);

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ProxyHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ProxyHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ProxyHelper.java Thu Jan  5 20:45:57 2012
@@ -41,12 +41,12 @@ public class ProxyHelper {
     protected ProxyHelper() {
     }
     
-    protected Object getProxyInternal(ClassLoader loader, Class[] interfaces, InvocationHandler handler) {
+    protected Object getProxyInternal(ClassLoader loader, Class<?>[] interfaces, InvocationHandler handler) {
         return Proxy.newProxyInstance(loader, interfaces, handler);
     }
     
     
-    public static Object getProxy(ClassLoader loader, Class[] interfaces, InvocationHandler handler) {
+    public static Object getProxy(ClassLoader loader, Class<?>[] interfaces, InvocationHandler handler) {
         return HELPER.getProxyInternal(loader, interfaces, handler);
     }
 }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java Thu Jan  5 20:45:57 2012
@@ -75,7 +75,7 @@ public class ReflectionInvokationHandler
             return t;
         }
         if (wr.iterator()) {
-            return new WrapperIterator(wr.value(), (Iterator)t);
+            return new WrapperIterator(wr.value(), (Iterator<?>)t);
         }
         return createProxyWrapper(t, wr.value());
     }
@@ -92,10 +92,10 @@ public class ReflectionInvokationHandler
         boolean iterator() default false;
     }
     
-    private static class WrapperIterator implements Iterator {
+    private static class WrapperIterator implements Iterator<Object> {
         Class<?> cls;
-        Iterator internal;
-        public WrapperIterator(Class<?> c, Iterator it) {
+        Iterator<?> internal;
+        public WrapperIterator(Class<?> c, Iterator<?> it) {
             internal = it;
             cls = c;
         }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java Thu Jan  5 20:45:57 2012
@@ -30,10 +30,10 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.net.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 
@@ -60,9 +60,9 @@ public final class ReflectionUtil {
         });
     }
 
-    public static Constructor getDeclaredConstructor(final Class<?> cls, final Class<?> ... args) {
-        return AccessController.doPrivileged(new PrivilegedAction<Constructor>() {
-            public Constructor run() {
+    public static <T> Constructor<T> getDeclaredConstructor(final Class<T> cls, final Class<?> ... args) {
+        return AccessController.doPrivileged(new PrivilegedAction<Constructor<T>>() {
+            public Constructor<T> run() {
                 try {
                     return cls.getDeclaredConstructor(args);
                 } catch (SecurityException e) {
@@ -74,9 +74,9 @@ public final class ReflectionUtil {
         });
         
     }
-    public static Constructor getConstructor(final Class<?> cls, final Class<?> ... args) {
-        return AccessController.doPrivileged(new PrivilegedAction<Constructor>() {
-            public Constructor run() {
+    public static <T> Constructor<T> getConstructor(final Class<T> cls, final Class<?> ... args) {
+        return AccessController.doPrivileged(new PrivilegedAction<Constructor<T>>() {
+            public Constructor<T> run() {
                 try {
                     return cls.getConstructor(args);
                 } catch (SecurityException e) {

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java Thu Jan  5 20:45:57 2012
@@ -33,7 +33,7 @@ class SpringAopClassHelper extends Class
         Class.forName("org.springframework.aop.framework.Advised");
     }
     
-    protected Class getRealClassFromClassInternal(Class cls) {
+    protected Class<?> getRealClassFromClassInternal(Class<?> cls) {
         if (AopUtils.isCglibProxyClass(cls)) {
             return getRealClassFromClassInternal(cls.getSuperclass());
         }
@@ -54,7 +54,7 @@ class SpringAopClassHelper extends Class
         return o;
     }
 
-    protected Class getRealClassInternal(Object o) {
+    protected Class<?> getRealClassInternal(Object o) {
         if (AopUtils.isAopProxy(o) && (o instanceof Advised)) {
             Advised advised = (Advised)o;
             try {
@@ -71,7 +71,7 @@ class SpringAopClassHelper extends Class
                 }
                 
                 if (target == null) {
-                    Class targetClass = AopUtils.getTargetClass(o);
+                    Class<?> targetClass = AopUtils.getTargetClass(o);
                     if (targetClass != null) {
                         return getRealClassFromClassInternal(targetClass);
                     }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java Thu Jan  5 20:45:57 2012
@@ -102,7 +102,8 @@ public class WeakIdentityHashMap<K, V> i
         if (!(o instanceof WeakIdentityHashMap)) {
             return false;
         }
-        return backingStore.equals(((WeakIdentityHashMap)o).backingStore);
+        WeakIdentityHashMap<?, ?> v = (WeakIdentityHashMap<?, ?>)o;
+        return backingStore.equals(v.backingStore);
     }
 
     public V get(Object key) {
@@ -122,7 +123,7 @@ public class WeakIdentityHashMap<K, V> i
         reap();
         return backingStore.isEmpty();
     }
-    public void putAll(Map t) {
+    public void putAll(Map<? extends K, ? extends V> t) {
         throw new UnsupportedOperationException();
     }
     public V remove(Object key) {
@@ -165,7 +166,7 @@ public class WeakIdentityHashMap<K, V> i
                 return true;
             }
             if (o instanceof WeakReference) {
-                WeakReference ref = (WeakReference)o;
+                WeakReference<?> ref = (WeakReference<?>)o;
                 if (this.get() == ref.get()) {
                     return true;
                 }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Thu Jan  5 20:45:57 2012
@@ -63,7 +63,7 @@ public abstract class AbstractBeanDefini
         = "org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor";
     private static final Logger LOG = LogUtils.getL7dLogger(AbstractBeanDefinitionParser.class);
     
-    private Class beanClass;
+    private Class<?> beanClass;
     private JAXBContext context;
     private Set<Class<?>> classes;
 
@@ -147,16 +147,16 @@ public abstract class AbstractBeanDefini
         }
     }
 
-    public Class getBeanClass() {
+    public Class<?> getBeanClass() {
         return beanClass;
     }
 
-    public void setBeanClass(Class beanClass) {
+    public void setBeanClass(Class<?> beanClass) {
         this.beanClass = beanClass;
     }
 
     @Override
-    protected Class getBeanClass(Element e) {
+    protected Class<?> getBeanClass(Element e) {
         return beanClass;
     }
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java Thu Jan  5 20:45:57 2012
@@ -49,7 +49,7 @@ public abstract class AbstractFactoryBea
     @SuppressWarnings("deprecation")
     @Override
     protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
-        Class factoryClass = getFactoryClass();
+        Class<?> factoryClass = getFactoryClass();
         BeanDefinitionBuilder factoryBean = bean;
         if (!FactoryBean.class.isAssignableFrom(factoryClass)) {
             factoryBean = BeanDefinitionBuilder.rootBeanDefinition(getFactoryClass());
@@ -140,9 +140,9 @@ public abstract class AbstractFactoryBea
         }
     }
 
-    protected abstract Class getFactoryClass();
+    protected abstract Class<?> getFactoryClass();
 
-    protected Class getRawFactoryClass() {
+    protected Class<?> getRawFactoryClass() {
         return getFactoryClass();
     }
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SimpleBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SimpleBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SimpleBeanDefinitionParser.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SimpleBeanDefinitionParser.java Thu Jan  5 20:45:57 2012
@@ -25,7 +25,7 @@ package org.apache.cxf.configuration.spr
  */
 public class SimpleBeanDefinitionParser extends AbstractBeanDefinitionParser {
 
-    public SimpleBeanDefinitionParser(Class beanClass) {
+    public SimpleBeanDefinitionParser(Class<?> beanClass) {
         super();
         setBeanClass(beanClass);
     }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java Thu Jan  5 20:45:57 2012
@@ -84,7 +84,7 @@ public class SpringBeanMap<V> 
                 
                 if (ids instanceof ManagedSet || ids instanceof ManagedList) {
                     List<String> newIds = new ArrayList<String>();
-                    for (Iterator itr = ids.iterator(); itr.hasNext();) {
+                    for (Iterator<?> itr = ids.iterator(); itr.hasNext();) {
                         Object o = itr.next();
                         if (o instanceof TypedStringValue) {
                             newIds.add(((TypedStringValue) o).getValue());

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java Thu Jan  5 20:45:57 2012
@@ -33,6 +33,7 @@ import org.springframework.beans.factory
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.BeanReference;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
+import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
 import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -108,8 +109,9 @@ public class SpringBeanQNameMap<V> 
                             BeanDefinitionHolder bdh = (BeanDefinitionHolder)id;
                             if (QName.class.getName().equals(bdh.getBeanDefinition().getBeanClassName())) {
                                 try {
-                                    java.util.List l = bdh.getBeanDefinition().getConstructorArgumentValues()
-                                        .getGenericArgumentValues();
+                                    java.util.List<ValueHolder> l 
+                                        = bdh.getBeanDefinition().getConstructorArgumentValues()
+                                            .getGenericArgumentValues();
                                     
                                     ConstructorArgumentValues.ValueHolder v 
                                         = (ConstructorArgumentValues.ValueHolder)l.get(0);

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java Thu Jan  5 20:45:57 2012
@@ -33,7 +33,7 @@ public class StringBeanDefinitionParser 
     }
 
     @Override
-    protected Class getBeanClass(Element arg0) {
+    protected Class<?> getBeanClass(Element arg0) {
         return String.class;
     }
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java Thu Jan  5 20:45:57 2012
@@ -96,7 +96,7 @@ public  final class MapNamespaceContext 
         return null;
     }
 
-    public Iterator getPrefixes(String namespaceURI) {
+    public Iterator<String> getPrefixes(String namespaceURI) {
         return null;
     }
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MethodComparator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MethodComparator.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MethodComparator.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MethodComparator.java Thu Jan  5 20:45:57 2012
@@ -35,8 +35,8 @@ public class MethodComparator implements
         if (val == 0) {
             val = m1.getParameterTypes().length - m2.getParameterTypes().length;
             if (val == 0) {
-                Class[] types1 = m1.getParameterTypes();
-                Class[] types2 = m2.getParameterTypes();
+                Class<?>[] types1 = m1.getParameterTypes();
+                Class<?>[] types2 = m2.getParameterTypes();
                 for (int i = 0; i < types1.length; i++) {
                     val = types1[i].getName().compareTo(types2[i].getName());
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/ServiceUtils.java Thu Jan  5 20:45:57 2012
@@ -65,7 +65,7 @@ public final class ServiceUtils {
         sb.append('.');
         sb.append(m.getName());
         sb.append('(');
-        Class[] params = m.getParameterTypes();
+        Class<?>[] params = m.getParameterTypes();
         for (int i = 0; i < params.length; i++) {
             Class<?> param = params[i];
             sb.append(param.getName());

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java Thu Jan  5 20:45:57 2012
@@ -21,16 +21,14 @@ package org.apache.cxf.helpers;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import javax.wsdl.Binding;
 import javax.wsdl.BindingOperation;
 import javax.wsdl.Definition;
 import javax.wsdl.Input;
-import javax.wsdl.Message;
 import javax.wsdl.Operation;
 import javax.wsdl.Output;
 import javax.wsdl.Part;
@@ -45,10 +43,11 @@ public class WSDLHelper {
         if (operationName == null) {
             return null;
         }
-        Iterator ite = def.getBindings().values().iterator();
+        Iterator<Binding> ite = CastUtils.cast(def.getBindings().values().iterator());
         while (ite.hasNext()) {
             Binding binding = (Binding)ite.next();
-            Iterator ite1 = binding.getBindingOperations().iterator();
+            Iterator<BindingOperation> ite1 
+                = CastUtils.cast(binding.getBindingOperations().iterator());
             while (ite1.hasNext()) {
                 BindingOperation bop = (BindingOperation)ite1.next();
                 if (bop.getName().equals(operationName)) {
@@ -67,9 +66,8 @@ public class WSDLHelper {
         if (operationName == null) {
             return null;
         }
-        List bindingOperations = binding.getBindingOperations();
-        for (Iterator iter = bindingOperations.iterator(); iter.hasNext();) {
-            BindingOperation bindingOperation = (BindingOperation)iter.next();
+        List<BindingOperation> bindingOperations = CastUtils.cast(binding.getBindingOperations());
+        for (BindingOperation bindingOperation : bindingOperations) {
             if (operationName.equals(bindingOperation.getName())) {
                 return bindingOperation;
             }
@@ -77,23 +75,10 @@ public class WSDLHelper {
         return null;
     }
 
-    public Map getParts(Operation operation, boolean out) {
-        Message message = null;
-        if (out) {
-            Output output = operation.getOutput();
-            message = output.getMessage();
-        } else {
-            Input input = operation.getInput();
-            message = input.getMessage();
-        }
-        return message.getParts() == null ? new HashMap() : message.getParts();
-    }
-
     public List<PortType> getPortTypes(Definition def) {
         List<PortType> portTypes = new ArrayList<PortType>();
-        Iterator ite = def.getPortTypes().values().iterator();
-        while (ite.hasNext()) {
-            PortType portType = (PortType)ite.next();
+        Collection<PortType> ite = CastUtils.cast(def.getPortTypes().values());
+        for (PortType portType : ite) {
             portTypes.add(portType);
         }
         return portTypes;
@@ -103,9 +88,9 @@ public class WSDLHelper {
         Input input = operation.getInput();
         List<Part> partsList = new ArrayList<Part>();
         if (input != null && input.getMessage() != null) {
-            Iterator ite = input.getMessage().getParts().values().iterator();
-            while (ite.hasNext()) {
-                partsList.add((Part)ite.next());
+            Collection<Part> parts = CastUtils.cast(input.getMessage().getParts().values());
+            for (Part p : parts) {
+                partsList.add(p);
             }
         }
         return partsList;
@@ -115,20 +100,19 @@ public class WSDLHelper {
         Output output = operation.getOutput();
         List<Part> partsList = new ArrayList<Part>();
         if (output != null && output.getMessage() != null) {
-            Iterator ite = output.getMessage().getParts().values().iterator();
-            while (ite.hasNext()) {
-                partsList.add((Part)ite.next());
+            Collection<Part> parts = CastUtils.cast(output.getMessage().getParts().values());
+            for (Part p : parts) {
+                partsList.add(p);
             }
         }
         return partsList;
     }
 
     public Binding getBinding(BindingOperation bop, Definition def) {
-        Iterator ite = def.getBindings().values().iterator();
-        while (ite.hasNext()) {
-            Binding binding = (Binding)ite.next();
-            for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();) {
-                BindingOperation bindingOperation = (BindingOperation)ite2.next();
+        Collection<Binding> ite = CastUtils.cast(def.getBindings().values());
+        for (Binding binding : ite) {
+            List<BindingOperation> bos = CastUtils.cast(binding.getBindingOperations());
+            for (BindingOperation bindingOperation : bos) {
                 if (bindingOperation.getName().equals(bop.getName())) {
                     return binding;
                 }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java Thu Jan  5 20:45:57 2012
@@ -302,7 +302,7 @@ public final class JAXBContextCache {
         while (matcher.find()) {
             String pkgName = JAXBUtils.namespaceURIToPackage(matcher.group());
             try {
-                Class clz = JAXBContextCache.class.getClassLoader()
+                Class<?> clz = JAXBContextCache.class.getClassLoader()
                     .loadClass(pkgName + "." + "ObjectFactory");
 
                 if (!classes.contains(clz)) {

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java Thu Jan  5 20:45:57 2012
@@ -37,7 +37,7 @@ public final class JAXBToStringBuilder {
             return (String)object;
         }
         if (object instanceof Collection) {
-            object = ((Collection) object).toArray();
+            object = ((Collection<?>) object).toArray();
         }
         return ToStringBuilder.reflectionToString(object, style);        
     }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java Thu Jan  5 20:45:57 2012
@@ -514,7 +514,7 @@ public final class JAXBUtils {
             if (cls.getName().equals("javax.xml.ws.wsaddressing.W3CEndpointReference")) {
                 return cls;
             }
-            Constructor cons = ReflectionUtil.getDeclaredConstructor(cls);
+            Constructor<?> cons = ReflectionUtil.getDeclaredConstructor(cls);
             if (cons == null) {
                 cons = ReflectionUtil.getConstructor(cls);
             }
@@ -805,12 +805,12 @@ public final class JAXBUtils {
         scanPackages(classes, null, objectFactoryCache);
     }
     public static void scanPackages(Set<Class<?>> classes,
-                                    Class[] extraClass,
+                                    Class<?>[] extraClass,
                                     Map<Package, CachedClass> objectFactoryCache) {
         
         // add user extra class into jaxb context
         if (extraClass != null && extraClass.length > 0) {
-            for (Class clz : extraClass) {
+            for (Class<?> clz : extraClass) {
                 classes.add(clz);
             }
         }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Thu Jan  5 20:45:57 2012
@@ -62,7 +62,7 @@ public class URIResolver {
     private URI uri;
     private URL url;
     private InputStream is;
-    private Class calling;
+    private Class<?> calling;
 
     public URIResolver() {
     }
@@ -75,7 +75,7 @@ public class URIResolver {
         this(baseUriStr, uriStr, null);
     }
     
-    public URIResolver(String baseUriStr, String uriStr, Class calling) throws IOException {
+    public URIResolver(String baseUriStr, String uriStr, Class<?> calling) throws IOException {
         this.calling = (calling != null) ? calling : getClass();
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
@@ -99,7 +99,7 @@ public class URIResolver {
         this.is = null;
     }
     
-    public void resolve(String baseUriStr, String uriStr, Class callingCls) throws IOException {
+    public void resolve(String baseUriStr, String uriStr, Class<?> callingCls) throws IOException {
         this.calling = (callingCls != null) ? callingCls : getClass();
         this.file = null;
         this.uri = null;

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java Thu Jan  5 20:45:57 2012
@@ -39,7 +39,7 @@ import javax.xml.stream.XMLStreamReader;
 public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
     protected int currentEvent = XMLStreamConstants.START_DOCUMENT;
 
-    private Map properties = new HashMap();
+    private Map<String, Object> properties = new HashMap<String, Object>();
 
     private FastStack<ElementFrame<T, I>> frames = new FastStack<ElementFrame<T, I>>();
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java Thu Jan  5 20:45:57 2012
@@ -256,7 +256,7 @@ public class CachingXmlEventWriter imple
             return null;
         }
 
-        public Iterator getPrefixes(String namespaceURI) {
+        public Iterator<String> getPrefixes(String namespaceURI) {
             List<String> l = new ArrayList<String>();
             for (Map.Entry<String, String> e : map.entrySet()) {
                 if (e.getValue().equals(namespaceURI)) {
@@ -266,7 +266,8 @@ public class CachingXmlEventWriter imple
             if (l.isEmpty()) {
                 String pfx = getPrefix(namespaceURI);
                 if (pfx == null) {
-                    return Collections.emptyList().iterator();
+                    l = Collections.emptyList();
+                    return l.iterator();
                 }
                 return Collections.singleton(pfx).iterator();
             }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Thu Jan  5 20:45:57 2012
@@ -1398,12 +1398,12 @@ public final class StaxUtils {
         } else {
             writer.writeStartElement(localName);
         }
-        Iterator it = start.getNamespaces();
+        Iterator<XMLEvent> it = CastUtils.cast(start.getNamespaces());
         while (it != null && it.hasNext()) {
             writeEvent((XMLEvent)it.next(), writer);
         }
         
-        it = start.getAttributes();
+        it = CastUtils.cast(start.getAttributes());
         while (it != null && it.hasNext()) {
             writeAttributeEvent((Attribute)it.next(), writer);            
         }

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Thu Jan  5 20:45:57 2012
@@ -37,7 +37,6 @@ import org.w3c.dom.Text;
 import org.w3c.dom.TypeInfo;
 
 import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.staxutils.AbstractDOMStreamReader.ElementFrame;
 
 public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
     private Node content;

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java Thu Jan  5 20:45:57 2012
@@ -44,7 +44,7 @@ public class W3CDOMStreamWriter implemen
     private Node currentNode;
     private NamespaceContext context = new W3CNamespaceContext();
     private boolean nsRepairing;
-    private Map properties = Collections.EMPTY_MAP;
+    private Map<String, Object> properties = Collections.emptyMap();
 
     public W3CDOMStreamWriter() throws ParserConfigurationException {
         document = XMLUtils.newDocument();
@@ -88,7 +88,7 @@ public class W3CDOMStreamWriter implemen
     public boolean isNsRepairing() {
         return nsRepairing;
     }
-    public void setProperties(Map properties) {
+    public void setProperties(Map<String, Object> properties) {
         this.properties = properties;
     }
 

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java Thu Jan  5 20:45:57 2012
@@ -100,7 +100,7 @@ public class W3CNamespaceContext impleme
         return null;
     }
 
-    public Iterator getPrefixes(String uri) {
+    public Iterator<String> getPrefixes(String uri) {
         List<String> prefixes = new ArrayList<String>();
 
         String prefix = getPrefix(uri);

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Thu Jan  5 20:45:57 2012
@@ -24,6 +24,8 @@ import java.util.Map;
 
 import javax.xml.namespace.NamespaceContext;
 
+import org.apache.cxf.helpers.CastUtils;
+
 class DelegatingNamespaceContext implements NamespaceContext {
 
     private Map<String, String> prefixes = new HashMap<String, String>();
@@ -87,8 +89,8 @@ class DelegatingNamespaceContext impleme
         return prefix;
     }
 
-    public Iterator getPrefixes(String ns) {
-        return nc.getPrefixes(ns);
+    public Iterator<String> getPrefixes(String ns) {
+        return CastUtils.cast(nc.getPrefixes(ns));
     }
     
 }

Modified: cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java (original)
+++ cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java Thu Jan  5 20:45:57 2012
@@ -38,7 +38,7 @@ public class FireWallClassLoaderTest ext
     @Test
     public void testJavaLangStringAlt() throws Exception {
         ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(), new String[] {"java.*"});
-        Class c1 = c.loadClass("java.lang.String");
+        Class<?> c1 = c.loadClass("java.lang.String");
         assertNotNull("Should have returned a class here", c1);
     }
     

Modified: cxf/trunk/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java (original)
+++ cxf/trunk/common/common/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java Thu Jan  5 20:45:57 2012
@@ -240,7 +240,7 @@ class ProxyClass implements InvocationHa
     public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
         Object result = null;
         try {
-            Class[] types = new Class[0];
+            Class<?>[] types = new Class[0];
             if (args != null) {
                 types = new Class[args.length];
                 for (int i = 0; i < args.length; i++) {

Modified: cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java (original)
+++ cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanMapTest.java Thu Jan  5 20:45:57 2012
@@ -35,7 +35,7 @@ public class SpringBeanMapTest extends A
             new ClassPathXmlApplicationContext("org/apache/cxf/configuration/spring/beanMap.xml");
 
         
-        Map<String, Person> beans = CastUtils.cast(((MapProvider)context.getBean("mapOfPersons"))
+        Map<String, Person> beans = CastUtils.cast(((MapProvider<?, ?>)context.getBean("mapOfPersons"))
                                                        .createMap());
         assertNotNull(beans);
 

Modified: cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java (original)
+++ cxf/trunk/common/common/src/test/java/org/apache/cxf/configuration/spring/SpringBeanQNameMapTest.java Thu Jan  5 20:45:57 2012
@@ -38,7 +38,7 @@ public class SpringBeanQNameMapTest exte
         ClassPathXmlApplicationContext context = 
             new ClassPathXmlApplicationContext("org/apache/cxf/configuration/spring/beanQNameMap.xml");
 
-        Map<QName, Person> beans = CastUtils.cast(((MapProvider)context.getBean("committers"))
+        Map<QName, Person> beans = CastUtils.cast(((MapProvider<?, ?>)context.getBean("committers"))
                                                    .createMap());
         assertNotNull(beans);
 

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java Thu Jan  5 20:45:57 2012
@@ -27,7 +27,7 @@ import org.apache.cxf.jca.cxf.CXFConnect
 
 
 public class CXFConnectionParam {
-    private Class iface;
+    private Class<?> iface;
     private URL wsdlLocation;
     private QName serviceName;
     private QName portName;
@@ -36,7 +36,7 @@ public class CXFConnectionParam {
     public CXFConnectionParam() {
     }
 
-    public CXFConnectionParam(Class aIface, URL aWsdlLocation, 
+    public CXFConnectionParam(Class<?> aIface, URL aWsdlLocation, 
                                        QName aServiceName, QName aPortName) {
         this.iface = aIface;
         this.wsdlLocation = aWsdlLocation;

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java Thu Jan  5 20:45:57 2012
@@ -107,7 +107,7 @@ public class PlugInClassLoader extends S
 
         LOG.fine(props.toString());
 
-        Enumeration keys = props.keys();
+        Enumeration<Object> keys = props.keys();
 
         while (keys.hasMoreElements()) {
             String key = (String)keys.nextElement();

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java?rev=1227822&r1=1227821&r2=1227822&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java Thu Jan  5 20:45:57 2012
@@ -71,7 +71,7 @@ public final class PlugInClassLoaderHelp
             } else {
                 String enclosingJar = name.substring(0, name.lastIndexOf("!/") + 2);
                 String resourceName = name.substring(name.lastIndexOf("!/") + 2);
-                Map jarMap = JarLoader.getJarContents(enclosingJar);
+                Map<?, ?> jarMap = JarLoader.getJarContents(enclosingJar);
 
                 if (null != jarMap && jarMap.containsKey(resourceName)) {
                     byte bytes[] = (byte[])jarMap.get(resourceName);



Mime
View raw message