cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1228499 [2/4] - in /cxf/trunk: integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ integration/jca/src/...
Date Fri, 06 Jan 2012 23:24:38 GMT
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java Fri Jan  6 23:24:33 2012
@@ -173,7 +173,7 @@ public class JAXRSOutInterceptor extends
             (Map<String, List<Object>>)message.get(Message.PROTOCOL_HEADERS);
         if (firstTry && theHeaders != null) {
             // some headers might've been setup by custom cxf interceptors
-            theHeaders.putAll((Map)response.getMetadata());
+            theHeaders.putAll(response.getMetadata());
         } else {
             theHeaders = response.getMetadata();
         }
@@ -181,7 +181,7 @@ public class JAXRSOutInterceptor extends
         if (!(theHeaders instanceof MultivaluedMap)) {
             responseHeaders = new MetadataMap<String, Object>(theHeaders);
         } else {
-            responseHeaders = (MultivaluedMap)theHeaders;
+            responseHeaders = (MultivaluedMap<String, Object>)theHeaders;
         }
         message.put(Message.PROTOCOL_HEADERS, responseHeaders);
         
@@ -211,7 +211,7 @@ public class JAXRSOutInterceptor extends
         Type genericType = getGenericResponseType(ori == null ? null : invoked, responseObj, targetType);
         if (genericType instanceof TypeVariable) {
             genericType = InjectionUtils.getSuperType(ori.getClassResourceInfo().getServiceClass(), 
-                                                       (TypeVariable)genericType);
+                                                       (TypeVariable<?>)genericType);
         }
         
         Annotation[] annotations = invoked != null ? invoked.getAnnotations() : new Annotation[]{};
