cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1228499 [4/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/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java
(original)
+++ cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java
Fri Jan  6 23:24:33 2012
@@ -41,7 +41,7 @@ public class TestWSDLCorbaWriterImpl ext
 
     private TestComparator comparator = new TestComparator();
 
-    protected void printBindingFaults(Map bindingFaults,
+    protected void printBindingFaults(@SuppressWarnings("rawtypes") Map bindingFaults,
                                       Definition def,
                                       java.io.PrintWriter pw)
         throws WSDLException {
@@ -50,55 +50,63 @@ public class TestWSDLCorbaWriterImpl ext
         super.printBindingFaults(bfaults, def, pw);
     }
 
-    protected void printBindings(java.util.Map bindings, Definition def, java.io.PrintWriter
pw)
+    protected void printBindings(@SuppressWarnings("rawtypes")java.util.Map bindings, 
+                                 Definition def, java.io.PrintWriter pw)
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(bindings));
         super.printBindings(map, def, pw);
     }
     
-    protected void printFaults(java.util.Map faults, Definition def, java.io.PrintWriter
pw) 
+    protected void printFaults(@SuppressWarnings("rawtypes")java.util.Map faults,
+                               Definition def, java.io.PrintWriter pw) 
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(faults));
         super.printFaults(map, def, pw);
     }
 
-    protected void printImports(java.util.Map imports, Definition def, java.io.PrintWriter
pw) 
+    protected void printImports(@SuppressWarnings("rawtypes")java.util.Map imports, 
+                                Definition def, java.io.PrintWriter pw) 
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(imports));
         super.printImports(map, def, pw);
     }
 
-    protected void printMessages(java.util.Map messages, Definition def, java.io.PrintWriter
pw) 
+    protected void printMessages(@SuppressWarnings("rawtypes")java.util.Map messages, 
+                                 Definition def, java.io.PrintWriter pw) 
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(messages));
         super.printMessages(map, def, pw);
     }
 
-    protected void printNamespaceDeclarations(java.util.Map namespaces, java.io.PrintWriter
pw) 
+    protected void printNamespaceDeclarations(@SuppressWarnings("rawtypes")java.util.Map
namespaces, 
+                                              java.io.PrintWriter pw) 
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(namespaces));
         super.printNamespaceDeclarations(map, pw);
     }
 
-    protected void printPorts(java.util.Map ports, Definition def, java.io.PrintWriter pw)

+    protected void printPorts(@SuppressWarnings("rawtypes")java.util.Map ports,
+                              Definition def, java.io.PrintWriter pw) 
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(ports));
         super.printPorts(map, def, pw);
     }
-    protected void printPortTypes(java.util.Map portTypes, Definition def, java.io.PrintWriter
pw) 
+    protected void printPortTypes(@SuppressWarnings("rawtypes")java.util.Map portTypes, 
+                                  Definition def, java.io.PrintWriter pw) 
         throws WSDLException {
         Map<QName, PortType> map = new TreeMap<QName, PortType>(comparator);
         map.putAll(CastUtils.cast(portTypes, QName.class, PortType.class));
         super.printPortTypes(map, def, pw);
     }
            
-    protected void printServices(java.util.Map services, Definition def, java.io.PrintWriter
pw) 
+    protected void printServices(@SuppressWarnings("rawtypes")java.util.Map services, 
+                                 Definition def, java.io.PrintWriter pw) 
         throws WSDLException {
         Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
         map.putAll(CastUtils.cast(services));

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
Fri Jan  6 23:24:33 2012
@@ -39,7 +39,7 @@ public final class WSDLGeneratorFactory 
         return pkgName + "." + wsdlVersion.toString().toLowerCase() + "." + wsdlVersion +
"Generator";
     }
 
