cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1231252 [2/3] - in /cxf/branches/2.5.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/ rt/databindin...
Date Fri, 13 Jan 2012 19:09:40 GMT
Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Fri Jan 13 19:09:37 2012
@@ -128,7 +128,7 @@ public class HTTPTransportFactory 
         List<?>     ees
     ) {
         if (ees != null) {
-            for (Iterator itr = ees.iterator(); itr.hasNext();) {
+            for (Iterator<?> itr = ees.iterator(); itr.hasNext();) {
                 Object extensor = itr.next();
     
                 if (extensor instanceof HTTPAddress) {

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertificateHostnameVerifier.java Fri Jan 13 19:09:37 2012
@@ -566,9 +566,9 @@ public interface CertificateHostnameVeri
                 cpe.printStackTrace();
             }
             if (c != null) {
-                Iterator it = c.iterator();
+                Iterator<List<?>> it = c.iterator();
                 while (it.hasNext()) {
-                    List list = (List) it.next();
+                    List<?> list = it.next();
                     int type = ((Integer) list.get(0)).intValue();
                     // If type is 2, then we've got a dNSName
                     if (type == 2) {

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java Fri Jan 13 19:09:37 2012
@@ -1,101 +1,102 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.transport.http;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- *
- */
-public class HeadersTest extends Assert {
-    private IMocksControl control;
-    
-    @Before
-    public void setUp() {
-        control = EasyMock.createNiceControl();
-    }
-    
-    @After
-    public void tearDown() {
-        control.verify();
-    }
-    
-    @Test
-    public void setHeadersTest() throws Exception {
-        String[] headerNames = {"Content-Type", "authorization", "soapAction"};
-        String[] headerValues = {"text/xml", "Basic Zm9vOmJhcg==", "foo"};
-        Map<String, List<String>> inmap = new HashMap<String, List<String>>();
-        for (int i = 0; i < headerNames.length; i++) {
-            inmap.put(headerNames[i], Arrays.asList(headerValues[i]));
-        }
-        
-        HttpServletRequest req = control.createMock(HttpServletRequest.class);
-        EasyMock.expect(req.getHeaderNames()).andReturn(Collections.enumeration(inmap.keySet()));
-        for (int i = 0; i < headerNames.length; i++) {
-            EasyMock.expect(req.getHeaders(headerNames[i])).
-                andReturn(Collections.enumeration(inmap.get(headerNames[i])));
-        }
-        EasyMock.expect(req.getContentType()).andReturn(headerValues[0]).anyTimes();
-        
-        control.replay();
-
-        Message message = new MessageImpl();
-        message.put(AbstractHTTPDestination.HTTP_REQUEST, req);
-        
-        Headers headers = new Headers(message);
-        headers.copyFromRequest(req);
-        
-        Map<String, List<String>> protocolHeaders = 
-            CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
-        
-        assertTrue("unexpected size", protocolHeaders.size() == headerNames.length);
-        
-        assertEquals("unexpected header", protocolHeaders.get("Content-Type").get(0), headerValues[0]);
-        assertEquals("unexpected header", protocolHeaders.get("content-type").get(0), headerValues[0]);
-        assertEquals("unexpected header", protocolHeaders.get("CONTENT-TYPE").get(0), headerValues[0]);
-        assertEquals("unexpected header", protocolHeaders.get("content-TYPE").get(0), headerValues[0]);
-
-        assertEquals("unexpected header", protocolHeaders.get("Authorization").get(0), headerValues[1]);
-        assertEquals("unexpected header", protocolHeaders.get("authorization").get(0), headerValues[1]);
-        assertEquals("unexpected header", protocolHeaders.get("AUTHORIZATION").get(0), headerValues[1]);
-        assertEquals("unexpected header", protocolHeaders.get("authoriZATION").get(0), headerValues[1]);
-        
-        assertEquals("unexpected header", protocolHeaders.get("SOAPAction").get(0), headerValues[2]);
-        assertEquals("unexpected header", protocolHeaders.get("soapaction").get(0), headerValues[2]);
-        assertEquals("unexpected header", protocolHeaders.get("SOAPACTION").get(0), headerValues[2]);
-        assertEquals("unexpected header", protocolHeaders.get("soapAction").get(0), headerValues[2]);
-        
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.transport.http;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class HeadersTest extends Assert {
+    private IMocksControl control;
+    
+    @Before
+    public void setUp() {
+        control = EasyMock.createNiceControl();
+    }
+    
+    @After
+    public void tearDown() {
+        control.verify();
+    }
+    
+    @Test
+    public void setHeadersTest() throws Exception {
+        String[] headerNames = {"Content-Type", "authorization", "soapAction"};
+        String[] headerValues = {"text/xml", "Basic Zm9vOmJhcg==", "foo"};
+        Map<String, List<String>> inmap = new HashMap<String, List<String>>();
+        for (int i = 0; i < headerNames.length; i++) {
+            inmap.put(headerNames[i], Arrays.asList(headerValues[i]));
+        }
+        
+        HttpServletRequest req = control.createMock(HttpServletRequest.class);
+        EasyMock.expect(req.getHeaderNames()).andReturn(Collections.enumeration(inmap.keySet()));
+        for (int i = 0; i < headerNames.length; i++) {
+            EasyMock.expect(req.getHeaders(headerNames[i])).
+                andReturn(Collections.enumeration(inmap.get(headerNames[i])));
+        }
+        EasyMock.expect(req.getContentType()).andReturn(headerValues[0]).anyTimes();
+        
+        control.replay();
+
+        Message message = new MessageImpl();
+        message.put(AbstractHTTPDestination.HTTP_REQUEST, req);
+        
+        Headers headers = new Headers(message);
+        headers.copyFromRequest(req);
+        
+        Map<String, List<String>> protocolHeaders = 
+            CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
+        
+        assertTrue("unexpected size", protocolHeaders.size() == headerNames.length);
+        
+        assertEquals("unexpected header", protocolHeaders.get("Content-Type").get(0), headerValues[0]);
+        assertEquals("unexpected header", protocolHeaders.get("content-type").get(0), headerValues[0]);
+        assertEquals("unexpected header", protocolHeaders.get("CONTENT-TYPE").get(0), headerValues[0]);
+        assertEquals("unexpected header", protocolHeaders.get("content-TYPE").get(0), headerValues[0]);
+
+        assertEquals("unexpected header", protocolHeaders.get("Authorization").get(0), headerValues[1]);
+        assertEquals("unexpected header", protocolHeaders.get("authorization").get(0), headerValues[1]);
+        assertEquals("unexpected header", protocolHeaders.get("AUTHORIZATION").get(0), headerValues[1]);
+        assertEquals("unexpected header", protocolHeaders.get("authoriZATION").get(0), headerValues[1]);
+        
+        assertEquals("unexpected header", protocolHeaders.get("SOAPAction").get(0), headerValues[2]);
+        assertEquals("unexpected header", protocolHeaders.get("soapaction").get(0), headerValues[2]);
+        assertEquals("unexpected header", protocolHeaders.get("SOAPACTION").get(0), headerValues[2]);
+        assertEquals("unexpected header", protocolHeaders.get("soapAction").get(0), headerValues[2]);
+        
+    }
+}
+

Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Fri Jan 13 19:09:37 2012
@@ -452,7 +452,7 @@ public class JMSOldConfigHolder {
             env.put(ent.getKey(), ent.getValue());
         }
         if (LOG.isLoggable(Level.FINE)) {
-            Enumeration props = env.propertyNames();
+            Enumeration<?> props = env.propertyNames();
             while (props.hasMoreElements()) {
                 String name = (String)props.nextElement();
                 String value = env.getProperty(name);

Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Fri Jan 13 19:09:37 2012
@@ -155,7 +155,7 @@ public final class JMSUtils {
         } else {
             messageType = "unknow";
         }
-        Map<String, List<String>> headers = CastUtils.cast((Map)inMessage
+        Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)inMessage
             .get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
         if (headers == null) {
             headers = new TreeMap<String, List<String>>();
@@ -196,9 +196,9 @@ public final class JMSUtils {
             Map<String, List<String>> protHeaders
                 = new TreeMap<String, List<String>>();
             List<JMSPropertyType> props = messageProperties.getProperty();
-            Enumeration enm = message.getPropertyNames();
+            Enumeration<String> enm = CastUtils.cast(message.getPropertyNames());
             while (enm.hasMoreElements()) {
-                String name = (String)enm.nextElement();
+                String name = enm.nextElement();
                 String val = message.getStringProperty(name);
                 JMSPropertyType prop = new JMSPropertyType();
                 prop.setName(name);
@@ -263,7 +263,7 @@ public final class JMSUtils {
                 messageProperties.setSOAPJMSRequestURI(jmsMessage
                     .getStringProperty(JMSSpecConstants.REQUESTURI_FIELD));
                 
-                Map<String, List<String>> headers = CastUtils.cast((Map)inMessage
+                Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)inMessage
                     .get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
                 if (headers == null) {
                     headers = new TreeMap<String, List<String>>();

Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java Fri Jan 13 19:09:37 2012
@@ -20,7 +20,6 @@
 package org.apache.cxf.transport.jms.uri;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -47,9 +46,7 @@ public class JMSEndpoint extends JMSEndp
         String requestUri = "jms:" + (jmsVariant == JMSURIConstants.JNDI_TOPIC ? "jndi" : jmsVariant)
             + ":" + destinationName;
         boolean first = true;
-        Iterator iter = parameters.keySet().iterator();
-        while (iter.hasNext()) {
-            String key = (String)iter.next();
+        for (String key : parameters.keySet()) {
             if ("targetService".equals(key)) {
                 continue;
             }

Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpointParser.java Fri Jan 13 19:09:37 2012
@@ -20,7 +20,6 @@
 package org.apache.cxf.transport.jms.uri;
 
 import java.net.URI;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -49,7 +48,7 @@ public final class JMSEndpointParser {
         if (idx > 0) {
             path = path.substring(0, idx);
         }
-        Map parameters = URISupport.parseParameters(u);
+        Map<String, String> parameters = URISupport.parseParameters(u);
 
         validateURI(uri, path, parameters);
 
@@ -71,7 +70,7 @@ public final class JMSEndpointParser {
      * @param endpoint
      * @param parameters
      */
-    private static void configureProperties(JMSEndpoint endpoint, Map parameters) {
+    private static void configureProperties(JMSEndpoint endpoint, Map<String, String> parameters) {
         String deliveryMode = getAndRemoveParameter(parameters,
                                                     JMSURIConstants.DELIVERYMODE_PARAMETER_NAME);
         String timeToLive = getAndRemoveParameter(parameters,
@@ -118,10 +117,8 @@ public final class JMSEndpointParser {
             endpoint.setJndiURL(jndiUrl);
         }
 
-        Iterator iter = parameters.keySet().iterator();
-        while (iter.hasNext()) {
-            String key = (String)iter.next();
-            String value = (String)parameters.get(key);
+        for (String key : parameters.keySet()) {
+            String value = parameters.get(key);
             if (value == null || value.equals("")) {
                 continue;
             }
@@ -139,7 +136,8 @@ public final class JMSEndpointParser {
      * @param deliverymodeParameterName
      * @return
      */
-    private static String getAndRemoveParameter(Map parameters, String parameterName) {
+    private static String getAndRemoveParameter(Map<String, String> parameters,
+                                                String parameterName) {
         String value = (String)parameters.get(parameterName);
         parameters.remove(parameterName);
         return value;
@@ -153,7 +151,7 @@ public final class JMSEndpointParser {
      * @param parameters the parameters, an empty map if no parameters given
      * @throws ResolveEndpointFailedException should be thrown if the URI validation failed
      */
-    protected static void validateURI(String uri, String path, Map parameters)
+    protected static void validateURI(String uri, String path, Map<String, String> parameters)
         throws ResolveEndpointFailedException {
         // check for uri containing & but no ? marker
         if (uri.contains("&") && !uri.contains("?")) {

Modified: cxf/branches/2.5.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java Fri Jan 13 19:09:37 2012
@@ -120,7 +120,7 @@ public class JMSEndpointTest extends Ass
                      "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
         assertEquals(endpoint.getJndiConnectionFactoryName(), "ConnectionFactory");
         assertEquals(endpoint.getJndiURL(), "tcp://localhost:61616");
-        Map addParas = endpoint.getJndiParameters();
+        Map<String, String> addParas = endpoint.getJndiParameters();
         assertEquals(addParas.size(), 1);
         assertEquals(addParas.get("com.sun.jndi.someParameter"), "someValue");
     }

Modified: cxf/branches/2.5.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java Fri Jan 13 19:09:37 2012
@@ -201,12 +201,12 @@ public class LocalTransportFactory exten
 
     
     public void copy(Message message, Message copy) {
-        Set<String> filter = CastUtils.cast((Set)message.get(MESSAGE_FILTER_PROPERTIES));
+        Set<String> filter = CastUtils.cast((Set<?>)message.get(MESSAGE_FILTER_PROPERTIES));
         if (filter == null) {
             filter = messageFilterProperties;
         }
         
-        Set<String> includes =  CastUtils.cast((Set)message.get(MESSAGE_INCLUDE_PROPERTIES));
+        Set<String> includes =  CastUtils.cast((Set<?>)message.get(MESSAGE_INCLUDE_PROPERTIES));
         if (includes == null) {
             includes = messageIncludeProperties;
         }

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Fri Jan 13 19:09:37 2012
@@ -362,13 +362,13 @@ public class MAPCodec extends AbstractSo
             if (null != params) {
                 for (Object o : params.getAny()) {
                     if (o instanceof Element || o instanceof JAXBElement) {
-                        JAXBElement jaxbEl = null;
+                        JAXBElement<?> jaxbEl = null;
                         if (o instanceof Element) {
                             Element e = (Element)o;
                             Node importedNode = header.getOwnerDocument().importNode(e, true);
                             header.appendChild(importedNode);                            
                         } else {
-                            jaxbEl = (JAXBElement) o;
+                            jaxbEl = (JAXBElement<?>) o;
                             marshaller.marshal(jaxbEl, header);
                         }
                                                

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java Fri Jan 13 19:09:37 2012
@@ -38,6 +38,7 @@ import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
@@ -579,12 +580,12 @@ public class MAPAggregatorTest extends A
             
             Endpoint endpoint = control.createMock(Endpoint.class);
             endpoint.getOutInterceptors();
-            EasyMock.expectLastCall().andReturn(new ArrayList()).anyTimes();
+            EasyMock.expectLastCall().andReturn(new ArrayList<Interceptor<? extends Message>>()).anyTimes();
             Service serv = control.createMock(Service.class);
             endpoint.getService();
             EasyMock.expectLastCall().andReturn(serv).anyTimes();
             serv.getOutInterceptors();
-            EasyMock.expectLastCall().andReturn(new ArrayList()).anyTimes();
+            EasyMock.expectLastCall().andReturn(new ArrayList<Interceptor<? extends Message>>()).anyTimes();
             exchange.get(Endpoint.class);
             EasyMock.expectLastCall().andReturn(endpoint).anyTimes();
         }
@@ -598,7 +599,7 @@ public class MAPAggregatorTest extends A
         setUpMessageExchange(message, exchange);
         Endpoint endpoint = control.createMock(Endpoint.class);
         endpoint.getOutInterceptors();
-        EasyMock.expectLastCall().andReturn(new ArrayList()).anyTimes();
+        EasyMock.expectLastCall().andReturn(new ArrayList<Interceptor<? extends Message>>()).anyTimes();
         
         setUpExchangeGet(exchange, Endpoint.class, endpoint);
         EndpointInfo endpointInfo = control.createMock(EndpointInfo.class);

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java Fri Jan 13 19:09:37 2012
@@ -575,7 +575,7 @@ public class MAPCodecTest extends Assert
             boolean ret = false;
             expectedIndex++;
             if (obj instanceof JAXBElement) {
-                JAXBElement other = (JAXBElement)obj;
+                JAXBElement<?> other = (JAXBElement<?>)obj;
                 ret = name.equals(other.getName()) && declaredType.isAssignableFrom(other.getDeclaredType())
                       && compare(value, other.getValue());
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java Fri Jan 13 19:09:37 2012
@@ -94,7 +94,7 @@ public class AssertionBuilderRegistryImp
             ConfiguredBeanLocator c = bus.getExtension(ConfiguredBeanLocator.class);
             if (c != null) {
                 c.getBeansOfType(AssertionBuilderLoader.class);
-                for (AssertionBuilder b : c.getBeansOfType(AssertionBuilder.class)) {
+                for (AssertionBuilder<?> b : c.getBeansOfType(AssertionBuilder.class)) {
                     registerBuilder(b);
                 }
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java Fri Jan 13 19:09:37 2012
@@ -70,9 +70,8 @@ public final class PolicyUtils {
             return true;
         }
         
-        List components = p.getPolicyComponents();
         
-        for (Object component : components) {
+        for (PolicyComponent component : p.getPolicyComponents()) {
             if (!(component instanceof PolicyOperator)
                 || !isEmptyPolicyOperator((PolicyOperator)component)) {
                 return false;

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java Fri Jan 13 19:09:37 2012
@@ -47,6 +47,7 @@ public class PolicyBPHandler implements 
         return null;
     }
 
+    @SuppressWarnings("rawtypes")
     public Set<Class> getManagedClasses() {
         return null;
     }

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java Fri Jan 13 19:09:37 2012
@@ -59,7 +59,7 @@ public class EffectivePolicyImplTest ext
     
     @SuppressWarnings("unchecked")
     private List<Interceptor<? extends Message>> createMockInterceptorList() {
-        Interceptor i = control.createMock(Interceptor.class);
+        Interceptor<? extends Message> i = control.createMock(Interceptor.class);
         Interceptor<? extends Message> m = i;
         List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
         a.add(m);

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java Fri Jan 13 19:09:37 2012
@@ -69,7 +69,7 @@ public class EndpointPolicyImplTest exte
     
     @SuppressWarnings("unchecked")
     private List<Interceptor<? extends Message>> createMockInterceptorList() {
-        Interceptor i = control.createMock(Interceptor.class);
+        Interceptor<? extends Message> i = control.createMock(Interceptor.class);
         Interceptor<? extends Message> m = i;
         List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
         a.add(m);

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java Fri Jan 13 19:09:37 2012
@@ -668,7 +668,7 @@ public class PolicyEngineTest extends As
     private Set<String> getInterceptorIds(List<Interceptor<? extends Message>> interceptors) {
         Set<String> ids = new HashSet<String>();
         for (Interceptor<? extends Message> i : interceptors) {
-            ids.add(((PhaseInterceptor)i).getId());
+            ids.add(((PhaseInterceptor<? extends Message>)i).getId());
         }
         return ids;
     }

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java Fri Jan 13 19:09:37 2012
@@ -70,7 +70,7 @@ public class PolicyInterceptorsTest exte
     
     @SuppressWarnings("unchecked")
     private List<Interceptor<? extends Message>> createMockInterceptorList() {
-        Interceptor i = control.createMock(Interceptor.class);
+        Interceptor<? extends Message> i = control.createMock(Interceptor.class);
         Interceptor<? extends Message> m = i;
         List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
         a.add(m);

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Fri Jan 13 19:09:37 2012
@@ -432,11 +432,11 @@ public class RMSoapInterceptor extends A
         // as RM protocol messages use parameter style BARE
 
         InterceptorChain chain = message.getInterceptorChain();
-        ListIterator it = chain.getIterator();            
+        ListIterator<Interceptor<? extends Message>> it = chain.getIterator();            
         boolean bareIn = false;
         boolean wrappedIn = false;
         while (it.hasNext() && !wrappedIn && !bareIn) {
-            PhaseInterceptor pi = (PhaseInterceptor)it.next();
+            PhaseInterceptor<? extends Message> pi = (PhaseInterceptor<? extends Message>)it.next();
             if (WrappedInInterceptor.class.getName().equals(pi.getId())) {
                 wrappedIn = true;
                 it.remove();
@@ -454,11 +454,11 @@ public class RMSoapInterceptor extends A
 
     private RMManager getManager(SoapMessage message) {
         InterceptorChain chain = message.getInterceptorChain();
-        ListIterator it = chain.getIterator();
+        ListIterator<Interceptor<? extends Message>> it = chain.getIterator();
         while (it.hasNext()) {
-            Interceptor i = (Interceptor)it.next();
+            Interceptor<? extends Message> i = it.next();
             if (i instanceof AbstractRMInterceptor) {
-                return ((AbstractRMInterceptor)i).getManager();
+                return ((AbstractRMInterceptor<? extends Message>)i).getManager();
             }
         }
         return null;

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/AbstractRMInterceptorTest.java Fri Jan 13 19:09:37 2012
@@ -160,7 +160,7 @@ public class AbstractRMInterceptorTest e
         
     }
 
-    class RMInterceptor extends AbstractRMInterceptor {
+    class RMInterceptor extends AbstractRMInterceptor<Message> {
 
         private SequenceFault sequenceFault;
         private RMException rmException;

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java Fri Jan 13 19:09:37 2012
@@ -369,7 +369,7 @@ public class ProxyTest extends Assert {
     @SuppressWarnings("unchecked")
     private void expectInvoke(Proxy proxy, OperationInfo oi, Object expectedReturn) throws RMException {
         EasyMock.expect(proxy.invoke(EasyMock.same(oi), EasyMock.isA(Object[].class), 
-            (Map)EasyMock.isNull())).andReturn(expectedReturn).anyTimes();
+            (Map<String, Object>)EasyMock.isNull())).andReturn(expectedReturn).anyTimes();
     }
     
     @SuppressWarnings("unchecked")

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMInInterceptorTest.java Fri Jan 13 19:09:37 2012
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
@@ -78,7 +79,7 @@ public class RMInInterceptorTest extends
         RMInInterceptor rmi = new RMInInterceptor();        
         chain.add(rmi);
         chain.add(map);
-        Iterator it = chain.iterator();
+        Iterator<Interceptor<? extends Message>> it = chain.iterator();
         assertSame("Unexpected order.", rmi, it.next());
         assertSame("Unexpected order.", map, it.next());
         

Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java Fri Jan 13 19:09:37 2012
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.FaultMode;
@@ -63,7 +64,7 @@ public class RMOutInterceptorTest extend
         RMOutInterceptor rmi = new RMOutInterceptor();        
         chain.add(rmi);
         chain.add(map);
-        Iterator it = chain.iterator();
+        Iterator<Interceptor<? extends Message>> it = chain.iterator();
         assertSame("Unexpected order.", map, it.next());
         assertSame("Unexpected order.", rmi, it.next());                      
     } 

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/AsymmetricBindingBuilder.java Fri Jan 13 19:09:37 2012
@@ -66,8 +66,8 @@ public class AsymmetricBindingBuilder im
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), asymmetricBinding, consts);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), asymmetricBinding, consts);
 
             /*
              * since there should be only one alternative
@@ -78,15 +78,13 @@ public class AsymmetricBindingBuilder im
         return asymmetricBinding;
     }
 
-    private void processAlternative(List assertions, 
+    private void processAlternative(List<Assertion> assertions, 
                                     AsymmetricBinding asymmetricBinding,
                                     SPConstants consts) {
 
-        Assertion assertion;
         QName name;
 
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
+        for (Assertion assertion : assertions) {
             name = assertion.getName();
 
             if (!consts.getNamespace().equals(name.getNamespaceURI())

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorEncryptionTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -65,20 +65,16 @@ public class InitiatorEncryptionTokenBui
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), initiatorToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), initiatorToken);
             break; // TODO process all the token that must be set ..
         }
 
         return initiatorToken;
     }
 
-    private void processAlternative(List assertions, InitiatorEncryptionToken parent) {
-
-        Object token;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            token = iterator.next();
+    private void processAlternative(List<Assertion> assertions, InitiatorEncryptionToken parent) {
+        for (Assertion token : assertions) {
 
             if (token instanceof Token) {
                 parent.setInitiatorEncryptionToken((Token)token);

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -61,21 +61,16 @@ public class InitiatorSignatureTokenBuil
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), initiatorToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), initiatorToken);
             break; // TODO process all the token that must be set ..
         }
 
         return initiatorToken;
     }
 
-    private void processAlternative(List assertions, InitiatorSignatureToken parent) {
-
-        Object token;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            token = iterator.next();
-
+    private void processAlternative(List<Assertion> assertions, InitiatorSignatureToken parent) {
+        for (Assertion token: assertions) {
             if (token instanceof Token) {
                 parent.setInitiatorSignatureToken((Token)token);
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -62,21 +62,16 @@ public class InitiatorTokenBuilder imple
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), initiatorToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), initiatorToken);
             break; // TODO process all the token that must be set ..
         }
 
         return initiatorToken;
     }
 
-    private void processAlternative(List assertions, InitiatorToken parent) {
-
-        Object token;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            token = iterator.next();
-
+    private void processAlternative(List<Assertion> assertions, InitiatorToken parent) {
+        for (Assertion token: assertions) {
             if (token instanceof Token) {
                 parent.setInitiatorToken((Token)token);
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -83,8 +83,8 @@ public class IssuedTokenBuilder implemen
                 Policy policy = builder.getPolicy(child);
                 policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-                for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-                    processAlternative((List)iterator.next(), issuedToken);
+                for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+                    processAlternative(iterator.next(), issuedToken);
                     break; // since there should be only one alternative ..
                 }                
             }
@@ -95,12 +95,10 @@ public class IssuedTokenBuilder implemen
     }
 
 
-    private void processAlternative(List assertions, IssuedToken parent) {
-        Assertion assertion;
+    private void processAlternative(List<Assertion> assertions, IssuedToken parent) {
         QName name;
 
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
+        for (Assertion assertion : assertions) {
             name = assertion.getName();
 
             if (SPConstants.REQUIRE_DERIVED_KEYS.equals(name.getLocalPart())) {

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ProtectionTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -59,8 +59,8 @@ public class ProtectionTokenBuilder impl
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), protectionToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), protectionToken);
             break; // since there should be only one alternative ..
         }
 
@@ -68,9 +68,8 @@ public class ProtectionTokenBuilder impl
     }
 
 
-    private void processAlternative(List assertions, ProtectionToken parent) {
+    private void processAlternative(List<Assertion> assertions, ProtectionToken parent) {
         Object token = assertions.get(0);
-
         if (token instanceof Token) {
             parent.setToken((Token)token);
         }

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientEncryptionTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -64,21 +64,16 @@ public class RecipientEncryptionTokenBui
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), recipientEncryptionToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), recipientEncryptionToken);
             break; // TODO process all the token that must be set ..
         }
 
         return recipientEncryptionToken;
     }
 
-    private void processAlternative(List assertions, RecipientEncryptionToken parent) {
-
-        Assertion assertion;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
-
+    private void processAlternative(List<Assertion> assertions, RecipientEncryptionToken parent) {
+        for (Assertion assertion : assertions) {
             if (assertion instanceof Token) {
                 parent.setRecipientEncryptionToken((Token)assertion);
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientSignatureTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -62,20 +62,16 @@ public class RecipientSignatureTokenBuil
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), recipientSignatureToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), recipientSignatureToken);
             break; // TODO process all the token that must be set ..
         }
 
         return recipientSignatureToken;
     }
 
-    private void processAlternative(List assertions, RecipientSignatureToken parent) {
-
-        Assertion assertion;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
+    private void processAlternative(List<Assertion> assertions, RecipientSignatureToken parent) {
+        for (Assertion assertion : assertions) {
 
             if (assertion instanceof Token) {
                 parent.setRecipientSignatureToken((Token)assertion);

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RecipientTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -60,8 +60,8 @@ public class RecipientTokenBuilder imple
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), recipientToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), recipientToken);
 
             /*
              * for the moment we will pick the first token specified in the policy
@@ -72,13 +72,9 @@ public class RecipientTokenBuilder imple
         return recipientToken;
     }
 
-    private void processAlternative(List assertions, RecipientToken parent) {
-
-        Assertion assertion;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
+    private void processAlternative(List<Assertion> assertions, RecipientToken parent) {
 
+        for (Assertion assertion : assertions) {
             if (assertion instanceof Token) {
                 parent.setToken((Token)assertion);
             }

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokens12Builder.java Fri Jan 13 19:09:37 2012
@@ -107,8 +107,8 @@ public class SupportingTokens12Builder i
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy) policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List) iterator.next(), supportingToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), supportingToken);
             /*
              * for the moment we will say there should be only one alternative 
              */
@@ -119,11 +119,9 @@ public class SupportingTokens12Builder i
     }
 
 
-    private void processAlternative(List assertions, SupportingToken supportingToken) {
+    private void processAlternative(List<Assertion> assertions, SupportingToken supportingToken) {
         
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-
-            Assertion primitive = (Assertion) iterator.next();
+        for (Assertion primitive : assertions) {
             QName qname = primitive.getName();
 
             if (SP12Constants.ALGORITHM_SUITE.equals(qname)) {

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SupportingTokensBuilder.java Fri Jan 13 19:09:37 2012
@@ -79,8 +79,8 @@ public class SupportingTokensBuilder imp
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternative((List)iterator.next(), supportingToken);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternative(iterator.next(), supportingToken);
             /*
              * for the moment we will say there should be only one alternative
              */
@@ -91,11 +91,9 @@ public class SupportingTokensBuilder imp
     }
 
 
-    private void processAlternative(List assertions, SupportingToken supportingToken) {
+    private void processAlternative(List<Assertion> assertions, SupportingToken supportingToken) {
 
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-
-            Assertion primitive = (Assertion)iterator.next();
+        for (Assertion primitive : assertions) {
             QName qname = primitive.getName();
 
             if (SP11Constants.ALGORITHM_SUITE.equals(qname)) {

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SymmetricBindingBuilder.java Fri Jan 13 19:09:37 2012
@@ -61,8 +61,8 @@ public class SymmetricBindingBuilder imp
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            processAlternatives((List)iterator.next(), symmetricBinding, consts);
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            processAlternatives(iterator.next(), symmetricBinding, consts);
 
             /*
              * since there should be only one alternative ..
@@ -73,12 +73,10 @@ public class SymmetricBindingBuilder imp
     }
 
 
-    private void processAlternatives(List assertions, SymmetricBinding symmetricBinding, SPConstants consts) {
-        Assertion assertion;
+    private void processAlternatives(List<Assertion> assertions,
+                                     SymmetricBinding symmetricBinding, SPConstants consts) {
         QName name;
-
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
+        for (Assertion assertion : assertions) {
             name = assertion.getName();
 
             if (!consts.getNamespace().equals(name.getNamespaceURI())

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportTokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -57,8 +57,8 @@ public class TransportTokenBuilder imple
         Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
         policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-        for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-            transportToken.setToken((Token)(((List)iterator.next()).get(0)));
+        for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+            transportToken.setToken((Token)((iterator.next()).get(0)));
             break; // since there should be only one alternative
         }
 

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java Fri Jan 13 19:09:37 2012
@@ -80,8 +80,8 @@ public class X509TokenBuilder implements
             Policy policy = builder.getPolicy(DOMUtils.getFirstElement(element));
             policy = (Policy)policy.normalize(builder.getPolicyRegistry(), false);
 
-            for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
-                processAlternative((List)iterator.next(), x509Token, consts);
+            for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+                processAlternative(iterator.next(), x509Token, consts);
 
                 /*
                  * since there should be only one alternative
@@ -92,12 +92,10 @@ public class X509TokenBuilder implements
         return x509Token;
     }
 
-    private void processAlternative(List assertions, X509Token parent, SPConstants consts) {
-        Assertion assertion;
+    private void processAlternative(List<Assertion> assertions, X509Token parent, SPConstants consts) {
         QName name;
 
-        for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
-            assertion = (Assertion)iterator.next();
+        for (Assertion assertion : assertions) {
             name = assertion.getName();
             
             if (!consts.getNamespace().equals(name.getNamespaceURI())) {

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java (original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/client/Publisher.java Fri Jan 13 19:09:37 2012
@@ -104,9 +104,9 @@ public class Publisher implements Notifi
         TopicExpressionType topic = null;
         if (subscribeRequest.getFilter() != null) {
             for (Object f : subscribeRequest.getFilter().getAny()) {
-                JAXBElement e = null;
+                JAXBElement<?> e = null;
                 if (f instanceof JAXBElement) {
-                    e = (JAXBElement) f;
+                    e = (JAXBElement<?>) f;
                     f = e.getValue();
                 }
                 if (f instanceof TopicExpressionType) {

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java (original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java Fri Jan 13 19:09:37 2012
@@ -328,9 +328,9 @@ public abstract class AbstractSubscripti
         // Check filter
         if (subscribeRequest.getFilter() != null) {
             for (Object f : subscribeRequest.getFilter().getAny()) {
-                JAXBElement e = null;
+                JAXBElement<?> e = null;
                 if (f instanceof JAXBElement) {
-                    e = (JAXBElement) f;
+                    e = (JAXBElement<?>) f;
                     f = e.getValue();
                 }
                 if (f instanceof TopicExpressionType) {
@@ -373,9 +373,9 @@ public abstract class AbstractSubscripti
         // Check policy
         if (subscribeRequest.getSubscriptionPolicy() != null) {
             for (Object p : subscribeRequest.getSubscriptionPolicy().getAny()) {
-                JAXBElement e = null;
+                JAXBElement<?> e = null;
                 if (p instanceof JAXBElement) {
-                    e = (JAXBElement) p;
+                    e = (JAXBElement<?>) p;
                     p = e.getValue();
                 }
                 if (p instanceof UseRaw) {

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsTopicExpressionConverter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsTopicExpressionConverter.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsTopicExpressionConverter.java (original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsTopicExpressionConverter.java Fri Jan 13 19:09:37 2012
@@ -64,7 +64,7 @@ public class JmsTopicExpressionConverter
     public ActiveMQTopic toActiveMQTopic(TopicExpressionType topic) throws InvalidTopicException {
         String dialect = topic.getDialect();
         if (dialect == null || SIMPLE_DIALECT.equals(dialect)) {
-            for (Iterator iter = topic.getContent().iterator(); iter.hasNext();) {
+            for (Iterator<Object> iter = topic.getContent().iterator(); iter.hasNext();) {
                 ActiveMQTopic answer = createActiveMQTopicFromContent(iter.next());
                 if (answer != null) {
                     return answer;

Modified: cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java (original)
+++ cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWs.java Fri Jan 13 19:09:37 2012
@@ -37,7 +37,7 @@ public interface AegisJaxWs {
                  Item item);
 
     @WebMethod(operationName = "getItemsAsMap")
-    Map getItemsMap();
+    Map<?, ?> getItemsMap();
 
     @WebMethod(operationName = "getItemsAsMapSpecified")
     Map<Integer, Item> getItemsMapSpecified();

Modified: cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java Fri Jan 13 19:09:37 2012
@@ -39,7 +39,7 @@ public class AegisJaxWsImpl implements A
         items.put(item.getKey(), item);
     }
 
-    public Map getItemsMap() {
+    public Map<?, ?> getItemsMap() {
         return items;
     }
 

Modified: cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java (original)
+++ cxf/branches/2.5.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/util/ClassArrayFactoryBean.java Fri Jan 13 19:09:37 2012
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.FactoryBean;
 
-public class ClassArrayFactoryBean implements FactoryBean {
+public class ClassArrayFactoryBean implements FactoryBean<Object> {
 
     private List<String> classNames;
 

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java Fri Jan 13 19:09:37 2012
@@ -93,7 +93,7 @@ public class DispatchClientServerWithMal
         BusFactory.getDefaultBus().getInInterceptors().add(new MalformedResponseInterceptor());
     }
     
-    private void waitForFuture(Future fd) throws Exception {
+    private void waitForFuture(Future<?> fd) throws Exception {
         int count = 0;
         while (!fd.isDone()) {
             ++count;
@@ -128,7 +128,7 @@ public class DispatchClientServerWithMal
         SOAPMessage soapReqMsg3 = MessageFactory.newInstance().createMessage(null, is3);
         assertNotNull(soapReqMsg3);
         TestSOAPMessageHandler tsmh = new TestSOAPMessageHandler();
-        Future f = disp.invokeAsync(soapReqMsg3, tsmh);
+        Future<?> f = disp.invokeAsync(soapReqMsg3, tsmh);
         assertNotNull(f);
         waitForFuture(f);
         assertEquals("AsyncHandler shouldn't get invoked more than once", asyncHandlerInvokedCount, 1);

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java Fri Jan 13 19:09:37 2012
@@ -55,6 +55,7 @@ import javax.xml.ws.soap.SOAPFaultExcept
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.handlers.AddNumbersService;
+import org.apache.handlers.types.AddNumbers;
 import org.apache.handlers.types.AddNumbersResponse;
 import org.apache.handlers.types.ObjectFactory;
 import org.apache.hello_world_xml_http.wrapped.XMLService;
@@ -101,9 +102,9 @@ public class DispatchHandlerInvocationTe
         req.setArg0(10);
         req.setArg1(20);
         ObjectFactory factory = new ObjectFactory();
-        JAXBElement e = factory.createAddNumbers(req);
+        JAXBElement<AddNumbers> e = factory.createAddNumbers(req);
 
-        JAXBElement response = (JAXBElement)disp.invoke(e);
+        JAXBElement<?> response = (JAXBElement<?>)disp.invoke(e);
         assertNotNull(response);
         AddNumbersResponse value = (AddNumbersResponse)response.getValue();
         assertEquals(222, value.getReturn());
@@ -408,7 +409,7 @@ public class DispatchHandlerInvocationTe
                         .newInstance(ObjectFactory.class,
                                      org.apache.hello_world_xml_http.wrapped.types.ObjectFactory.class);
 
-                    Object payload = ((JAXBElement)msg.getPayload(jaxbContext)).getValue();
+                    Object payload = ((JAXBElement<?>)msg.getPayload(jaxbContext)).getValue();
                     org.apache.handlers.types.AddNumbers req =
                         (org.apache.handlers.types.AddNumbers)payload;
 
@@ -424,7 +425,7 @@ public class DispatchHandlerInvocationTe
                 } else {
                     LogicalMessage msg = ctx.getMessage();
                     JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
-                    Object payload = ((JAXBElement)msg.getPayload(jaxbContext)).getValue();
+                    Object payload = ((JAXBElement<?>)msg.getPayload(jaxbContext)).getValue();
                     org.apache.handlers.types.AddNumbersResponse res =
                         (org.apache.handlers.types.AddNumbersResponse)payload;
 
@@ -479,13 +480,13 @@ public class DispatchHandlerInvocationTe
 
                     SOAPEnvelope env = msg.getSOAPPart().getEnvelope();
                     SOAPBody body = env.getBody();
-                    Iterator it = body.getChildElements();
+                    Iterator<?> it = body.getChildElements();
                     while (it.hasNext()) {
                         
                         Object elem = it.next();
                         if (elem instanceof SOAPElement) {
 
-                            Iterator it2 = ((SOAPElement)elem).getChildElements();
+                            Iterator<?> it2 = ((SOAPElement)elem).getChildElements();
                             while (it2.hasNext()) {
                                 Object elem2 = it2.next();
                                 if (elem2 instanceof SOAPElement) {
@@ -514,13 +515,13 @@ public class DispatchHandlerInvocationTe
 
                     SOAPEnvelope env = msg.getSOAPPart().getEnvelope();
                     SOAPBody body = env.getBody();
-                    Iterator it = body.getChildElements();
+                    Iterator<?> it = body.getChildElements();
                     while (it.hasNext()) {
                         
                         Object elem = it.next();
                         if (elem instanceof SOAPElement) {
 
-                            Iterator it2 = ((SOAPElement)elem).getChildElements();
+                            Iterator<?> it2 = ((SOAPElement)elem).getChildElements();
                             while (it2.hasNext()) {
                                 Object elem2 = it2.next();
                                 if (elem2 instanceof SOAPElement) {

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java Fri Jan 13 19:09:37 2012
@@ -216,7 +216,7 @@ public class HandlerInvocationTest exten
 
         assertEquals(handlerNames.length, resp.size());
 
-        Iterator iter = resp.iterator();
+        Iterator<String> iter = resp.iterator();
         for (String expected : handlerNames) {
             assertEquals(expected, iter.next());
         }
@@ -341,7 +341,7 @@ public class HandlerInvocationTest exten
             }
         };
         TestSOAPHandler soapHandler1 = new TestSOAPHandler(false);
-        TestSOAPHandler soapHandler2 = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler2 = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 Boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -378,7 +378,7 @@ public class HandlerInvocationTest exten
         TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
         TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
         TestSOAPHandler soapHandler1 = new TestSOAPHandler(false);
-        TestSOAPHandler soapHandler2 = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler2 = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 Boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -618,7 +618,7 @@ public class HandlerInvocationTest exten
 
         TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
         TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
-        TestSOAPHandler soapHandler1 = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler1 = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 Boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -663,7 +663,7 @@ public class HandlerInvocationTest exten
 
         TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
         TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
-        TestSOAPHandler soapHandler1 = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler1 = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 Boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -708,7 +708,7 @@ public class HandlerInvocationTest exten
 
         TestHandler<LogicalMessageContext> handler1 = new TestHandler<LogicalMessageContext>(false);
         TestHandler<LogicalMessageContext> handler2 = new TestHandler<LogicalMessageContext>(false);
-        TestSOAPHandler soapHandler1 = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler1 = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 Boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -1125,7 +1125,7 @@ public class HandlerInvocationTest exten
                 return true;
             }
         };
-        TestSOAPHandler soapHandler = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 assertTrue("wsdl description not found or invalid", isValidWsdlDescription(ctx
@@ -1185,7 +1185,7 @@ public class HandlerInvocationTest exten
         List<String> resp = getHandlerNames(inMsg.getSOAPBody());
         assertEquals(handlerNames.length, resp.size());
 
-        Iterator iter = resp.iterator();
+        Iterator<String> iter = resp.iterator();
         for (String expected : handlerNames) {
             assertEquals(expected, iter.next());
         }

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java Fri Jan 13 19:09:37 2012
@@ -105,7 +105,7 @@ public class HandlerInvocationUsingAddNu
         setAddress(disp, addNumbersAddress);
 
         SmallNumberHandler sh = new SmallNumberHandler();
-        TestSOAPHandler soapHandler = new TestSOAPHandler<SOAPMessageContext>(false) {
+        TestSOAPHandler soapHandler = new TestSOAPHandler(false) {
             public boolean handleMessage(SOAPMessageContext ctx) {
                 super.handleMessage(ctx);
                 Boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
@@ -129,9 +129,9 @@ public class HandlerInvocationUsingAddNu
         req.setArg0(10);
         req.setArg1(20);        
         ObjectFactory factory = new ObjectFactory();        
-        JAXBElement e = factory.createAddNumbers(req);        
+        JAXBElement<org.apache.handlers.types.AddNumbers> e = factory.createAddNumbers(req);        
 
-        JAXBElement response = (JAXBElement)disp.invoke(e);
+        JAXBElement<?> response = (JAXBElement<?>)disp.invoke(e);
         assertNotNull(response);
         AddNumbersResponse value = (AddNumbersResponse)response.getValue();
         assertEquals(200, value.getReturn());

Modified: cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java?rev=1231252&r1=1231251&r2=1231252&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java Fri Jan 13 19:09:37 2012
@@ -108,7 +108,7 @@ public class HandlerTestImpl implements 
     }
 
     private List<String> getHandlersInfo(MessageContext ctx) {
-        List<String> ret = CastUtils.cast((List)ctx.get("handler.info"));
+        List<String> ret = CastUtils.cast((List<?>)ctx.get("handler.info"));
         if (ret == null) {
             ret = new ArrayList<String>();
         }



Mime
View raw message