@@ -285,11 +285,11 @@ public class JAXRSOutInterceptor extends
     
     private boolean isResponseNull(Object o) {
         return o == null || GenericEntity.class.isAssignableFrom(o.getClass()) 
-                            && ((GenericEntity)o).getEntity() == null; 
+                            && ((GenericEntity<?>)o).getEntity() == null; 
     }
     
     private Object getEntity(Object o) {
-        return GenericEntity.class.isAssignableFrom(o.getClass()) ? ((GenericEntity)o).getEntity() : o; 
+        return GenericEntity.class.isAssignableFrom(o.getClass()) ? ((GenericEntity<?>)o).getEntity() : o; 
     }
     
     private boolean checkBufferingMode(Message m, MessageBodyWriter w, boolean firstTry) {
@@ -409,7 +409,7 @@ public class JAXRSOutInterceptor extends
     
     private Class<?> getRawResponseClass(Object targetObject) {
         if (GenericEntity.class.isAssignableFrom(targetObject.getClass())) {
-            return ((GenericEntity)targetObject).getRawType();
+            return ((GenericEntity<?>)targetObject).getRawType();
         } else {
             return ClassHelper.getRealClassFromClass(targetObject.getClass());
         }
@@ -417,7 +417,7 @@ public class JAXRSOutInterceptor extends
     
     private Type getGenericResponseType(Method invoked, Object targetObject, Class<?> targetType) {
         if (GenericEntity.class.isAssignableFrom(targetObject.getClass())) {
-            return ((GenericEntity)targetObject).getType();
+            return ((GenericEntity<?>)targetObject).getType();
         } else if (invoked == null || !invoked.getReturnType().isAssignableFrom(targetType)) {
             // when a method has been invoked it is still possible that either an ExceptionMapper
             // or a ResponseHandler filter overrides a response entity; if it happens then 

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Fri Jan  6 23:24:33 2012
@@ -111,7 +111,7 @@ public abstract class AbstractJAXBProvid
     
     private boolean skipJaxbChecks;
     private boolean singleJaxbContext;
-    private Class[] extraClass;
+    private Class<?>[] extraClass;
     
     private boolean validateOutput;
     private boolean validateBeforeWrite;
@@ -125,7 +125,7 @@ public abstract class AbstractJAXBProvid
         singleJaxbContext = useSingleContext;
     }
     
-    public void setExtraClass(Class[] userExtraClass) {
+    public void setExtraClass(Class<?>[] userExtraClass) {
         extraClass = userExtraClass;
     }
     
@@ -273,7 +273,7 @@ public abstract class AbstractJAXBProvid
         throws Exception {
         
         if (cls == JAXBElement.class) {
-            return object != null ? ((JAXBElement)object).getName() : null;
+            return object != null ? ((JAXBElement<?>)object).getName() : null;
         }
         
         XmlRootElement root = cls.getAnnotation(XmlRootElement.class);
@@ -382,7 +382,7 @@ public abstract class AbstractJAXBProvid
         synchronized (classContexts) {
             JAXBContext context = classContexts.get(type);
             if (context == null) {
-                Class[] classes = null;
+                Class<?>[] classes = null;
                 if (extraClass != null) {
                     classes = new Class[extraClass.length + 1];
                     classes[0] = type;
@@ -471,7 +471,7 @@ public abstract class AbstractJAXBProvid
         throws JAXBException {
         
         Class<?> objClazz = JAXBElement.class.isAssignableFrom(cls) 
-                            ? ((JAXBElement)obj).getDeclaredType() : cls;
+                            ? ((JAXBElement<?>)obj).getDeclaredType() : cls;
                             
         JAXBContext context = getJAXBContext(objClazz, genericType);
         Marshaller marshaller = context.createMarshaller();
@@ -644,7 +644,7 @@ public abstract class AbstractJAXBProvid
                     List<Object> newList = new ArrayList<Object>(theList.size());
                     for (Object o : theList) {
                         newList.add(org.apache.cxf.jaxrs.utils.JAXBUtils.useAdapter(
-                                        ((JAXBElement)o).getValue(), adapter, false));
+                                        ((JAXBElement<?>)o).getValue(), adapter, false));
                     }
                     theList = newList;
                 }
@@ -665,7 +665,7 @@ public abstract class AbstractJAXBProvid
                     theList = newList;
                 }
                 if (origType == Set.class) {
-                    return new HashSet(theList);
+                    return new HashSet<Object>(theList);
                 } else {
                     return theList;
                 }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java Fri Jan  6 23:24:33 2012
@@ -225,7 +225,7 @@ public class AtomPojoProvider extends Ab
     protected void setFeedFromCollection(Factory factory, Feed feed, Object wrapper, Object collection,
         Class<?> collectionCls, Type collectionType, boolean writerUsed) throws Exception {
         
-        Object[] arr = collectionCls.isArray() ? (Object[])collection : ((Collection)collection).toArray();
+        Object[] arr = collectionCls.isArray() ? (Object[])collection : ((Collection<?>)collection).toArray();
         Class<?> memberClass = InjectionUtils.getActualType(collectionType);
         
         for (Object o : arr) {
@@ -330,7 +330,7 @@ public class AtomPojoProvider extends Ab
     protected boolean buildEntry(Entry entry, Object o) {
         AtomElementWriter<?, ?> builder = atomWriters.get(o.getClass().getName());
         if (builder != null) {
-            ((AtomElementWriter)builder).writeTo(entry, o);
+            ((AtomElementWriter<Entry, Object>)builder).writeTo(entry, o);
             return true;
         }
         return false;

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java Fri Jan  6 23:24:33 2012
@@ -55,6 +55,7 @@ import org.apache.cxf.attachment.Attachm
 import org.apache.cxf.attachment.ByteDataSource;
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.jaxrs.ext.form.Form;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
@@ -254,17 +255,16 @@ public class MultipartProvider extends A
         handlers.get(0).getDataHandler().writeTo(os);
     }
     
-    @SuppressWarnings("unchecked")
     private List<Attachment> convertToDataHandlers(Object obj,
                                                    Class<?> type, Type genericType,                          
                                                    Annotation[] anns, MediaType mt) {
         if (Map.class.isAssignableFrom(obj.getClass())) {
-            Map<Object, Object> objects = (Map)obj;
+            Map<Object, Object> objects = CastUtils.cast((Map<?, ?>)obj);
             List<Attachment> handlers = new ArrayList<Attachment>(objects.size());
             int i = 0;
             for (Iterator<Map.Entry<Object, Object>> iter = objects.entrySet().iterator(); 
                 iter.hasNext();) {
-                Map.Entry entry = iter.next();
+                Map.Entry<Object, Object> entry = iter.next();
                 Object value = entry.getValue();
                 Attachment handler = createDataHandler(value, value.getClass(), value.getClass(), 
                                                        new Annotation[]{},
@@ -277,7 +277,7 @@ public class MultipartProvider extends A
         } else {
             String rootMediaType = getRootMediaType(anns, mt); 
             if (List.class.isAssignableFrom(obj.getClass())) {
-                return getAttachments((List)obj, rootMediaType);
+                return getAttachments((List<?>)obj, rootMediaType);
             } else {
                 if (MultipartBody.class.isAssignableFrom(type)) {
                     List<Attachment> atts = ((MultipartBody)obj).getAllAttachments();

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Fri Jan  6 23:24:33 2012
@@ -240,7 +240,7 @@ public final class ProviderFactory {
         return candidates.get(0);
     }
     
-    private static void handleMapper(List<Object> candidates, 
+    private static <T> void handleMapper(List<Object> candidates, 
                                      ProviderInfo em, 
                                      Class<?> expectedType, 
                                      Message m, 
@@ -256,7 +256,7 @@ public final class ProviderFactory {
                 for (int i = 0; i < args.length; i++) {
                     Type arg = args[i];
                     if (arg instanceof TypeVariable) {
-                        TypeVariable var = (TypeVariable)arg;
+                        TypeVariable<?> var = (TypeVariable<?>)arg;
                         Type[] bounds = var.getBounds();
                         boolean isResolved = false;
                         for (int j = 0; j < bounds.length; j++) {

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/FormUtils.java Fri Jan  6 23:24:33 2012
@@ -102,8 +102,8 @@ public final class FormUtils {
                 }
             }
         } else if (request != null) {
-            for (Enumeration en = request.getParameterNames(); en.hasMoreElements();) {
-                String paramName = en.nextElement().toString();
+            for (Enumeration<String> en = request.getParameterNames(); en.hasMoreElements();) {
+                String paramName = en.nextElement();
                 String[] values = request.getParameterValues(paramName);
                 params.put(HttpUtils.urlDecode(paramName), Arrays.asList(values));
             }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java Fri Jan  6 23:24:33 2012
@@ -107,7 +107,7 @@ public final class InjectionUtils {
         return !cls.isInterface() && !Modifier.isAbstract(cls.getModifiers());
     }
     
-    public static Type getSuperType(Class<?> serviceClass, TypeVariable var) {
+    public static Type getSuperType(Class<?> serviceClass, TypeVariable<?> var) {
         
         int pos = 0;
         TypeVariable<?>[] vars = var.getGenericDeclaration().getTypeParameters();

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java Fri Jan  6 23:24:33 2012
@@ -100,6 +100,7 @@ public final class JAXBUtils {
                 return obj;
             }
             try {
+                @SuppressWarnings("rawtypes")
                 XmlAdapter xmlAdapter = typeAdapter.value().newInstance();
                 if (marshal) {
                     return xmlAdapter.marshal(obj);

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Fri Jan  6 23:24:33 2012
@@ -555,7 +555,7 @@ public final class JAXRSUtils {
         
         
         Method method = ori.getMethodToInvoke();
-        Class[] parameterTypes = method.getParameterTypes();
+        Class<?>[] parameterTypes = method.getParameterTypes();
         Parameter[] paramsInfo = ori.getParameters().toArray(new Parameter[]{});  
         Method annotatedMethod = ori.getAnnotatedMethod();
         Type[] genericParameterTypes = annotatedMethod == null ? method.getGenericParameterTypes() 
@@ -568,10 +568,10 @@ public final class JAXRSUtils {
             Type genericParam = genericParameterTypes[i];
             if (genericParam instanceof TypeVariable) {
                 genericParam = InjectionUtils.getSuperType(ori.getClassResourceInfo().getServiceClass(), 
-                                                           (TypeVariable)genericParam);
+                                                           (TypeVariable<?>)genericParam);
             }
             if (param == Object.class) {
-                param = (Class)genericParam; 
+                param = (Class<?>)genericParam; 
             } else if (genericParam == Object.class) {
                 genericParam = param;
             }
@@ -1202,10 +1202,9 @@ public final class JAXRSUtils {
         return types;
     }
     
-    @SuppressWarnings("unchecked")
-    public static Response convertFaultToResponse(Throwable ex, Message inMessage) {
+    public static <T extends Throwable> Response convertFaultToResponse(T ex, Message inMessage) {
         
-        ExceptionMapper mapper = 
+        ExceptionMapper<T> mapper = 
             ProviderFactory.getInstance(inMessage).createExceptionMapper(ex.getClass(), inMessage);
         if (mapper != null) {
             try {

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java Fri Jan  6 23:24:33 2012
@@ -310,7 +310,7 @@ public class Customer extends AbstractCu
         return servletContext;
     }
     
-    public ContextResolver getContextResolver() {
+    public ContextResolver<JAXBContext> getContextResolver() {
         return cr;
     }
 
@@ -395,7 +395,7 @@ public class Customer extends AbstractCu
     }
     
 //  CHECKSTYLE:OFF
-    public void testWrongType(@QueryParam("p1") HashMap map) {
+    public void testWrongType(@QueryParam("p1") HashMap<?, ?> map) {
         // complete
     }
 //  CHECKSTYLE:ON    

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/GenericEntityImpl2.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/GenericEntityImpl2.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/GenericEntityImpl2.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/GenericEntityImpl2.java Fri Jan  6 23:24:33 2012
@@ -24,7 +24,7 @@ import javax.ws.rs.Path;
 import org.apache.cxf.jaxrs.resources.Book;
 
 @Path("/books")
-public class GenericEntityImpl2<T extends Book> implements GenericEntity2 {
+public class GenericEntityImpl2<T extends Book> implements GenericEntity2<T> {
 
     private T book;
     

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/FormInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/FormInterface.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/FormInterface.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/FormInterface.java Fri Jan  6 23:24:33 2012
@@ -32,7 +32,7 @@ import org.apache.cxf.jaxrs.ext.multipar
 public interface FormInterface {
     @Path("/form1")
     @POST
-    void form1(MultivaluedMap map);
+    void form1(MultivaluedMap<String, String> map);
     
     @Path("/form2")
     @POST

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/jaxb/Book.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/jaxb/Book.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/jaxb/Book.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/jaxb/Book.java Fri Jan  6 23:24:33 2012
@@ -69,7 +69,7 @@ public class Book implements FormInterfa
         return chapter;
     }
     
-    public void form1(MultivaluedMap map) {
+    public void form1(MultivaluedMap<String, String> map) {
     }
     
     public String form2(String f1, String f2) {

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java Fri Jan  6 23:24:33 2012
@@ -138,7 +138,7 @@ public class AegisJSONProviderTest exten
         AegisTestBean bean = new AegisTestBean();
         bean.setBoolValue(Boolean.TRUE);
         bean.setStrValue("hovercraft");
-        p.writeTo(bean, (Class)AegisTestBean.class, AegisTestBean.class, 
+        p.writeTo(bean, AegisTestBean.class, AegisTestBean.class, 
                   AegisTestBean.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         byte[] bytes = os.toByteArray();

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java Fri Jan  6 23:24:33 2012
@@ -66,6 +66,7 @@ import org.w3c.dom.Node;
 
 import org.xml.sax.ContentHandler;
 
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxrs.ext.xml.XMLSource;
 import org.apache.cxf.jaxrs.fortest.jaxb.packageinfo.Book2;
 import org.apache.cxf.jaxrs.fortest.jaxb.packageinfo.Book2NoRootElement;
@@ -1056,7 +1057,7 @@ public class JAXBElementProviderTest ext
             b1 = ((Book[])o)[0];
             b2 = ((Book[])o)[1];
         } else if (type == Set.class) {
-            Set<Book> set = (Set)o;
+            Set<Book> set = CastUtils.cast((Set<?>)o);
             List<Book> books = new ArrayList<Book>(new TreeSet<Book>(set));
             b1 = books.get(0);
             b2 = books.get(1);
@@ -1108,9 +1109,9 @@ public class JAXBElementProviderTest ext
         TagVO2 t1 = null;
         TagVO2 t2 = null;
         if (!isArray) {
-            assertEquals(2, ((List)o).size());
-            t1 = (TagVO2)((List)o).get(0);
-            t2 = (TagVO2)((List)o).get(1);
+            assertEquals(2, ((List<?>)o).size());
+            t1 = (TagVO2)((List<?>)o).get(0);
+            t2 = (TagVO2)((List<?>)o).get(1);
         } else {
             assertEquals(2, ((Object[])o).length);
             t1 = (TagVO2)((Object[])o)[0];
@@ -1276,10 +1277,11 @@ public class JAXBElementProviderTest ext
             
         }
         
-        public Map getProperties() {
+        public Map<String, Object> getProperties() {
             return props;
         }
         
+        @SuppressWarnings("rawtypes")
         public <A extends XmlAdapter> A getAdapter(Class<A> type) {
             // TODO Auto-generated method stub
             return null;
@@ -1353,11 +1355,13 @@ public class JAXBElementProviderTest ext
             
         }
 
+        @SuppressWarnings("rawtypes")
         public void setAdapter(XmlAdapter adapter) {
             // TODO Auto-generated method stub
             
         }
 
+        @SuppressWarnings("rawtypes")
         public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
             // TODO Auto-generated method stub
             

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Fri Jan  6 23:24:33 2012
@@ -54,6 +54,7 @@ import javax.xml.transform.stream.Stream
 
 import org.w3c.dom.Document;
 
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.jaxrs.fortest.jaxb.packageinfo.Book2;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
@@ -264,7 +265,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tag, (Class)TagVO.class, TagVO.class, TagVO.class.getAnnotations(), 
+        p.writeTo(tag, TagVO.class, TagVO.class, TagVO.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -296,7 +297,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        new JAXBElementProvider().writeTo(tag, (Class)TagVO.class, TagVO.class, 
+        new JAXBElementProvider().writeTo(tag, TagVO.class, TagVO.class, 
                   TagVO.class.getAnnotations(), MediaType.APPLICATION_XML_TYPE, 
                   new MetadataMap<String, Object>(), os);
         Document doc = DOMUtils.readXml(new StringReader(os.toString()));
@@ -320,7 +321,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(book, (Class)Book.class, Book.class, Book.class.getAnnotations(), 
+        p.writeTo(book, Book.class, Book.class, Book.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -336,7 +337,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tag, (Class)TagVO.class, TagVO.class, TagVO.class.getAnnotations(), 
+        p.writeTo(tag, TagVO.class, TagVO.class, TagVO.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -354,7 +355,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tag, (Class)TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
+        p.writeTo(tag, TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -369,7 +370,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tag, (Class)TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
+        p.writeTo(tag, TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -388,7 +389,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tag, (Class)TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
+        p.writeTo(tag, TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -477,7 +478,7 @@ public class JSONProviderTest extends As
             b1 = ((Book[])o)[0];
             b2 = ((Book[])o)[1];
         } else if (type == Set.class) {
-            Set<Book> set = (Set)o;
+            Set<Book> set = CastUtils.cast((Set<?>)o);
             List<Book> books = new ArrayList<Book>(new TreeSet<Book>(set));
             b1 = books.get(0);
             b2 = books.get(1);
@@ -532,9 +533,9 @@ public class JSONProviderTest extends As
         TagVO2 t1 = null;
         TagVO2 t2 = null;
         if (!isArray) {
-            assertEquals(2, ((List)o).size());
-            t1 = (TagVO2)((List)o).get(0);
-            t2 = (TagVO2)((List)o).get(1);
+            assertEquals(2, ((List<?>)o).size());
+            t1 = (TagVO2)((List<?>)o).get(0);
+            t2 = (TagVO2)((List<?>)o).get(1);
         } else {
             assertEquals(2, ((Object[])o).length);
             t1 = (TagVO2)((Object[])o)[0];
@@ -554,7 +555,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tag, (Class)TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
+        p.writeTo(tag, TagVO2.class, TagVO2.class, TagVO2.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -584,12 +585,12 @@ public class JSONProviderTest extends As
         InputStream is = getClass().getResourceAsStream(fileName);
         JAXBContext context = JAXBContext.newInstance(new Class[]{Books.class, Book.class});
         Unmarshaller um = context.createUnmarshaller();
-        JAXBElement jaxbEl = um.unmarshal(new StreamSource(is), Books.class);
+        JAXBElement<?> jaxbEl = um.unmarshal(new StreamSource(is), Books.class);
         JSONProvider p = new JSONProvider();
         p.setIgnoreMixedContent(ignore);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(jaxbEl, (Class)JAXBElement.class, JAXBElement.class, JAXBElement.class.getAnnotations(), 
+        p.writeTo(jaxbEl, JAXBElement.class, JAXBElement.class, JAXBElement.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         String s = os.toString();
         assertEquals(data, s);
@@ -606,7 +607,7 @@ public class JSONProviderTest extends As
                             new SuperBook("CXF Rocks", 123L, 124L)));
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(books2, (Class)Books2.class, Books2.class, Books2.class.getAnnotations(), 
+        p.writeTo(books2, Books2.class, Books2.class, Books2.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         String s = os.toString();
         String data = "{\"books2\":{\"books\":{\"@xsins.type\":\"superBook\",\"id\":123,"
@@ -664,7 +665,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tags, (Class)Tags.class, Tags.class, Tags.class.getAnnotations(), 
+        p.writeTo(tags, Tags.class, Tags.class, Tags.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -683,7 +684,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(tags, (Class)Tags.class, Tags.class, Tags.class.getAnnotations(), 
+        p.writeTo(tags, Tags.class, Tags.class, Tags.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -708,7 +709,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(post, (Class)Post.class, Post.class, Post.class.getAnnotations(), 
+        p.writeTo(post, Post.class, Post.class, Post.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();
@@ -731,7 +732,7 @@ public class JSONProviderTest extends As
         
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         
-        p.writeTo(many, (Class)ManyTags.class, ManyTags.class, ManyTags.class.getAnnotations(), 
+        p.writeTo(many, ManyTags.class, ManyTags.class, ManyTags.class.getAnnotations(), 
                   MediaType.APPLICATION_JSON_TYPE, new MetadataMap<String, Object>(), os);
         
         String s = os.toString();

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/CollectionsResource.java Fri Jan  6 23:24:33 2012
@@ -51,7 +51,7 @@ public class CollectionsResource {
     }
     
     @GET
-    public List<JAXBElement> getBookElements2() {
+    public List<JAXBElement<?>> getBookElements2() {
         return null;
     }
     

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Fri Jan  6 23:24:33 2012
@@ -99,7 +99,7 @@ public class EndpointImpl extends javax.
     private String publishedEndpointUrl;
     private QName endpointName;
     private QName serviceName;
-    private Class implementorClass;
+    private Class<?> implementorClass;
     
     private List<String> schemaLocations;
     private List<AbstractFeature> features;
@@ -201,7 +201,7 @@ public class EndpointImpl extends javax.
      * Gets the class of the implementor.
      * @return the class of the implementor object
      */
-    public Class getImplementorClass() {
+    public Class<?> getImplementorClass() {
         return implementorClass != null ? implementorClass : ClassHelper.getRealClass(implementor);
     }
 
@@ -745,7 +745,7 @@ public class EndpointImpl extends javax.
         this.invoker = invoker;
     }
 
-    public void setImplementorClass(Class implementorClass) {
+    public void setImplementorClass(Class<?> implementorClass) {
         this.implementorClass = implementorClass;
     }
     

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java Fri Jan  6 23:24:33 2012
@@ -37,7 +37,7 @@ public class JaxWsClientFactoryBean exte
     public JaxWsClientFactoryBean() {
         super(new JaxWsServiceFactoryBean());
     }
-    public void setServiceClass(Class serviceClass) {
+    public void setServiceClass(Class<?> serviceClass) {
         super.setServiceClass(serviceClass);
         if (((JaxWsServiceFactoryBean)getServiceFactory()).getJaxWsImplementorInfo() == null) {
             JaxWsImplementorInfo implInfo = new JaxWsImplementorInfo(serviceClass);

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Fri Jan  6 23:24:33 2012
@@ -114,9 +114,10 @@ public class JaxWsProxyFactoryBean exten
         return cp;
     }
 
-    protected Class[] getImplementingClasses() {
+    @Override
+    protected Class<?>[] getImplementingClasses() {
         Class<?> cls = getClientFactoryBean().getServiceClass();
-        Class ret[] = new Class[] {cls, BindingProvider.class};
+        Class<?> ret[] = new Class[] {cls, BindingProvider.class};
         try {
             cls.getMethod("close");
         } catch (Exception e) {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Fri Jan  6 23:24:33 2012
@@ -246,7 +246,7 @@ public final class WrapperClassGenerator
         wrapperBeans.add(clz);
     }
 
-    private void generatePackageInfo(String className, String ns, Class clz) {
+    private void generatePackageInfo(String className, String ns, Class<?> clz) {
         ClassWriter cw = createClassWriter();
         String classFileName = periodToSlashes(className);
         cw.visit(Opcodes.V1_5, Opcodes.ACC_ABSTRACT + Opcodes.ACC_INTERFACE, classFileName, null,
@@ -310,16 +310,16 @@ public final class WrapperClassGenerator
         }
         String classFileName = periodToSlashes(className);
         String name = mpi.getName().getLocalPart();
-        Class clz = mpi.getTypeClass();
+        Class<?> clz = mpi.getTypeClass();
         Object obj = mpi.getProperty(ReflectionServiceFactoryBean.RAW_CLASS);
         if (obj != null) {
-            clz = (Class)obj;
+            clz = (Class<?>)obj;
         }
         Type genericType = (Type)mpi.getProperty(ReflectionServiceFactoryBean.GENERIC_TYPE);
         if (genericType instanceof ParameterizedType) {
             ParameterizedType tp = (ParameterizedType)genericType;
             if (tp.getRawType() instanceof Class
-                && Holder.class.isAssignableFrom((Class)tp.getRawType())) {
+                && Holder.class.isAssignableFrom((Class<?>)tp.getRawType())) {
                 genericType = tp.getActualTypeArguments()[0];
             }
         }

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java Fri Jan  6 23:24:33 2012
@@ -284,7 +284,7 @@ public class AnnotationHandlerChainBuild
         return buildHandlerChainFromClass(clz, null, portQName, serviceQName, bindingID);
     }
     
-    protected URL resolveHandlerChainAnnotationFile(Class clazz, String name) {
+    protected URL resolveHandlerChainAnnotationFile(Class<?> clazz, String name) {
         return clazz.getResource(name);
     }
     
@@ -305,7 +305,7 @@ public class AnnotationHandlerChainBuild
                 WebService ws = clz.getAnnotation(WebService.class);
                 if (ws != null && !StringUtils.isEmpty(ws.endpointInterface())) {
                     String seiClassName = ws.endpointInterface().trim();
-                    Class seiClass = null;
+                    Class<?> seiClass = null;
                     try {
                         seiClass = ClassLoaderUtils.loadClass(seiClassName, clz);
                     } catch (ClassNotFoundException e) {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java Fri Jan  6 23:24:33 2012
@@ -140,7 +140,7 @@ public class HandlerChainBuilder {
      * @param filename
      * @return A URL object or null if no resource with this name is found
      */    
-    protected URL resolveHandlerChainFile(Class clz, String filename) {
+    protected URL resolveHandlerChainFile(Class<?> clz, String filename) {
         URL handlerFile = clz.getResource(filename);
         if (handlerFile == null) {
             //the file location might be an absolute java.net.URL in externalForm.

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java Fri Jan  6 23:24:33 2012
@@ -60,11 +60,11 @@ public class HolderInInterceptor extends
         
         boolean client = Boolean.TRUE.equals(message.get(Message.REQUESTOR_ROLE));
         if (client) {
-            List<Holder> outHolders = CastUtils.cast((List)message.getExchange()
+            List<Holder<?>> outHolders = CastUtils.cast((List<?>)message.getExchange()
                 .getOutMessage().get(CLIENT_HOLDERS));
             for (MessagePartInfo part : parts) {
                 if (part.getIndex() != 0 && part.getTypeClass() != null) {
-                    Holder holder = (Holder)outHolders.get(part.getIndex() - 1);
+                    Holder<Object> holder = (Holder<Object>)outHolders.get(part.getIndex() - 1);
                     if (holder != null) {
                         holder.value = inObjects.get(part);
                         inObjects.put(part, holder);

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsProxyFactoryBeanDefinitionParser.java Fri Jan  6 23:24:33 2012
@@ -58,7 +58,7 @@ public class JaxWsProxyFactoryBeanDefini
 
     @NoJSR250Annotations
     public static class JAXWSSpringClientProxyFactoryBean extends JaxWsProxyFactoryBean
-        implements ApplicationContextAware, FactoryBean, DisposableBean {
+        implements ApplicationContextAware, FactoryBean<Object>, DisposableBean {
 
         private Object obj;
 
@@ -84,7 +84,7 @@ public class JaxWsProxyFactoryBeanDefini
             }
             return obj;
         }
-        public Class getObjectType() {
+        public Class<?> getObjectType() {
             return this.getServiceClass();
         }
         public boolean isSingleton() {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Fri Jan  6 23:24:33 2012
@@ -76,13 +76,13 @@ public class JaxWsServiceConfiguration e
      * It would also be good to cache across creations,
      * but Method.equals isn't good enough.
      */
-    private Map<Object, Class> responseMethodClassCache;
-    private Map<Object, Class> requestMethodClassCache;
+    private Map<Object, Class<?>> responseMethodClassCache;
+    private Map<Object, Class<?>> requestMethodClassCache;
     private Map<Method, Annotation[][]> methodAnnotationCache;
     
     public JaxWsServiceConfiguration() {
-        responseMethodClassCache = new HashMap<Object, Class>();
-        requestMethodClassCache = new HashMap<Object, Class>();
+        responseMethodClassCache = new HashMap<Object, Class<?>>();
+        requestMethodClassCache = new HashMap<Object, Class<?>>();
         methodAnnotationCache = new HashMap<Method, Annotation[][]>();
     }
 
@@ -194,7 +194,7 @@ public class JaxWsServiceConfiguration e
         }
 
         
-        Class implClz = implInfo.getImplementorClass();
+        Class<?> implClz = implInfo.getImplementorClass();
         Method m = getDeclaredMethod(implClz, method);
         if (m != null) {
             WebMethod wm = m.getAnnotation(WebMethod.class);
@@ -597,8 +597,8 @@ public class JaxWsServiceConfiguration e
     
     
     @Override
-    public Class getResponseWrapper(Method selected) {
-        Class cachedClass = responseMethodClassCache.get(selected);
+    public Class<?> getResponseWrapper(Method selected) {
+        Class<?> cachedClass = responseMethodClassCache.get(selected);
         if (cachedClass != null) {
             return cachedClass;
         }
@@ -621,7 +621,7 @@ public class JaxWsServiceConfiguration e
                 return cachedClass;
             }
             try {
-                Class r = ClassLoaderUtils.loadClass(clsName, implInfo.getEndpointClass());
+                Class<?> r = ClassLoaderUtils.loadClass(clsName, implInfo.getEndpointClass());
                 responseMethodClassCache.put(clsName, r);
                 responseMethodClassCache.put(selected, r);
                 
@@ -668,8 +668,8 @@ public class JaxWsServiceConfiguration e
     }
     
     @Override
-    public Class getRequestWrapper(Method selected) {
-        Class cachedClass = requestMethodClassCache.get(selected);
+    public Class<?> getRequestWrapper(Method selected) {
+        Class<?> cachedClass = requestMethodClassCache.get(selected);
         if (cachedClass != null) {
             return cachedClass;
         }
@@ -691,7 +691,7 @@ public class JaxWsServiceConfiguration e
                 return cachedClass;
             }
             try {
-                Class r = ClassLoaderUtils.loadClass(clsName, implInfo.getEndpointClass());
+                Class<?> r = ClassLoaderUtils.loadClass(clsName, implInfo.getEndpointClass());
                 requestMethodClassCache.put(clsName, r);
                 requestMethodClassCache.put(selected, r);
                 if (m.getParameterTypes().length == 1 && r.equals(m.getParameterTypes()[0])) {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Fri Jan  6 23:24:33 2012
@@ -291,7 +291,7 @@ public class JaxWsServiceFactoryBean ext
     }
 
     protected void initializeWSDLOperationsForProvider() {
-        Class c = getProviderParameterType(getServiceClass());
+        Class<?> c = getProviderParameterType(getServiceClass());
         if (c == null) {
             throw new ServiceConstructionException(new Message("INVALID_PROVIDER_EXC", LOG));
         }
@@ -401,15 +401,15 @@ public class JaxWsServiceFactoryBean ext
                 if (Provider.class == rawCls) {
                     return (Class<?>)((ParameterizedType)type).getActualTypeArguments()[0];
                 }
-            } else if (type instanceof Class && Provider.class.isAssignableFrom((Class)type)) {
-                return getProviderParameterType((Class)type);
+            } else if (type instanceof Class && Provider.class.isAssignableFrom((Class<?>)type)) {
+                return getProviderParameterType((Class<?>)type);
             }
         }
         return getProviderParameterType(cls.getSuperclass());
     }
 
     void initializeWrapping(OperationInfo o, Method selected) {
-        Class responseWrapper = getResponseWrapper(selected);
+        Class<?> responseWrapper = getResponseWrapper(selected);
         if (responseWrapper != null) {
             o.getOutput().getMessageParts().get(0).setTypeClass(responseWrapper);
         }
@@ -508,7 +508,7 @@ public class JaxWsServiceFactoryBean ext
         }
     }
 
-    private FaultInfo getFaultInfo(final OperationInfo operation, final Class expClass) {
+    private FaultInfo getFaultInfo(final OperationInfo operation, final Class<?> expClass) {
         for (FaultInfo fault : operation.getFaults()) {
             if (fault.getProperty(Class.class.getName()) == expClass
                 || fault.getProperty(Class.class.getName()) == expClass) {
@@ -683,7 +683,7 @@ public class JaxWsServiceFactoryBean ext
         getService().put(WS_FEATURES, getWsFeatures());
     }
 
-    protected void initializeParameter(MessagePartInfo part, Class rawClass, Type type) {
+    protected void initializeParameter(MessagePartInfo part, Class<?> rawClass, Type type) {
         if (implInfo.isWebServiceProvider()) {
             part.setTypeQName(XMLSchemaQNames.XSD_ANY);
             part.setTypeClass(rawClass);

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java Fri Jan  6 23:24:33 2012
@@ -48,7 +48,7 @@ import org.junit.Test;
 public class CodeFirstWSDLTest extends AbstractJaxWsTest {
     String address = "local://localhost:9000/Hello";
     
-    private Definition createService(Class clazz) throws Exception {
+    private Definition createService(Class<?> clazz) throws Exception {
         
         JaxWsImplementorInfo info = new JaxWsImplementorInfo(clazz);
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean(info);

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java Fri Jan  6 23:24:33 2012
@@ -137,7 +137,7 @@ public class ServiceImplTest extends Abs
         assertNotNull(wsdl1);
         
         ServiceImpl service = new ServiceImpl(getBus(), wsdl1, SERVICE_1, ServiceImpl.class);
-        Iterator iter = service.getPorts();
+        Iterator<QName> iter = service.getPorts();
         assertNotNull(iter);
         assertTrue(iter.hasNext());
         assertEquals(PORT_1, iter.next());

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java Fri Jan  6 23:24:33 2012
@@ -20,13 +20,12 @@
 package org.apache.cxf.jaxws.handler;
 
 import java.util.List;
-import java.util.Map;
-
 import javax.jws.HandlerChain;
 import javax.jws.WebService;
 import javax.xml.namespace.QName;
 import javax.xml.ws.handler.Handler;
 import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.LogicalMessageContext;
 import javax.xml.ws.handler.MessageContext;
 
 import org.junit.Assert;
@@ -101,28 +100,22 @@ public class AnnotationHandlerChainBuild
         assertEquals(7, handlers.size());
     }
     
-    public static class TestLogicalHandler implements LogicalHandler {
-        Map config;
+    public static class TestLogicalHandler implements LogicalHandler<LogicalMessageContext> {
         boolean initCalled;
 
         public void close(MessageContext arg0) {
         }
 
-        public boolean handleFault(MessageContext arg0) {
+        public boolean handleFault(LogicalMessageContext arg0) {
             return false;
         }
 
-        public boolean handleMessage(MessageContext arg0) {
+        public boolean handleMessage(LogicalMessageContext arg0) {
             return false;
         }
-
-        public final void init(final Map map) {
-            config = map;
-            initCalled = true;
-        }
     }
 
-    public static class TestProtocolHandler implements Handler {
+    public static class TestProtocolHandler implements Handler<MessageContext> {
 
         public void close(MessageContext arg0) {
         }

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalMessageImplTest.java Fri Jan  6 23:24:33 2012
@@ -66,7 +66,7 @@ public class LogicalMessageImplTest exte
         
         Object obj = lmi.getPayload(ctx);
         assertTrue(obj instanceof JAXBElement);
-        JAXBElement<?> el2 = (JAXBElement)obj;
+        JAXBElement<?> el2 = (JAXBElement<?>)obj;
         assertTrue(el2.getValue() instanceof AddNumbers);
         AddNumbers resp = (AddNumbers)el2.getValue();
         assertEquals(req.getArg0(), resp.getArg0());        

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java Fri Jan  6 23:24:33 2012
@@ -173,10 +173,10 @@ public class SOAPHandlerInterceptorTest 
         SOAPMessage resultedMessage = message.getContent(SOAPMessage.class);
         assertNotNull(resultedMessage);
         SOAPBody bodyNew = resultedMessage.getSOAPBody();
-        Iterator itNew = bodyNew.getChildElements(new QName("http://apache.org/hello_world_rpclit",
+        Iterator<?> itNew = bodyNew.getChildElements(new QName("http://apache.org/hello_world_rpclit",
                                                             "sendReceiveDataResponse"));
         SOAPBodyElement bodyElementNew = (SOAPBodyElement)itNew.next();
-        Iterator outIt = bodyElementNew
+        Iterator<?> outIt = bodyElementNew
             .getChildElements(new QName("http://apache.org/hello_world_rpclit/types", "out"));
         Element outElement = (SOAPElement)outIt.next();
         assertNotNull(outElement);        
@@ -296,7 +296,7 @@ public class SOAPHandlerInterceptorTest 
                         SOAPMessage message = smc.getMessage();
                          
                         SOAPHeader soapHeader = message.getSOAPHeader();
-                        Iterator it = soapHeader.getChildElements(new QName(
+                        Iterator<?> it = soapHeader.getChildElements(new QName(
                             "http://apache.org/hello_world_rpclit/types", "header1"));
                         SOAPHeaderElement headerElementNew = (SOAPHeaderElement)it.next();
 
@@ -376,8 +376,9 @@ public class SOAPHandlerInterceptorTest 
         SOAPMessage soapMessageNew = message.getContent(SOAPMessage.class);
 
         SOAPHeader soapHeader = soapMessageNew.getSOAPHeader();
-        Iterator itNew = soapHeader.getChildElements(new QName("http://apache.org/hello_world_rpclit/types",
-            "header1"));
+        Iterator<?> itNew = soapHeader
+            .getChildElements(new QName("http://apache.org/hello_world_rpclit/types",
+                "header1"));
         SOAPHeaderElement headerElementNew = (SOAPHeaderElement)itNew.next();
         SoapVersion soapVersion = Soap11.getInstance();
         assertEquals("false", headerElementNew.getAttributeNS(soapVersion.getNamespace(), "mustUnderstand"));
@@ -432,7 +433,7 @@ public class SOAPHandlerInterceptorTest 
         // Verify SOAPMessage
         SOAPMessage soapMessageNew = message.getContent(SOAPMessage.class);
         SOAPBody bodyNew = soapMessageNew.getSOAPBody();
-        Iterator itNew = bodyNew.getChildElements();
+        Iterator<?> itNew = bodyNew.getChildElements();
         SOAPBodyElement bodyElementNew = (SOAPBodyElement)itNew.next();
         assertEquals("sendReceiveData", bodyElementNew.getLocalName());
 

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java Fri Jan  6 23:24:33 2012
@@ -85,7 +85,7 @@ public abstract class AbstractServiceFac
         return null;
     }
 
-    public void setServiceClass(Class clz) {
+    public void setServiceClass(Class<?> clz) {
         super.setServiceClass(clz);
         getServiceFactory().setServiceClass(clz);
     }

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Fri Jan  6 23:24:33 2012
@@ -352,7 +352,7 @@ public abstract class AbstractWSDLBasedE
         }
     }
 
-    public Class getServiceClass() {
+    public Class<?> getServiceClass() {
         return serviceClass;
     }
 
@@ -361,7 +361,7 @@ public abstract class AbstractWSDLBasedE
      *
      * @param serviceClass the service's implementaiton class
      */
-    public void setServiceClass(Class serviceClass) {
+    public void setServiceClass(Class<?> serviceClass) {
         this.serviceClass = serviceClass;
     }
 

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Fri Jan  6 23:24:33 2012
@@ -184,7 +184,7 @@ public class ClientProxyFactoryBean exte
         }
     }
 
-    protected Class[] getImplementingClasses() {
+    protected Class<?>[] getImplementingClasses() {
         Class<?> cls = clientFactoryBean.getServiceClass();
         try {
             if (cls.getMethod("close") != null) {
@@ -217,7 +217,7 @@ public class ClientProxyFactoryBean exte
         this.password = password;
     }
 
-    public Class getServiceClass() {
+    public Class<?> getServiceClass() {
         return clientFactoryBean.getServiceClass();
     }
 
@@ -226,7 +226,7 @@ public class ClientProxyFactoryBean exte
      *
      * @param serviceClass the SEI's class
      */
-    public void setServiceClass(Class serviceClass) {
+    public void setServiceClass(Class<?> serviceClass) {
         clientFactoryBean.setServiceClass(serviceClass);
     }
 

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java Fri Jan  6 23:24:33 2012
@@ -166,11 +166,11 @@ public abstract class AbstractServiceCon
         return null;        
     }  
  
-    public Class getResponseWrapper(Method selected) {
+    public Class<?> getResponseWrapper(Method selected) {
         return null;
     }
     
-    public Class getRequestWrapper(Method selected) {
+    public Class<?> getRequestWrapper(Method selected) {
         return null;
     }
     public String getResponseWrapperClassName(Method selected) {

Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormOutInterceptor.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormOutInterceptor.java (original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlFormOutInterceptor.java Fri Jan  6 23:24:33 2012
@@ -69,7 +69,7 @@ public class SamlFormOutInterceptor exte
             if (obj instanceof Form) {
                 return (Form)obj;
             } else if (obj instanceof MultivaluedMap) {
-                return new Form((MultivaluedMap)obj);
+                return new Form((MultivaluedMap<String, String>)obj);
             }
         }
         return null;

Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderOutInterceptor.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderOutInterceptor.java (original)
+++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SamlHeaderOutInterceptor.java Fri Jan  6 23:24:33 2012
@@ -60,7 +60,7 @@ public class SamlHeaderOutInterceptor ex
         
     private Map<String, List<String>> getHeaders(Message message) {
         Map<String, List<String>> headers = 
-            CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+            CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
         if (headers == null) {
             headers = new HashMap<String, List<String>>();
         }

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Fri Jan  6 23:24:33 2012
@@ -716,7 +716,6 @@ public abstract class AbstractHTTPDestin
      * 
      * @see org.apache.cxf.transport.AbstractMultiplexDestination#getId(java.util.Map)
      */
-    @SuppressWarnings("rawtypes")
     @Override
     public String getId(Map<String, Object> context) {
         String id = null;

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistryImpl.java Fri Jan  6 23:24:33 2012
@@ -100,7 +100,7 @@ public class AssertionBuilderRegistryImp
             }
         }
     }
-    protected AssertionBuilder handleNoRegisteredBuilder(QName qname) {
+    protected AssertionBuilder<?> handleNoRegisteredBuilder(QName qname) {
         if (ignoreUnknownAssertions) {
             boolean alreadyWarned = ignored.contains(qname);
             if (!alreadyWarned) {

Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java Fri Jan  6 23:24:33 2012
@@ -28,6 +28,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.SystemPropertyAction;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
@@ -138,8 +139,8 @@ public class PolicyOutInterceptor extend
             }
         } else {
             Destination destination = exchange.getDestination();
-            @SuppressWarnings("unchecked")
-            List<List<Assertion>> incoming = (List)exchange.get("ws-policy.validated.alternatives");
+            List<List<Assertion>> incoming 
+                = CastUtils.cast((List<?>)exchange.get("ws-policy.validated.alternatives"));
             EffectivePolicy effectivePolicy 
                 = pe.getEffectiveServerResponsePolicy(ei, boi, destination, incoming);
             msg.put(EffectivePolicy.class, effectivePolicy);

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java Fri Jan  6 23:24:33 2012
@@ -55,6 +55,7 @@ public class ManagedRMEndpoint implement
     {"sequenceId", "currentMessageNumber", "expires", "lastMessage", "queuedMessageCount", 
      "target"};
     private static final String[] SOURCE_SEQUENCE_DESCRIPTIONS = SOURCE_SEQUENCE_NAMES;
+    @SuppressWarnings("rawtypes") // needed as OpenType isn't generic on Java5
     private static final OpenType[] SOURCE_SEQUENCE_TYPES =  
     {SimpleType.STRING, SimpleType.LONG, SimpleType.DATE, SimpleType.BOOLEAN, SimpleType.INTEGER, 
      SimpleType.STRING};
@@ -62,6 +63,7 @@ public class ManagedRMEndpoint implement
     private static final String[] DESTINATION_SEQUENCE_NAMES = 
     {"sequenceId", "lastMessageNumber", "correlationId", "ackTo"};
     private static final String[] DESTINATION_SEQUENCE_DESCRIPTIONS = DESTINATION_SEQUENCE_NAMES;
+    @SuppressWarnings("rawtypes") // needed as OpenType isn't generic on Java5
     private static final OpenType[] DESTINATION_SEQUENCE_TYPES =  
     {SimpleType.STRING, SimpleType.LONG, SimpleType.STRING, 
      SimpleType.STRING};
@@ -69,6 +71,7 @@ public class ManagedRMEndpoint implement
     private static final String[] RETRANSMISSION_STATUS_NAMES = 
     {"messageNumber", "resends", "previous", "next", "nextInterval", "backOff", "pending", "suspended"};
     private static final String[] RETRANSMISSION_STATUS_DESCRIPTIONS = RETRANSMISSION_STATUS_NAMES;
+    @SuppressWarnings("rawtypes") // needed as OpenType isn't generic on Java5
     private static final OpenType[] RETRANSMISSION_STATUS_TYPES =  
     {SimpleType.LONG, SimpleType.INTEGER, SimpleType.DATE, SimpleType.DATE, SimpleType.LONG, SimpleType.LONG, 
      SimpleType.BOOLEAN, SimpleType.BOOLEAN};

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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012
@@ -263,7 +263,7 @@ public abstract class AbstractCXFToolCon
      * get all parameters in a map
      * @param stringArrayKeys, contains keys, whose value should be string array
      */
-    protected Map<String, Object> getParametersMap(Set stringArrayKeys) {
+    protected Map<String, Object> getParametersMap(Set<String> stringArrayKeys) {
         Map<String, Object> map = new HashMap<String, Object>();
         CommandDocument doc = getCommandDocument();
         if (doc == null) {

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaPort.java Fri Jan  6 23:24:33 2012
@@ -95,7 +95,7 @@ public class JavaPort {
         operations.add(method);
     }
 
-    public List getOperations() {
+    public List<JavaMethod> getOperations() {
         return operations;
     }
 

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java Fri Jan  6 23:24:33 2012
@@ -172,8 +172,8 @@ public class ToolSpec {
         }
     }
 
-    public List getInstreamIds() {
-        List<Object> res = new ArrayList<Object>();
+    public List<String> getInstreamIds() {
+        List<String> res = new ArrayList<String>();
         Element streams = getStreams();
 
         if (streams != null) {
@@ -187,8 +187,8 @@ public class ToolSpec {
         return Collections.unmodifiableList(res);
     }
 
-    public List getOutstreamIds() {
-        List<Object> res = new ArrayList<Object>();
+    public List<String> getOutstreamIds() {
+        List<String> res = new ArrayList<String>();
         Element streams = getStreams();
 
         if (streams != null) {

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/BadUsageException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/BadUsageException.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/BadUsageException.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/BadUsageException.java Fri Jan  6 23:24:33 2012
@@ -42,7 +42,7 @@ public class BadUsageException extends E
         this.errors = err;
     }
 
-    public Collection getErrors() {
+    public Collection<CommandLineError> getErrors() {
         return errors.getErrors();
     }
 

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandDocument.java Fri Jan  6 23:24:33 2012
@@ -33,7 +33,7 @@ public class CommandDocument {
 
     private final Document doc;
     private final ToolSpec toolspec;
-    private final List<Object> values;
+    private final List<Element> values;
 
     CommandDocument(ToolSpec ts, Document d) {
 
@@ -45,16 +45,16 @@ public class CommandDocument {
         if (d == null) {
             throw new NullPointerException("CommandDocument cannot be created with a null document");
         }
-        values = new ArrayList<Object>();
+        values = new ArrayList<Element>();
         this.doc = d;
         NodeList nl = doc.getDocumentElement().getElementsByTagName("option");
 
         for (int i = 0; i < nl.getLength(); i++) {
-            values.add(nl.item(i));
+            values.add((Element)nl.item(i));
         }
         nl = doc.getDocumentElement().getElementsByTagName("argument");
         for (int i = 0; i < nl.getLength(); i++) {
-            values.add(nl.item(i));
+            values.add((Element)nl.item(i));
         }
     }
 
@@ -85,9 +85,7 @@ public class CommandDocument {
         List<Object> result = new ArrayList<Object>();
 
         if (values != null) {
-            for (Iterator it = values.iterator(); it.hasNext();) {
-                Element el = (Element)it.next();
-
+            for (Element el: values) {
                 if (el.getAttribute("name").equals(name)) {
                     if (el.hasChildNodes()) {
                         result.add(el.getFirstChild().getNodeValue());
@@ -111,9 +109,7 @@ public class CommandDocument {
         List<Object> result = new ArrayList<Object>();
 
         if (values != null) {
-            for (Iterator it = values.iterator(); it.hasNext();) {
-                Element el = (Element)it.next();
-
+            for (Element el: values) {
                 result.add(el.getAttribute("name"));
             }
         }

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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012
@@ -33,7 +33,7 @@ public class ErrorVisitor {
 
     private static final Logger LOG = LogUtils.getL7dLogger(ErrorVisitor.class);
 
-    private final Set<Object> errors = new HashSet<Object>();
+    private final Set<CommandLineError> errors = new HashSet<CommandLineError>();
 
     public static class MissingOption implements CommandLineError {
         private final Option o;
@@ -167,7 +167,7 @@ public class ErrorVisitor {
         }
     }
 
-    public Collection getErrors() {
+    public Collection<CommandLineError> getErrors() {
         return errors;
     }
 

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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012
@@ -72,7 +72,7 @@ public final class AnnotationUtil {
         return new URLClassLoader(urls, parent);
     }
 
-    public static synchronized Class loadClass(String className, ClassLoader parent) {
+    public static synchronized Class<?> loadClass(String className, ClassLoader parent) {
         Class<?> clazz = null;
         URL[] urls = URIParserUtil.pathToURLs(getClassPath());
         URLClassLoader classLoader = new URLClassLoader(urls, parent);

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=1228499&r1=1228498&r2=1228499&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 23:24:33 2012
@@ -387,7 +387,7 @@ public final class SOAPBindingUtil {
         return getSoapAddress(extElement);
     }
 
-    public static SoapBody createSoapBody(ExtensionRegistry extReg, Class clz, boolean isSOAP12)
+    public static SoapBody createSoapBody(ExtensionRegistry extReg, Class<?> clz, boolean isSOAP12)
         throws WSDLException {
         ExtensibilityElement extElement = null;
         if (isSOAP12) {
@@ -447,7 +447,7 @@ public final class SOAPBindingUtil {
         return getSoapFault(extElement);
     }
 
-    public static SoapHeader createSoapHeader(ExtensionRegistry extReg, Class clz, boolean isSOAP12)
+    public static SoapHeader createSoapHeader(ExtensionRegistry extReg, Class<?> clz, boolean isSOAP12)
         throws WSDLException {
         ExtensibilityElement extElement = null;
         if (isSOAP12) {

Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java Fri Jan  6 23:24:33 2012
@@ -20,29 +20,26 @@
 package org.apache.cxf.tools.corba.common.idltypes;
 
 import java.io.PrintWriter;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
 
 public class IdlArrayBase extends IdlDefnImplBase implements IdlType {
     private IdlType elemType;
-    private List<Object> dims;    
+    private List<Integer> dims;    
     private int size;
 
     protected IdlArrayBase(IdlScopeBase parent, String name, IdlType elem, int length) {
         super(parent, name);
         this.size = length;
-        dims = new Vector<Object>();
+        dims = new Vector<Integer>();
 
         if (elem instanceof IdlAnonArray) {
             IdlAnonArray arr = (IdlAnonArray)elem;
             elemType = arr.elemType();
 
-            Iterator it = arr.dimensions().iterator();
-
-            while (it.hasNext()) {
-                dims.add(it.next());
+            for (Integer i : arr.dimensions()) {
+                dims.add(i);
             }
         } else {
             elemType = elem;
@@ -52,10 +49,8 @@ public class IdlArrayBase extends IdlDef
     }
 
     public void write(PrintWriter pw) {
-        Iterator it = dims.iterator();
-
-        while (it.hasNext()) {
-            pw.print("[" + it.next() + "]");
+        for (Integer i : dims) {
+            pw.print("[" + i + "]");
         }
     }
 
@@ -63,10 +58,8 @@ public class IdlArrayBase extends IdlDef
     public void write(PrintWriter pw, String name) {
         pw.print(name);
 
-        Iterator it = dims.iterator();
-
-        while (it.hasNext()) {
-            pw.print("[" + it.next() + "]");
+        for (Integer i : dims) {
+            pw.print("[" + i + "]");
         }
     }
 
@@ -90,7 +83,7 @@ public class IdlArrayBase extends IdlDef
     }
 
 
-    protected List dimensions() {
+    protected List<Integer> dimensions() {
         return dims;
     }
 }

Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlEnum.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlEnum.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlEnum.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlEnum.java Fri Jan  6 23:24:33 2012
@@ -44,9 +44,9 @@ public final class IdlEnum extends IdlSc
         pw.println(indent() + "enum " + localName() + " {");
         indentMore();
 
-        Collection enums = definitions();
+        Collection<IdlDefn> enums = definitions();
         int needComma = enums.size() - 1;
-        Iterator it = enums.iterator();
+        Iterator<IdlDefn> it = enums.iterator();
 
         while (it.hasNext()) {
             IdlEnumerator en = (IdlEnumerator)it.next();

Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlOperation.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlOperation.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlOperation.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlOperation.java Fri Jan  6 23:24:33 2012
@@ -27,12 +27,12 @@ import java.util.Vector;
 
 public final class IdlOperation extends IdlScopeBase {
     private IdlType returnType;
-    private List<Object> exceptions;
+    private List<IdlException> exceptions;
     private boolean oneway;
 
     private IdlOperation(IdlScopeBase parent, String name, boolean isOneway) {
         super(parent, name);
-        exceptions = new Vector<Object>();
+        exceptions = new Vector<IdlException>();
         oneway = isOneway;
     }
     
@@ -72,15 +72,14 @@ public final class IdlOperation extends 
 
         pw.print(indent() + localName() + "(");
 
-        Collection defns = definitions();
+        Collection<IdlDefn> defns = definitions();
 
         if (defns.size() != 0) {
             pw.println();
             indentMore();
 
             int needComma = defns.size() - 1;
-            Iterator it = defns.iterator();
-
+            Iterator<IdlDefn> it = defns.iterator();
             while (it.hasNext()) {
                 IdlParam def = (IdlParam)it.next();
                 def.write(pw);
@@ -102,10 +101,8 @@ public final class IdlOperation extends 
             indentMore();
 
             int needComma = exceptions.size() - 1;
-            Iterator it = exceptions.iterator();
 
-            while (it.hasNext()) {
-                IdlException exc = (IdlException)it.next();
+            for (IdlException exc : exceptions) {
                 pw.print(indent() + exc.fullName(scopeName()));
 
                 if (needComma-- != 0) {



Mime
View raw message