-    public AbstractGenerator newGenerator() {
+    public AbstractGenerator<?> newGenerator() {
         AbstractGenerator<?> generator = null;
         String clzName = getGeneratorClassName();
         try {

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
Fri Jan  6 23:24:33 2012
@@ -108,14 +108,14 @@ public final class DateTypeCustomGenerat
         return new File(outputdir, wsdlName + ".xjb");
     }
 
-    protected String getAdapterMethod(final Class clz, final String methodName) {
+    protected String getAdapterMethod(final Class<?> clz, final String methodName)
{
         if (clz == Date.class) {
             return DATE_ADAPTER + methodName;
         }
         return CALENDAR_ADAPTER + methodName;
     }
 
-    protected Class getDateType() {
+    protected Class<?> getDateType() {
         if (getServiceModel() == null) {
             return null;
         }

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
Fri Jan  6 23:24:33 2012
@@ -46,7 +46,7 @@ public final class FaultBeanGenerator ex
     }
     
     protected Collection<JavaClass> generateBeanClasses(final ServiceInfo serviceInfo)
{
-        Set<Class> exceptionClasses = new HashSet<Class>();
+        Set<Class<?>> exceptionClasses = new HashSet<Class<?>>();
         String seiPackageName = null;
         for (OperationInfo op : serviceInfo.getInterface().getOperations()) {
             Method method = (Method) op.getProperty("operation.method");
@@ -66,8 +66,8 @@ public final class FaultBeanGenerator ex
         return faultBeanClasses;
     }
 
-    protected Set<Class> getExceptionClasses(final Method method) {
-        Set<Class> exps = new HashSet<Class>();
+    protected Set<Class<?>> getExceptionClasses(final Method method) {
+        Set<Class<?>> exps = new HashSet<Class<?>>();
         final Class<?>[] exceptionClasses = method.getExceptionTypes();
         for (int i = 0; i < exceptionClasses.length; i++) {
             boolean exclude = false;

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
(original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
Fri Jan  6 23:24:33 2012
@@ -96,7 +96,7 @@ public class FaultBeanGeneratorTest exte
     public void testGetExceptionClasses() throws Exception {
         Class<?> seiClass = Class.forName("org.apache.hello_world.Greeter");
         FaultBeanGenerator generator = new FaultBeanGenerator();
-        Set<Class> classes = new HashSet<Class>();
+        Set<Class<?>> classes = new HashSet<Class<?>>();
         for (Method method : seiClass.getMethods()) {
             classes.addAll(generator.getExceptionClasses(method));
         }

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
(original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
Fri Jan  6 23:24:33 2012
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.validator.i
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.wsdl.Binding;
@@ -45,22 +44,19 @@ public class MIMEBindingValidator
     public boolean isValid() {
         Collection<Binding> bindings = CastUtils.cast(def.getBindings().values());
         for (Binding binding: bindings) {
-            Iterator itOperation = binding.getBindingOperations().iterator();
-            while (itOperation.hasNext()) {
-                BindingOperation bindingOperation = (BindingOperation)itOperation.next();
+            Collection<BindingOperation> bindingOps = CastUtils.cast(binding.getBindingOperations());
+            for (BindingOperation bindingOperation : bindingOps) {
                 if (bindingOperation.getBindingInput() == null) {
                     continue;
                 }
-                Iterator itInputExt = bindingOperation.getBindingInput().getExtensibilityElements()
-                    .iterator();
-                while (itInputExt.hasNext()) {
-                    ExtensibilityElement extElement = (ExtensibilityElement)itInputExt.next();
-                    if (extElement instanceof MIMEMultipartRelated) {
-                        Iterator itMimeParts = ((MIMEMultipartRelated)extElement).getMIMEParts()
-                            .iterator();
-                        if (!doValidate(itMimeParts, bindingOperation.getName())) {
-                            return false;
-                        }
+                Collection<ExtensibilityElement> exts = CastUtils.cast(bindingOperation
+                                                                           .getBindingInput()
+                                                                           .getExtensibilityElements());
+                for (ExtensibilityElement extElement : exts) {
+                    if (extElement instanceof MIMEMultipartRelated
+                        && !doValidate((MIMEMultipartRelated)extElement,
+                                       bindingOperation.getName())) {
+                        return false;
                     }
                 }
             }
@@ -68,14 +64,13 @@ public class MIMEBindingValidator
         return true;
     }
 
-    private boolean doValidate(Iterator mimeParts, String operationName) {
-        boolean gotRootPart = false;        
-        while (mimeParts.hasNext()) {
-            MIMEPart mPart = (MIMEPart)mimeParts.next();
+    private boolean doValidate(MIMEMultipartRelated mimeExt, String operationName) {
+        boolean gotRootPart = false;
+        List<MIMEPart> parts = CastUtils.cast(mimeExt.getMIMEParts());
+        for (MIMEPart mPart : parts) {
             List<MIMEContent> mimeContents = new ArrayList<MIMEContent>();
-            Iterator extns = mPart.getExtensibilityElements().iterator();
-            while (extns.hasNext()) {
-                ExtensibilityElement extElement = (ExtensibilityElement)extns.next();
+            List<ExtensibilityElement> extns = CastUtils.cast(mPart.getExtensibilityElements());
+            for (ExtensibilityElement extElement : extns) {
                 if (SOAPBindingUtil.isSOAPBody(extElement)) {
                     if (gotRootPart) {
                         addErrorMessage("Operation("
@@ -89,7 +84,7 @@ public class MIMEBindingValidator
                     mimeContents.add((MIMEContent)extElement);
                 }
             }
-            if (!doValidateMimeContentPartNames(mimeContents.iterator(), operationName))
{
+            if (!doValidateMimeContentPartNames(mimeContents, operationName)) {
                 return false;
             }
         }
@@ -103,11 +98,11 @@ public class MIMEBindingValidator
         return true;
     }
 
-    private boolean doValidateMimeContentPartNames(Iterator mimeContents, String operationName)
{
+    private boolean doValidateMimeContentPartNames(List<MIMEContent> mimeContents,
+                                                   String operationName) {
         // validate mime:content(s) in the mime:part as per R2909
         String partName = null;
-        while (mimeContents.hasNext()) {
-            MIMEContent mimeContent = (MIMEContent)mimeContents.next();
+        for (MIMEContent mimeContent: mimeContents) {
             String mimeContnetPart = mimeContent.getPart();
             if (mimeContnetPart == null) {
                 addErrorMessage("Operation("

Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Fri Jan  6 23:24:33 2012
@@ -162,9 +162,7 @@ public class WSDLToJavaContainer extends
 
             // Build the ServiceModel from the WSDLModel
             if (version == WSDLConstants.WSDLVersion.WSDL11) {
-                @SuppressWarnings("unchecked")
-                AbstractWSDLBuilder<Definition> builder = (AbstractWSDLBuilder<Definition>)frontend
-                    .getWSDLBuilder();
+                AbstractWSDLBuilder builder = frontend.getWSDLBuilder();
                 builder.setContext(context);
                 builder.setBus(getBus());
                 context.put(Bus.class, getBus());

Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractWSDLBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractWSDLBuilder.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractWSDLBuilder.java
(original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractWSDLBuilder.java
Fri Jan  6 23:24:33 2012
@@ -19,12 +19,14 @@
 
 package org.apache.cxf.tools.wsdlto.core;
 
+import javax.wsdl.Definition;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.wsdl.WSDLBuilder;
 
-public abstract class AbstractWSDLBuilder<T> implements WSDLBuilder<T> {
+public abstract class AbstractWSDLBuilder implements WSDLBuilder<Definition> {
     protected ToolContext context;
     protected Bus bus;
 
@@ -38,8 +40,8 @@ public abstract class AbstractWSDLBuilde
 
     public abstract void customize();
 
-    public abstract boolean validate(T t) throws ToolException;
+    public abstract boolean validate(Definition t) throws ToolException;
 
-    public abstract T getWSDLModel();
+    public abstract Definition getWSDLModel();
     
 }

Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java
(original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/FrontEndProfile.java
Fri Jan  6 23:24:33 2012
@@ -30,7 +30,7 @@ public class FrontEndProfile {
     Processor processor;
     Class<? extends ToolContainer> containerClz;
     String toolspec;
-    AbstractWSDLBuilder<? extends Object> builder;
+    AbstractWSDLBuilder builder;
 
     public void setContainerClass(Class<? extends ToolContainer> c) {
         this.containerClz = c;
@@ -64,7 +64,7 @@ public class FrontEndProfile {
         this.processor = prs;
     }
 
-    public void setWSDLBuilder(AbstractWSDLBuilder<? extends Object> b) {
+    public void setWSDLBuilder(AbstractWSDLBuilder b) {
         this.builder = b;
     }
 

Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
(original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
Fri Jan  6 23:24:33 2012
@@ -349,11 +349,10 @@ public final class PluginLoader {
         return "/" + getContainerPackage(frontend).replace(".", "/") + "/" + toolspec;
     }
 
-    @SuppressWarnings("unchecked")
-    private AbstractWSDLBuilder<? extends Object> loadBuilder(String fullClzName) {
-        AbstractWSDLBuilder<? extends Object> builder = null;
+    private AbstractWSDLBuilder loadBuilder(String fullClzName) {
+        AbstractWSDLBuilder builder = null;
         try {
-            builder = (AbstractWSDLBuilder<? extends Object>) ClassLoaderUtils
+            builder = (AbstractWSDLBuilder) ClassLoaderUtils
                 .loadClass(fullClzName, getClass()).newInstance();
 
         } catch (Exception e) {

Modified: cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
Fri Jan  6 23:24:33 2012
@@ -99,7 +99,7 @@ public class JavaScriptContainer extends
 
             // Build the ServiceModel from the WSDLModel
             if (version == WSDLConstants.WSDLVersion.WSDL11) {
-                AbstractWSDLBuilder<Definition> builder = frontend.getWSDLBuilder();
+                AbstractWSDLBuilder builder = frontend.getWSDLBuilder();
                 builder.setContext(context);
                 builder.setBus(getBus());
                 context.put(Bus.class, getBus());

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
Fri Jan  6 23:24:33 2012
@@ -50,7 +50,7 @@ public class JAXWSBindingParser {
         extReg = ext;
     }
 
-    public JAXWSBinding parse(Class parentType, Element element, String namespace) throws
WSDLException {
+    public JAXWSBinding parse(Class<?> parentType, Element element, String namespace)
throws WSDLException {
         JAXWSBinding jaxwsBinding = (JAXWSBinding)extReg.createExtension(parentType,
                                                                          ToolConstants.JAXWS_BINDINGS);
 

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
Fri Jan  6 23:24:33 2012
@@ -58,7 +58,7 @@ import org.apache.cxf.tools.wsdlto.front
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
 
-public class JAXWSDefinitionBuilder extends AbstractWSDLBuilder<Definition> {
+public class JAXWSDefinitionBuilder extends AbstractWSDLBuilder {
 
     protected static final Logger LOG = LogUtils.getL7dLogger(JAXWSDefinitionBuilder.class);
     protected CustomizationParser cusParser;

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
Fri Jan  6 23:24:33 2012
@@ -82,7 +82,7 @@ public class JAXWSProfileTest extends As
         assertNotNull(processor);
         assertTrue(processor instanceof WSDLToJavaProcessor);
 
-        AbstractWSDLBuilder<?> builder = profile.getWSDLBuilder();
+        AbstractWSDLBuilder builder = profile.getWSDLBuilder();
         assertNotNull(builder);
         assertTrue(builder instanceof JAXWSDefinitionBuilder);
 

Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java?rev=1228499&r1=1228498&r2=1228499&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
(original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
Fri Jan  6 23:24:33 2012
@@ -127,7 +127,7 @@ public class AbstractWSDLToProcessor imp
     }
 
     
-    public WSDLExtensibilityPlugin getWSDLPlugin(final String key, final Class clz) {
+    public WSDLExtensibilityPlugin getWSDLPlugin(final String key, final Class<?> clz)
{
         StringBuilder sb = new StringBuilder();
         sb.append(key);
         sb.append("-");



Mime
View raw message