cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1228359 [1/2] - in /cxf/trunk: rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ services/sts/sts-core/src/test/java/org/apache/cxf/sts/ldap/ systests/jaxrs/src/test/java/o...
Date Fri, 06 Jan 2012 19:27:44 GMT
Author: dkulp
Date: Fri Jan  6 19:27:41 2012
New Revision: 1228359

URL: http://svn.apache.org/viewvc?rev=1228359&view=rev
Log:
Another couple hundred back-portable rawTypes warnings fixed

Modified:
    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/ext/xml/XMLSource.java
    cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/ldap/LDAPClaimsTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
    cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
    cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/ImageHelper.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
    cxf/trunk/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
    cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
    cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java
    cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/CorbaUtils.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
    cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
    cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java
    cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java
    cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
    cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java
    cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
    cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
    cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
    cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
    cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
    cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
    cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Fri Jan  6 19:27:41 2012
@@ -584,7 +584,6 @@ public final class JAXBEncoderDecoder {
     }
 
 
-    @SuppressWarnings("unchecked")
     public static Object unmarshall(Unmarshaller u, 
                                     Object source, 
                                     MessagePartInfo part,

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java Fri Jan  6 19:27:41 2012
@@ -316,7 +316,7 @@ public class XMLSource {
             return null;
         }
 
-        public Iterator getPrefixes(String namespace) {
+        public Iterator<?> getPrefixes(String namespace) {
             String prefix = namespaces.get(namespace);
             if (prefix == null) {
                 return null;

Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/ldap/LDAPClaimsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/ldap/LDAPClaimsTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/ldap/LDAPClaimsTest.java (original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/ldap/LDAPClaimsTest.java Fri Jan  6 19:27:41 2012
@@ -33,6 +33,7 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchControls;
 
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.sts.claims.Claim;
 import org.apache.cxf.sts.claims.ClaimCollection;
 import org.apache.cxf.sts.claims.ClaimTypes;
@@ -186,8 +187,8 @@ public class LDAPClaimsTest {
     @org.junit.Test    
     public void testSupportedClaims() throws Exception {
 
-        @SuppressWarnings("unchecked")
-        Map<String, String> mapping = (Map)appContext.getBean("claimsToLdapAttributeMapping");
+        Map<String, String> mapping 
+            = CastUtils.cast((Map<?, ?>)appContext.getBean("claimsToLdapAttributeMapping"));
 
         LdapClaimsHandler cHandler = new LdapClaimsHandler();
         cHandler.setClaimsLdapAttributeMapping(mapping);

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Fri Jan  6 19:27:41 2012
@@ -255,7 +255,7 @@ public class BookStore {
     
     @GET
     @Path("wrongparametertype")
-    public void wrongParameterType(@QueryParam("p") Map p) {
+    public void wrongParameterType(@QueryParam("p") Map<?, ?> p) {
         throw new IllegalStateException("This op is not expected to be invoked");
     }
     

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Fri Jan  6 19:27:41 2012
@@ -317,7 +317,7 @@ public class JAXRSClientServerSpringBook
     
     private void getBookAegis(String endpointAddress, String type, String mHeader) throws Exception {
         WebClient client = WebClient.create(endpointAddress,
-            Collections.singletonList(new AegisElementProvider()));
+            Collections.singletonList(new AegisElementProvider<Object>()));
         if (mHeader != null) {
             client = client.header("X-HTTP-Method-Override", mHeader);
         }

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/Structure.java Fri Jan  6 19:27:41 2012
@@ -53,6 +53,7 @@ public interface Structure extends Seria
     void setDbl(double value);
     void unsetDbl();
     boolean isSetDbl();
+    @SuppressWarnings("rawtypes")
     List getTexts();
 }
 

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/sdo/impl/StructureImpl.java Fri Jan  6 19:27:41 2012
@@ -183,7 +183,7 @@ public class StructureImpl extends DataO
      * @ordered
      */
 
-    protected List texts = null;
+    protected List<?> texts = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -375,7 +375,7 @@ public class StructureImpl extends DataO
      * 
      * @generated
      */
-    public List getTexts() {
+    public List<?> getTexts() {
         if (texts == null) {
             texts = createPropertyList(ListKind.DATATYPE, String.class, TEXTS, 0);
         }
@@ -406,7 +406,7 @@ public class StructureImpl extends DataO
      * 
      * @generated
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void set(int propertyIndex, Object newValue) {
         switch (propertyIndex) {
         case TEXT:

Modified: cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java (original)
+++ cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java Fri Jan  6 19:27:41 2012
@@ -136,7 +136,7 @@ public class SamlCallbackHandler impleme
                 AttributeStatementBean attrBean = new AttributeStatementBean();
                 attrBean.setSubject(subjectBean);
                 
-                List<String> roles = CastUtils.cast((List)m.getContextualProperty("saml.roles"));
+                List<String> roles = CastUtils.cast((List<?>)m.getContextualProperty("saml.roles"));
                 if (roles == null) {
                     roles = Collections.singletonList("user");
                 }
@@ -148,7 +148,7 @@ public class SamlCallbackHandler impleme
                 roleClaim.setAttributeValues(roles);
                 claims.add(roleClaim);
                 
-                List<String> authMethods = CastUtils.cast((List)m.getContextualProperty("saml.auth"));
+                List<String> authMethods = CastUtils.cast((List<?>)m.getContextualProperty("saml.auth"));
                 if (authMethods == null) {
                     authMethods = Collections.singletonList("password");
                 }

Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java (original)
+++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java Fri Jan  6 19:27:41 2012
@@ -89,7 +89,7 @@ public final class JMSTestUtil {
     private static void loadTestCases() throws Exception {
         JAXBContext context = JAXBContext.newInstance("org.apache.cxf.testsuite.testcase");
         Unmarshaller unmarshaller = context.createUnmarshaller();
-        JAXBElement e = (JAXBElement)unmarshaller.unmarshal(new JMSTestUtil().getClass()
+        JAXBElement<?> e = (JAXBElement<?>)unmarshaller.unmarshal(new JMSTestUtil().getClass()
             .getResource("/org/apache/cxf/jms/testsuite/util/testcases.xml"));
         testcases = (TestCasesType)e.getValue();
         for (TestCaseType tct : testcases.getTestCase()) {

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java Fri Jan  6 19:27:41 2012
@@ -63,7 +63,7 @@ public class ClientServerSessionTest ext
             
             
             Map<String, List<String>> headers 
-                = CastUtils.cast((Map)bp.getRequestContext().get("javax.xml.ws.http.request.headers"));
+                = CastUtils.cast((Map<?, ?>)bp.getRequestContext().get("javax.xml.ws.http.request.headers"));
 
             if (headers == null) {
                 headers = new HashMap<String, List<String>>();

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java Fri Jan  6 19:27:41 2012
@@ -73,7 +73,7 @@ public class PublishedEndpointUrlTest ex
         for (Service service : services) {
             Collection<Port> ports = CastUtils.cast(service.getPorts().values());
             for (Port port : ports) {
-                List extensions = port.getExtensibilityElements();
+                List<?> extensions = port.getExtensibilityElements();
                 for (Object extension : extensions) {
                     String actualUrl = null;
                     if (extension instanceof SOAP12Address) {

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java Fri Jan  6 19:27:41 2012
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.Endp
  *    If the password is not "password" a 401 is issued without 
  *    realm.
  */
-public class PushBack401 extends AbstractPhaseInterceptor {
+public class PushBack401 extends AbstractPhaseInterceptor<Message> {
     
     PushBack401() {
         super(Phase.RECEIVE);

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/GreeterImpl.java Fri Jan  6 19:27:41 2012
@@ -94,14 +94,6 @@ public class GreeterImpl implements Gree
         return null; 
     }
     
-    public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler ah) {  
-        return null; 
-    }
-    
-    public Future<?> testDocLitBareAsync(String bare, AsyncHandler ah) {
-        return null;
-    }
-    
     public Response<BareDocumentResponse> testDocLitBareAsync(String bare) {
         return null;
     }
@@ -144,5 +136,10 @@ public class GreeterImpl implements Gree
                                        AsyncHandler<TestNillableResponse> asyncHandler) {
         return null;
     }
+
+    public Future<?> testDocLitFaultAsync(String faultType,
+                                          AsyncHandler<TestDocLitFaultResponse> asyncHandler) {
+        return null;
+    }
     
 }

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/FaultHandlingInterceptor.java Fri Jan  6 19:27:41 2012
@@ -31,7 +31,7 @@ import org.apache.cxf.phase.Phase;
 /**
  * 
  */
-public class FaultHandlingInterceptor extends AbstractPhaseInterceptor {
+public class FaultHandlingInterceptor extends AbstractPhaseInterceptor<Message> {
     
     public FaultHandlingInterceptor() {
         super(Phase.USER_LOGICAL);

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java Fri Jan  6 19:27:41 2012
@@ -116,15 +116,15 @@ public class CountersClientServerTest ex
         //assertEquals(response, reply);  
         
         assertEquals("The Counters are not create yet", 4, cr.getCounters().size());
-        Set counterNames = mbs.queryNames(name, null);
+        Set<?> counterNames = mbs.queryNames(name, null);
         assertEquals("The Counters are not export to JMX: " + counterNames, 
                      4 + 3 , counterNames.size());
        
         ObjectName sayHiCounter =  new ObjectName(
             ManagementConstants.DEFAULT_DOMAIN_NAME + ":operation=\"sayHi\",*"); 
         
-        Set s = mbs.queryNames(sayHiCounter, null);        
-        Iterator it = s.iterator();
+        Set<?> s = mbs.queryNames(sayHiCounter, null);        
+        Iterator<?> it = s.iterator();
         
         while (it.hasNext()) {
             ObjectName counterName = (ObjectName)it.next();

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java Fri Jan  6 19:27:41 2012
@@ -77,7 +77,7 @@ public class ManagedBusTest extends Asse
             
             ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME 
                                              + ":type=Bus.Service.Endpoint,*");
-            Set s = mbs.queryMBeans(name, null);
+            Set<?> s = mbs.queryMBeans(name, null);
             assertEquals(2, s.size());
         } finally {
             bus.shutdown(true);
@@ -132,7 +132,7 @@ public class ManagedBusTest extends Asse
         MBeanServer mbs = im.getMBeanServer();      
         ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME 
                                          + ":type=WorkQueueManager,*");
-        Set s = mbs.queryNames(name, null);
+        Set<?> s = mbs.queryNames(name, null);
         StringBuilder b = new StringBuilder();
         for (ObjectName o : CastUtils.cast(s, ObjectName.class)) {
             b.append(o.toString());
@@ -161,7 +161,7 @@ public class ManagedBusTest extends Asse
         }
         assertEquals("Size is wrong: " + b.toString(), 2, s.size());
         
-        Iterator it = s.iterator();
+        Iterator<?> it = s.iterator();
         while (it.hasNext()) {
             ObjectName n = (ObjectName)it.next();            
             Long result = 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java Fri Jan  6 19:27:41 2012
@@ -98,7 +98,7 @@ public class ManagedClientServerTest ext
         MBeanServer mbs = im.getMBeanServer();
         ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME
                                          + ":type=Bus.Service.Endpoint,*");
-        Set s = mbs.queryNames(name, null);
+        Set<?> s = mbs.queryNames(name, null);
         assertEquals(1, s.size());
         name = (ObjectName)s.iterator().next();
 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/ImageHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/ImageHelper.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/ImageHelper.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/ImageHelper.java Fri Jan  6 19:27:41 2012
@@ -39,9 +39,9 @@ public final class ImageHelper {
 
         BufferedImage bufImage = convertToBufferedImage(image);
         ImageWriter writer = null;
-        Iterator i = ImageIO.getImageWritersByMIMEType(type);
+        Iterator<ImageWriter> i = ImageIO.getImageWritersByMIMEType(type);
         if (i.hasNext()) {
-            writer = (ImageWriter)i.next();
+            writer = i.next();
         }
         if (writer != null) {
             ImageOutputStream stream = null;

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java Fri Jan  6 19:27:41 2012
@@ -103,15 +103,15 @@ public class OOBHdrServiceImpl implement
         boolean success = false;
         MessageContext ctx = context == null ? null : context.getMessageContext();
         if (ctx.containsKey(Header.HEADER_LIST)) {
-            List oobHdr = (List) ctx.get(Header.HEADER_LIST);
-            Iterator iter = oobHdr.iterator();
+            List<?> oobHdr = (List<?>) ctx.get(Header.HEADER_LIST);
+            Iterator<?> iter = oobHdr.iterator();
             while (iter.hasNext()) {
                 Object hdr = iter.next();
                 if (hdr instanceof Header && ((Header) hdr).getObject() instanceof Node) {
                     Header hdr1 = (Header) hdr;
                     //System.out.println("Node conains : " + hdr1.getObject().toString());
                     try {
-                        JAXBElement job = (JAXBElement) JAXBContext.newInstance(ObjectFactory.class)
+                        JAXBElement<?> job = (JAXBElement<?>) JAXBContext.newInstance(ObjectFactory.class)
                             .createUnmarshaller()
                             .unmarshal((Node) hdr1.getObject());
                         OutofBandHeader ob = (OutofBandHeader) job.getValue();

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java Fri Jan  6 19:27:41 2012
@@ -120,7 +120,7 @@ public class OOBHeaderTest extends Abstr
             bp = (BindingProvider)handler;
             Map<String, Object> responseContext = bp.getResponseContext();
             OutofBandHeader hdrToTest = null;
-            List oobHdr = (List) responseContext.get(Header.HEADER_LIST);
+            List<?> oobHdr = (List<?>) responseContext.get(Header.HEADER_LIST);
             if (oobHdr == null) {
                 fail("Should have got List of out-of-band headers ..");
             }
@@ -129,7 +129,7 @@ public class OOBHeaderTest extends Abstr
                     oobHdr.size() == 1);
          
             if (oobHdr != null & oobHdr instanceof List) {
-                Iterator iter = oobHdr.iterator();
+                Iterator<?> iter = oobHdr.iterator();
                 while (iter.hasNext()) {
                     Object hdr = iter.next();
                     if (hdr instanceof Header) {
@@ -137,9 +137,10 @@ public class OOBHeaderTest extends Abstr
                         if (hdr1.getObject() instanceof Node) {
                             //System.out.println("Node conains : " + hdr1.getObject().toString());
                             try {
-                                JAXBElement job = (JAXBElement) JAXBContext.newInstance(ObjectFactory.class)
-                                    .createUnmarshaller()
-                                    .unmarshal((Node) hdr1.getObject());
+                                JAXBElement<?> job 
+                                    = (JAXBElement<?>)JAXBContext.newInstance(ObjectFactory.class)
+                                        .createUnmarshaller()
+                                        .unmarshal((Node) hdr1.getObject());
                                 hdrToTest = (OutofBandHeader) job.getValue();
 //                                 System.out.println("oob-hdr contains : \nname = " 
 //                                       + hdrToTest.getName() 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java Fri Jan  6 19:27:41 2012
@@ -64,7 +64,7 @@ public class RestSourcePayloadProvider i
             (Map<String, List<String>>)mc.get(MessageContext.HTTP_REQUEST_HEADERS);*/
         
         Map<String, List<String>> responseHeader =
-            CastUtils.cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
+            CastUtils.cast((Map<?, ?>)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
         if (responseHeader == null) {
             responseHeader = new HashMap<String, List<String>>();
             mc.put(MessageContext.HTTP_RESPONSE_HEADERS, responseHeader);

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java Fri Jan  6 19:27:41 2012
@@ -59,7 +59,7 @@ public class RestSourcePayloadProviderHt
         String httpMethod = (String)mc.get(MessageContext.HTTP_REQUEST_METHOD);
         
         Map<String, List<String>> responseHeader =
-            CastUtils.cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
+            CastUtils.cast((Map<?, ?>)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
         if (responseHeader == null) {
             responseHeader = new HashMap<String, List<String>>();
             mc.put(MessageContext.HTTP_RESPONSE_HEADERS, responseHeader);

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java Fri Jan  6 19:27:41 2012
@@ -19,7 +19,6 @@
 package org.apache.cxf.systest.soapfault;
 
 import java.io.PrintStream;
-import java.util.Map;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
@@ -44,9 +43,6 @@ public class LoggingHandler implements S
         out = ps;
     }
 
-    public void init(Map c) {
-    }
-
     public Set<QName> getHeaders() {
         return null;
     }

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java Fri Jan  6 19:27:41 2012
@@ -1017,8 +1017,8 @@ public abstract class AbstractTypeTestCl
             assertEquals("StructWithAny soap element text nodes don't match",
                 soapA.getValue(), soapB.getValue());
             
-            Iterator itExp = soapA.getChildElements();
-            Iterator itGen = soapB.getChildElements();
+            Iterator<?> itExp = soapA.getChildElements();
+            Iterator<?> itGen = soapB.getChildElements();
             while (itExp.hasNext()) {
                 if (!itGen.hasNext()) {
                     fail("Incorrect number of child elements inside any");

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java Fri Jan  6 19:27:41 2012
@@ -139,15 +139,6 @@ public abstract class AbstractGreeterImp
         /*not called */
     }
     
-    public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler ah) {  
-        return null; 
-        /*not called */
-    }
-    
-    public Future<?> testDocLitBareAsync(String bare, AsyncHandler ah) {
-        return null;
-        /* not called */
-    }
     
     public Response<BareDocumentResponse> testDocLitBareAsync(String bare) {
         return null;
@@ -185,7 +176,6 @@ public abstract class AbstractGreeterImp
     }
 
     public String testNillable(String nillElem, int intElem) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -199,5 +189,9 @@ public abstract class AbstractGreeterImp
                                        AsyncHandler<TestNillableResponse> asyncHandler) {
         return null;
     }
-    
+    public Future<?> testDocLitFaultAsync(String faultType,
+                                          AsyncHandler<TestDocLitFaultResponse> asyncHandler) {
+        return null;
+    }
+
 }

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java Fri Jan  6 19:27:41 2012
@@ -88,6 +88,7 @@ public class NonDecoupledJMSTest extends
                 endpointInterface = "org.apache.hello_world_soap_http.Greeter", 
                 targetNamespace = "http://apache.org/hello_world_soap_http")
     public static class GreeterImpl extends org.apache.cxf.systest.ws.addressing.AbstractGreeterImpl {
+
         
     }
 }

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java Fri Jan  6 19:27:41 2012
@@ -74,7 +74,7 @@ public class MessageLossSimulator extend
         InterceptorChain chain = message.getInterceptorChain();
         ListIterator<Interceptor<? extends Message>> it = chain.getIterator();
         while (it.hasNext()) {
-            PhaseInterceptor<?> pi = (PhaseInterceptor)it.next();
+            PhaseInterceptor<?> pi = (PhaseInterceptor<? extends Message>)it.next();
             if (MessageSenderInterceptor.class.getName().equals(pi.getId())) {
                 chain.remove(pi);
                 LOG.fine("Removed MessageSenderInterceptor from interceptor chain.");

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Fri Jan  6 19:27:41 2012
@@ -266,7 +266,7 @@ public class ServerPersistenceTest exten
     }
     
     @SuppressWarnings("unchecked")
-    <T> Response<T>[] cast(Response[] val) {
+    <T> Response<T>[] cast(Response<?>[] val) {
         return (Response<T>[])val;
     }
 

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java Fri Jan  6 19:27:41 2012
@@ -251,7 +251,7 @@ public abstract class AbstractCXFToolCon
     protected String[] getDefaultExcludedNamespaces(String excludeProps) {
         List<String> result = new ArrayList<String>();
         Properties props = loadProperties(excludeProps);
-        java.util.Enumeration nexcludes = props.propertyNames();
+        java.util.Enumeration<?> nexcludes = props.propertyNames();
 
         while (nexcludes.hasMoreElements()) {
             result.add(props.getProperty((String)nexcludes.nextElement()));

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java Fri Jan  6 19:27:41 2012
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.io.Writer;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -98,8 +97,7 @@ public final class VelocityGenerator {
 
         VelocityContext ctx = new VelocityContext();
 
-        for (Iterator iter = attributes.keySet().iterator(); iter.hasNext();) {
-            String key = (String)iter.next();
+        for (String key: attributes.keySet()) {
             ctx.put(key, attributes.get(key));
         }
 

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JAnnotationElement.java Fri Jan  6 19:27:41 2012
@@ -130,7 +130,7 @@ public final class JAnnotationElement {
     }
 
     private void appendEnumValue(final StringBuilder sb, final Object obj) {
-        Enum e = (Enum) obj;
+        Enum<?> e = (Enum<?>) obj;
 
         String clzName = e.getClass().getName();
         if (clzName.contains("$")) {

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java Fri Jan  6 19:27:41 2012
@@ -148,7 +148,7 @@ public class JavaMethod implements JavaA
     }
     
     private void replaceParameter(JavaParameter p1, JavaParameter p2) {
-        int index = ((ArrayList)parameters).indexOf(p1);
+        int index = ((ArrayList<?>)parameters).indexOf(p1);
         parameters.remove(index);
         parameters.add(index, p2);
         if ((p1.isIN() && p2.isOUT()) || p1.isINOUT()) {

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/ErrorVisitor.java Fri Jan  6 19:27:41 2012
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.common.tool
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -182,8 +181,8 @@ public class ErrorVisitor {
     public String toString() {
         StringBuilder res = new StringBuilder();
 
-        for (Iterator it = errors.iterator(); it.hasNext();) {
-            res.append(it.next().toString()).append(System.getProperty("line.separator"));
+        for (Object o : errors) {
+            res.append(o.toString()).append(System.getProperty("line.separator"));
         }
         return res.toString();
     }

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java Fri Jan  6 19:27:41 2012
@@ -20,7 +20,6 @@
 package org.apache.cxf.tools.common.toolspec.parser;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -36,7 +35,7 @@ public class OptionGroup implements Toke
     private static final Logger LOG = LogUtils.getL7dLogger(OptionGroup.class);
     private final Element element;
 
-    private final List<Object> options = new ArrayList<Object>();
+    private final List<Option> options = new ArrayList<Option>();
 
     public OptionGroup(Element el) {
         this.element = el;
@@ -59,9 +58,7 @@ public class OptionGroup implements Toke
         // string:
         boolean accepted = false;
 
-        for (Iterator it = options.iterator(); it.hasNext();) {
-            Option option = (Option)it.next();
-
+        for (Option option : options) {
             if (option.accept(args, result, errors)) {
                 if (LOG.isLoggable(Level.FINE)) {
                     LOG.fine("Option " + option + " accepted the token");
@@ -82,8 +79,8 @@ public class OptionGroup implements Toke
 
     public boolean isSatisfied(ErrorVisitor errors) {
         // Return conjunction of all isSatisfied results from every option
-        for (Iterator it = options.iterator(); it.hasNext();) {
-            if (!((Option)it.next()).isSatisfied(errors)) {
+        for (Option option : options) {
+            if (!option.isSatisfied(errors)) {
                 return false;
             }
         }

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java Fri Jan  6 19:27:41 2012
@@ -73,7 +73,7 @@ public final class AnnotationUtil {
     }
 
     public static synchronized Class loadClass(String className, ClassLoader parent) {
-        Class clazz = null;
+        Class<?> clazz = null;
         URL[] urls = URIParserUtil.pathToURLs(getClassPath());
         URLClassLoader classLoader = new URLClassLoader(urls, parent);
         try {

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Fri Jan  6 19:27:41 2012
@@ -23,7 +23,6 @@ import java.lang.reflect.InvocationHandl
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import javax.wsdl.Binding;
@@ -105,9 +104,7 @@ public final class SOAPBindingUtil {
     }
 
     public static boolean isSOAPBinding(Binding binding) {
-        Iterator ite = binding.getExtensibilityElements().iterator();
-        while (ite.hasNext()) {
-            Object obj = ite.next();
+        for (Object obj : binding.getExtensibilityElements()) {
             if (isSOAPBinding(obj)) {
                 return true;
             }
@@ -116,9 +113,7 @@ public final class SOAPBindingUtil {
     }
 
     public static String getBindingStyle(Binding binding) {
-        Iterator ite = binding.getExtensibilityElements().iterator();
-        while (ite.hasNext()) {
-            Object obj = ite.next();
+        for (Object obj : binding.getExtensibilityElements()) {
             if (isSOAPBinding(obj)) {
                 return getSoapBinding(obj).getStyle();
             }
@@ -147,9 +142,7 @@ public final class SOAPBindingUtil {
     public static String getSOAPOperationStyle(BindingOperation bop) {
         String style = "";
         if (bop != null) {
-            Iterator ite = bop.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
+            for (Object obj : bop.getExtensibilityElements()) {
                 if (isSOAPOperation(obj)) {
                     style = getSoapOperation(obj).getStyle();
                     break;
@@ -162,9 +155,7 @@ public final class SOAPBindingUtil {
     public static SoapBody getBindingInputSOAPBody(BindingOperation bop) {
         BindingInput bindingInput = bop.getBindingInput();
         if (bindingInput != null) {
-            Iterator ite = bindingInput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
+            for (Object obj : bindingInput.getExtensibilityElements()) {
                 if (isSOAPBody(obj)) {
                     return getSoapBody(obj);
                 }
@@ -177,9 +168,7 @@ public final class SOAPBindingUtil {
     public static SoapBody getBindingOutputSOAPBody(BindingOperation bop) {
         BindingOutput bindingOutput = bop.getBindingOutput();
         if (bindingOutput != null) {
-            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
+            for (Object obj : bindingOutput.getExtensibilityElements()) {
                 if (isSOAPBody(obj)) {
                     return getSoapBody(obj);
                 }
@@ -248,9 +237,7 @@ public final class SOAPBindingUtil {
     public static SoapHeader getBindingInputSOAPHeader(BindingOperation bop) {
         BindingInput bindingInput = bop.getBindingInput();
         if (bindingInput != null) {
-            Iterator ite = bindingInput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
+            for (Object obj : bindingInput.getExtensibilityElements()) {
                 if (isSOAPHeader(obj)) {
                     return getProxy(SoapHeader.class, obj);
                 }
@@ -263,9 +250,7 @@ public final class SOAPBindingUtil {
     public static SoapHeader getBindingOutputSOAPHeader(BindingOperation bop) {
         BindingOutput bindingOutput = bop.getBindingOutput();
         if (bindingOutput != null) {
-            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
+            for (Object obj : bindingOutput.getExtensibilityElements()) {
                 if (isSOAPHeader(obj)) {
                     return getProxy(SoapHeader.class, obj);
                 }
@@ -297,15 +282,13 @@ public final class SOAPBindingUtil {
 
     public static List<SoapFault> getBindingOperationSoapFaults(BindingOperation bop) {
         List<SoapFault> faults = new ArrayList<SoapFault>();
-        Map bindingFaults = bop.getBindingFaults();
-        for (Object obj : bindingFaults.values()) {
+        for (Object obj : bop.getBindingFaults().values()) {
             if (!(obj instanceof BindingFault)) {
                 continue;
             }
             BindingFault faultElement = (BindingFault) obj;
-            Iterator ite = faultElement.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                SoapFault fault = getSoapFault(ite.next());
+            for (Object flt : faultElement.getExtensibilityElements()) {
+                SoapFault fault = getSoapFault(flt);
                 if (fault != null) {
                     faults.add(fault);
                 }
@@ -322,12 +305,11 @@ public final class SOAPBindingUtil {
     }
 
     public static boolean isMixedStyle(Binding binding) {
-        Iterator ite = binding.getExtensibilityElements().iterator();
         String bindingStyle = "";
         String previousOpStyle = "";
         String style = "";
-        while (ite.hasNext()) {
-            Object obj = ite.next();
+        
+        for (Object obj : binding.getExtensibilityElements()) {
             if (isSOAPBinding(obj)) {
                 SoapBinding soapBinding = getSoapBinding(obj);
                 bindingStyle = soapBinding.getStyle();
@@ -336,13 +318,9 @@ public final class SOAPBindingUtil {
                 }
             }
         }
-        Iterator ite2 = binding.getBindingOperations().iterator();
-        while (ite2.hasNext()) {
-            BindingOperation bop = (BindingOperation)ite2.next();
-            Iterator ite3 = bop.getExtensibilityElements().iterator();
-            while (ite3.hasNext()) {
-                Object obj = ite3.next();
-
+        for (Object bobj : binding.getBindingOperations()) {
+            BindingOperation bop = (BindingOperation)bobj;
+            for (Object obj : bop.getExtensibilityElements()) {
                 if (isSOAPOperation(obj)) {
                     SoapOperation soapOperation = getSoapOperation(obj);
                     style = soapOperation.getStyle();
@@ -369,9 +347,7 @@ public final class SOAPBindingUtil {
 
             }
         }
-
         return false;
-
     }
 
     public static String getCanonicalBindingStyle(Binding binding) {
@@ -379,8 +355,8 @@ public final class SOAPBindingUtil {
         if (!StringUtils.isEmpty(bindingStyle)) {
             return bindingStyle;
         }
-        for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();) {
-            BindingOperation bindingOp = (BindingOperation)ite2.next();
+        for (Object bobj : binding.getBindingOperations()) {
+            BindingOperation bindingOp = (BindingOperation)bobj;
             String bopStyle = getSOAPOperationStyle(bindingOp);
             if (!StringUtils.isEmpty(bopStyle)) {
                 return bopStyle;
@@ -488,7 +464,7 @@ public final class SOAPBindingUtil {
 
 
     public static void addSOAPNamespace(Definition definition, boolean isSOAP12) {
-        Map namespaces = definition.getNamespaces();
+        Map<?, ?> namespaces = definition.getNamespaces();
         if (isSOAP12
             && !namespaces.values().contains(WSDLConstants.NS_SOAP12)) {
             definition.addNamespace("soap12", WSDLConstants.NS_SOAP12);

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java Fri Jan  6 19:27:41 2012
@@ -202,8 +202,8 @@ public final class URIParserUtil {
         return newToken.toString();
     }
 
-    private static String combine(List r, char sep) {
-        StringBuilder buf = new StringBuilder(r.get(0).toString());
+    private static String combine(List<String> r, char sep) {
+        StringBuilder buf = new StringBuilder(r.get(0));
 
         for (int i = 1; i < r.size(); i++) {
             buf.append(sep);

Modified: cxf/trunk/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java (original)
+++ cxf/trunk/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java Fri Jan  6 19:27:41 2012
@@ -46,7 +46,7 @@ public IDLLexer(LexerSharedInputState st
 	super(state);
 	caseSensitiveLiterals = true;
 	setCaseSensitive(true);
-	literals = new Hashtable();
+	literals = new Hashtable<ANTLRHashString, Integer>();
 	literals.put(new ANTLRHashString("switch", this), new Integer(56));
 	literals.put(new ANTLRHashString("typeprefix", this), new Integer(78));
 	literals.put(new ANTLRHashString("case", this), new Integer(57));

Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/IDLToWSDL.java Fri Jan  6 19:27:41 2012
@@ -50,7 +50,7 @@ public class IDLToWSDL extends AbstractC
         super(TOOL_NAME, toolspec);
     }
 
-    private Set getArrayKeys() {
+    private Set<String> getArrayKeys() {
         Set<String> arrayKeys = new HashSet<String>();
         arrayKeys.add(ToolCorbaConstants.CFG_INCLUDEDIR);
         return arrayKeys;

Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/WSDLToIDL.java Fri Jan  6 19:27:41 2012
@@ -52,7 +52,7 @@ public class WSDLToIDL extends AbstractC
         super(TOOL_NAME, toolspec);
     }
 
-    private Set getArrayKeys() {
+    private Set<String> getArrayKeys() {
         return new HashSet<String>();
     }
 

Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/CorbaUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/CorbaUtils.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/CorbaUtils.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/CorbaUtils.java Fri Jan  6 19:27:41 2012
@@ -19,16 +19,15 @@
 
 package org.apache.cxf.tools.corba.common.idltypes;
 
-import java.util.Iterator;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 
 public class CorbaUtils {
     
-    protected static final Set<Object> IDL_RESERVED_WORDS = new TreeSet<Object>();
-    protected static final Set<Object> IGNORED_MODULES = new TreeSet<Object>();    
-    protected static final Set<Object> TIMEBASE_IDL_DEFS = new TreeSet<Object>();
+    protected static final Set<String> IDL_RESERVED_WORDS = new TreeSet<String>();
+    protected static final Set<String> IGNORED_MODULES = new TreeSet<String>();    
+    protected static final Set<String> TIMEBASE_IDL_DEFS = new TreeSet<String>();
     
     static {
         /* IDL Key Words */
@@ -160,9 +159,7 @@ public class CorbaUtils {
     }
     
     public static boolean isCollideWithKeyWord(String name) {
-        Iterator it = IDL_RESERVED_WORDS.iterator();
-        while (it.hasNext()) {
-            String key = (String)it.next();
+        for (String key : IDL_RESERVED_WORDS) {
             if (key.equalsIgnoreCase(name)) {
                 return true;
             }

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java Fri Jan  6 19:27:41 2012
@@ -51,7 +51,7 @@ public class JavaToWSContainer extends A
             //checkParams(errors);
             if (!hasInfoOption()) {
                 ToolContext env = new ToolContext();
-                env.setParameters(getParametersMap(new HashSet()));
+                env.setParameters(getParametersMap(new HashSet<String>()));
                 if (env.get(ToolConstants.CFG_OUTPUTDIR) == null) {
                     env.put(ToolConstants.CFG_OUTPUTDIR, ".");
                 }

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java Fri Jan  6 19:27:41 2012
@@ -40,10 +40,10 @@ public final class WSDLGeneratorFactory 
     }
 
     public AbstractGenerator newGenerator() {
-        AbstractGenerator generator = null;
+        AbstractGenerator<?> generator = null;
         String clzName = getGeneratorClassName();
         try {
-            generator = (AbstractGenerator) Class.forName(clzName).newInstance();
+            generator = (AbstractGenerator<?>) Class.forName(clzName).newInstance();
         } catch (Exception e) {
             throw new ToolException("Can not find the Generator for: " + clzName, e);
         }

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java Fri Jan  6 19:27:41 2012
@@ -68,7 +68,7 @@ public final class DateTypeCustomGenerat
     }
 
     public File generate(File outputdir) {
-        Class dateType = getDateType();
+        Class<?> dateType = getDateType();
         File xjb = getJAXBCustFile(outputdir);
 
         if (dateType != null) {
@@ -122,7 +122,7 @@ public final class DateTypeCustomGenerat
 
         for (OperationInfo op : getServiceModel().getInterface().getOperations()) {
             Method m = (Method) op.getProperty("operation.method");
-            for (Class clz : m.getParameterTypes()) {
+            for (Class<?> clz : m.getParameterTypes()) {
                 if (clz == Date.class || clz == Calendar.class) {
                     return clz;
                 }

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java Fri Jan  6 19:27:41 2012
@@ -57,7 +57,7 @@ public final class FaultBeanGenerator ex
         Collection<JavaClass> faultBeanClasses = new HashSet<JavaClass>();
         String defaultPackage = seiPackageName + ".jaxws";
         FaultBean bean = new FaultBean();
-        for (Class clz : exceptionClasses) {
+        for (Class<?> clz : exceptionClasses) {
             if (!bean.faultBeanExists(clz)) {
                 faultBeanClasses.add(bean.transform(clz, defaultPackage));
             }
@@ -68,10 +68,10 @@ public final class FaultBeanGenerator ex
 
     protected Set<Class> getExceptionClasses(final Method method) {
         Set<Class> exps = new HashSet<Class>();
-        final Class[] exceptionClasses = method.getExceptionTypes();
+        final Class<?>[] exceptionClasses = method.getExceptionTypes();
         for (int i = 0; i < exceptionClasses.length; i++) {
             boolean exclude = false;
-            Class exClazz = exceptionClasses[i];
+            Class<?> exClazz = exceptionClasses[i];
             
             if (exClazz.equals(Exception.class) 
                 || Fault.class.isAssignableFrom(exClazz)

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactory.java Fri Jan  6 19:27:41 2012
@@ -38,6 +38,8 @@ public final class FrontendFactory {
     private static FrontendFactory instance;
     private Class<?> serviceClass;
     private List<Method> wsMethods;
+    
+    @SuppressWarnings("unchecked")
     private Class<? extends Annotation>[] annotations 
         = new Class[] {SOAPBinding.class,
                        WebService.class,

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java Fri Jan  6 19:27:41 2012
@@ -55,7 +55,7 @@ public class JavaToWSDLProcessor impleme
     private static final String DEFAULT_ADDRESS = "http://localhost:9090/hello";
     private static final String JAVA_CLASS_PATH = "java.class.path";
     private ToolContext context;
-    private final List<AbstractGenerator> generators = new ArrayList<AbstractGenerator>();
+    private final List<AbstractGenerator<?>> generators = new ArrayList<AbstractGenerator<?>>();
     
     private void customize(ServiceInfo service) {
         if (context.containsKey(ToolConstants.CFG_TNS)) {
@@ -123,32 +123,32 @@ public class JavaToWSDLProcessor impleme
         LOG.log(Level.FINE, "RESUME_CP", oldClassPath);
     }
 
-    private AbstractGenerator getWrapperBeanGenerator() {
+    private AbstractGenerator<?> getWrapperBeanGenerator() {
         WrapperBeanGenerator generator = new WrapperBeanGenerator();
         generator.setOutputBase(getSourceDir());
         generator.setCompileToDir(getClassesDir());
         return generator;
     }
 
-    private AbstractGenerator getFaultBeanGenerator() {
+    private AbstractGenerator<?> getFaultBeanGenerator() {
         FaultBeanGenerator generator = new FaultBeanGenerator();
         generator.setOutputBase(getSourceDir());
         generator.setCompileToDir(getClassesDir());
         return generator;
     }
 
-    private AbstractGenerator getWSDLGenerator(final File wsdlFile) {
+    private AbstractGenerator<?> getWSDLGenerator(final File wsdlFile) {
         WSDLGeneratorFactory factory = new WSDLGeneratorFactory();
         factory.setWSDLVersion(getWSDLVersion());
 
-        AbstractGenerator generator = factory.newGenerator();
+        AbstractGenerator<?> generator = factory.newGenerator();
         generator.setAllowImports(context.containsKey(ToolConstants.CFG_CREATE_XSD_IMPORTS));
         generator.setOutputBase(wsdlFile);
         return generator;
     }
 
     public void generate(ServiceInfo service, File output) throws ToolException {
-        for (AbstractGenerator generator : generators) {
+        for (AbstractGenerator<?> generator : generators) {
             generator.setServiceModel(service);
             generator.setBus(getBus());
             generator.generate(output);

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java Fri Jan  6 19:27:41 2012
@@ -37,6 +37,6 @@ public interface ListTest {
     @RequestWrapper(className = "apache.cxf.SayHi", 
                     localName = "sayHi", 
                     targetNamespace = "http://cxf.apache/")
-    List sayHi(String hi);
+    List<?> sayHi(String hi);
 
 }

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java Fri Jan  6 19:27:41 2012
@@ -24,7 +24,7 @@ import javax.jws.WebService;
             endpointInterface = "org.apache.cxf.tools.fortest.cxf774.ListTest",
             targetNamespace = "http://cxf.apache/")
 public class ListTestImpl implements ListTest {
-    public List sayHi(String hi) {
+    public List<?> sayHi(String hi) {
         return null;
     }
 

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java Fri Jan  6 19:27:41 2012
@@ -30,7 +30,7 @@ public class WSDLGeneratorFactoryTest ex
     public void testNewWSDL11Generator() {
         WSDLGeneratorFactory factory = new WSDLGeneratorFactory();
         factory.setWSDLVersion(WSDLConstants.WSDLVersion.WSDL11);
-        AbstractGenerator generator = factory.newGenerator();
+        AbstractGenerator<?> generator = factory.newGenerator();
         assertNotNull(generator);
         assertTrue(generator instanceof WSDL11Generator);
     }

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java (original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/WSDLValidator.java Fri Jan  6 19:27:41 2012
@@ -43,7 +43,7 @@ public class WSDLValidator extends Abstr
         super(TOOL_NAME, toolspec);
     }
 
-    private Set getArrayKeys() {
+    private Set<String> getArrayKeys() {
         Set<String> set = new HashSet<String>();
         set.add(ToolConstants.CFG_SCHEMA_URL);
         return set;

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java (original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java Fri Jan  6 19:27:41 2012
@@ -20,6 +20,7 @@
 package org.apache.cxf.tools.validator.internal;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
@@ -31,6 +32,7 @@ import javax.wsdl.extensions.mime.MIMECo
 import javax.wsdl.extensions.mime.MIMEMultipartRelated;
 import javax.wsdl.extensions.mime.MIMEPart;
 
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.util.SOAPBindingUtil;
 
 public class MIMEBindingValidator
@@ -41,9 +43,8 @@ public class MIMEBindingValidator
     }
 
     public boolean isValid() {
-        Iterator itBinding = def.getBindings().keySet().iterator();
-        while (itBinding.hasNext()) {
-            Binding binding = (Binding)def.getBindings().get(itBinding.next());
+        Collection<Binding> bindings = CastUtils.cast(def.getBindings().values());
+        for (Binding binding: bindings) {
             Iterator itOperation = binding.getBindingOperations().iterator();
             while (itOperation.hasNext()) {
                 BindingOperation bindingOperation = (BindingOperation)itOperation.next();

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java?rev=1228359&r1=1228358&r2=1228359&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java (original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java Fri Jan  6 19:27:41 2012
@@ -135,10 +135,10 @@ public class WSDLRefValidator extends Ab
     }
     private 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;
@@ -257,9 +257,9 @@ public class WSDLRefValidator extends Ab
     }
 
     private void addServices(final Definition wsdlDef) {
-        Iterator sNames = wsdlDef.getServices().keySet().iterator();
+        Iterator<QName> sNames = CastUtils.cast(wsdlDef.getServices().keySet().iterator());
         while (sNames.hasNext()) {
-            QName sName = (QName) sNames.next();
+            QName sName = sNames.next();
             services.put(sName, definition.getService(sName));
         }
     }
@@ -279,9 +279,8 @@ public class WSDLRefValidator extends Ab
         if (service.getPorts().values().size() == 0) {
             throw new ToolException("Service " + service.getQName() + " does not contain any usable ports");
         }
-        Iterator portIte = service.getPorts().values().iterator();
-        while (portIte.hasNext()) {
-            Port port = (Port)portIte.next();
+        Collection<Port> ports = CastUtils.cast(service.getPorts().values());
+        for (Port port : ports) {
             Binding binding = port.getBinding();
             bindings.put(binding.getQName(), getXNode(service, port));
             if (WSDLConstants.NS_WSDL11.equals(binding.getQName().getNamespaceURI())) {
@@ -296,8 +295,8 @@ public class WSDLRefValidator extends Ab
 
     private Map<QName, Operation> getOperations(PortType portType) {
         Map<QName, Operation> operations = new HashMap<QName, Operation>();
-        for (Iterator iter = portType.getOperations().iterator(); iter.hasNext();) {
-            Operation op = (Operation) iter.next();
+        Collection<Operation> pops = CastUtils.cast(portType.getOperations());
+        for (Operation op : pops) {
             operations.put(new QName(portType.getQName().getNamespaceURI(), op.getName()), op);
         }
         return operations;
@@ -435,8 +434,8 @@ public class WSDLRefValidator extends Ab
             XNode vPortTypeNode = getXNode(binding.getPortType());
             vPortTypeNode.setFailurePoint(vBindingNode);
             vNodes.add(vPortTypeNode);
-            for (Iterator iter = binding.getBindingOperations().iterator(); iter.hasNext();) {
-                BindingOperation bop = (BindingOperation) iter.next();
+            Collection<BindingOperation> bops = CastUtils.cast(binding.getBindingOperations());
+            for (BindingOperation bop : bops) {
                 XNode vOpNode = getOperationXNode(vPortTypeNode, bop.getName());
                 XNode vBopNode = getOperationXNode(vBindingNode, bop.getName());
                 vOpNode.setFailurePoint(vBopNode);
@@ -457,7 +456,7 @@ public class WSDLRefValidator extends Ab
                         vNodes.add(vOutputNode);
                     }
                 }
-                for (Iterator iter1 = bop.getBindingFaults().keySet().iterator(); iter1.hasNext();) {
+                for (Iterator<?> iter1 = bop.getBindingFaults().keySet().iterator(); iter1.hasNext();) {
                     String faultName = (String) iter1.next();
                     XNode vFaultNode = getFaultXNode(vOpNode, faultName);
                     vFaultNode.setFailurePoint(getFaultXNode(vBopNode, faultName));
@@ -483,7 +482,7 @@ public class WSDLRefValidator extends Ab
     private void collectValidationPointsForMessages() {
         for (QName msgName : messageRefNames) {
             javax.wsdl.Message message = getMessage(msgName);
-            for (Iterator iter = message.getParts().values().iterator(); iter.hasNext();) {
+            for (Iterator<?> iter = message.getParts().values().iterator(); iter.hasNext();) {
                 Part part = (Part) iter.next();
                 QName elementName = part.getElementName();
                 QName typeName = part.getTypeName();
@@ -574,7 +573,7 @@ public class WSDLRefValidator extends Ab
                         messageRefNames.add(outMsg.getQName());
                     }
                 }
-                for (Iterator iter = operation.getFaults().values().iterator(); iter.hasNext();) {
+                for (Iterator<?> iter = operation.getFaults().values().iterator(); iter.hasNext();) {
                     Fault fault = (Fault) iter.next();
                     javax.wsdl.Message faultMsg = fault.getMessage();
                     XNode vFaultMsgNode = getXNode(faultMsg);



Mime
View raw message