cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1393523 - in /cxf/branches/2.6.x-fixes: api/src/main/java/org/apache/cxf/common/commands/ api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/service/model/ api/src/main/java/org/apache/cxf/staxutils/transform/ api/src...
Date Wed, 03 Oct 2012 14:55:47 GMT
Author: coheigea
Date: Wed Oct  3 14:55:45 2012
New Revision: 1393523

URL: http://svn.apache.org/viewvc?rev=1393523&view=rev
Log:
Revert "Fixed a bunch of (mostly minor) issues identified by analysis.apache.org"

This reverts commit 08bce28233a03e556b6149f75919ac76ff601969.

Modified:
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/commands/ForkedCommand.java
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/phase/Phase.java
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
    cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
    cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
    cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
    cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
    cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
    cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
    cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
    cxf/branches/2.6.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
    cxf/branches/2.6.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
    cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
    cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
    cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpMessageDecoder.java
    cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java
    cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java
    cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
    cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
    cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java
    cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java
    cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
    cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
    cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java
    cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java
    cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java
    cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java
    cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
    cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java
    cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/commands/ForkedCommand.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/commands/ForkedCommand.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/commands/ForkedCommand.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/commands/ForkedCommand.java Wed Oct  3 14:55:45 2012
@@ -159,7 +159,7 @@ public class ForkedCommand extends Threa
                 if (LOG.isLoggable(Level.FINE)) {
                     LOG.fine("Waiting " + timeout + " seconds for process to complete");
                 }
-                join((long)timeout * 1000L);
+                join(timeout * 1000);
             } else {
                 if (LOG.isLoggable(Level.FINE)) {
                     LOG.fine("Waiting for process to complete");

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/phase/Phase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/phase/Phase.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/phase/Phase.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/phase/Phase.java Wed Oct  3 14:55:45 2012
@@ -92,9 +92,6 @@ public class Phase implements Comparable
         return priority;
     }
     public boolean equals(Object o) {
-        if (!(o instanceof Phase)) {
-            return false;
-        }
         Phase p = (Phase)o;
         
         return p.priority == priority

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java Wed Oct  3 14:55:45 2012
@@ -75,7 +75,7 @@ public abstract class AbstractMessageCon
      */
     public MessagePartInfo addMessagePart(QName name) {
         if (name == null) {
-            throw new IllegalArgumentException("Invalid name [null]");
+            throw new IllegalArgumentException("Invalid name [" + name + "]");
         }
 
         MessagePartInfo part = new MessagePartInfo(name, this);
@@ -193,7 +193,7 @@ public abstract class AbstractMessageCon
     
     public MessagePartInfo addOutOfBandMessagePart(QName name) {
         if (name == null) {
-            throw new IllegalArgumentException("Invalid name [null]");
+            throw new IllegalArgumentException("Invalid name [" + name + "]");
         }
 
         MessagePartInfo part = new MessagePartInfo(name, this);

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java Wed Oct  3 14:55:45 2012
@@ -441,7 +441,7 @@ public class InTransformReader extends D
     }
 
     public char[] getTextCharacters() {
-        if (currentEvent != null && currentEvent.getValue() != null) {
+        if (currentEvent != null && currentEvent != null) {
             return currentEvent.getValue().toCharArray();
         }
         char[] superChars = super.getTextCharacters();
@@ -454,7 +454,7 @@ public class InTransformReader extends D
 
     public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) 
         throws XMLStreamException {
-        if (currentEvent != null && currentEvent.getValue() != null) {
+        if (currentEvent != null && currentEvent != null) {
             int len = currentEvent.getValue().length() - sourceStart;
             if (len > length) {
                 len = length;

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/wsdl/PrettyPrintXMLStreamWriter.java Wed Oct  3 14:55:45 2012
@@ -257,17 +257,17 @@ public class PrettyPrintXMLStreamWriter 
     }
 
     static {
-        WSDL_INDENT_MAP.put(Definition.class, Integer.valueOf(DEFAULT_INDENT_LEVEL));
-        WSDL_INDENT_MAP.put(Binding.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 2));
-        WSDL_INDENT_MAP.put(BindingFault.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 3));
-        WSDL_INDENT_MAP.put(BindingInput.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 3));
-        WSDL_INDENT_MAP.put(BindingOutput.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 3));
-        WSDL_INDENT_MAP.put(BindingOperation.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 3));
-        WSDL_INDENT_MAP.put(Message.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 2));
-        WSDL_INDENT_MAP.put(Operation.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 3));
-        WSDL_INDENT_MAP.put(Port.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 3));
-        WSDL_INDENT_MAP.put(Service.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 2));
-        WSDL_INDENT_MAP.put(Types.class, Integer.valueOf(DEFAULT_INDENT_LEVEL * 2));
+        WSDL_INDENT_MAP.put(Definition.class, new Integer(DEFAULT_INDENT_LEVEL));
+        WSDL_INDENT_MAP.put(Binding.class, new Integer(DEFAULT_INDENT_LEVEL * 2));
+        WSDL_INDENT_MAP.put(BindingFault.class, new Integer(DEFAULT_INDENT_LEVEL * 3));
+        WSDL_INDENT_MAP.put(BindingInput.class, new Integer(DEFAULT_INDENT_LEVEL * 3));
+        WSDL_INDENT_MAP.put(BindingOutput.class, new Integer(DEFAULT_INDENT_LEVEL * 3));
+        WSDL_INDENT_MAP.put(BindingOperation.class, new Integer(DEFAULT_INDENT_LEVEL * 3));
+        WSDL_INDENT_MAP.put(Message.class, new Integer(DEFAULT_INDENT_LEVEL * 2));
+        WSDL_INDENT_MAP.put(Operation.class, new Integer(DEFAULT_INDENT_LEVEL * 3));
+        WSDL_INDENT_MAP.put(Port.class, new Integer(DEFAULT_INDENT_LEVEL * 3));
+        WSDL_INDENT_MAP.put(Service.class, new Integer(DEFAULT_INDENT_LEVEL * 2));
+        WSDL_INDENT_MAP.put(Types.class, new Integer(DEFAULT_INDENT_LEVEL * 2));
     }
 
     class CurrentElement {

Modified: cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java (original)
+++ cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java Wed Oct  3 14:55:45 2012
@@ -121,7 +121,7 @@ public class CXFConnectionParam {
 
     private boolean areEquals(Object obj1, Object obj2) {
         if (obj1 == null) {
-            return null == obj2; 
+            return obj1 == obj2; 
         } else {
             return obj1.equals(obj2);
         }            

Modified: cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java (original)
+++ cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java Wed Oct  3 14:55:45 2012
@@ -73,7 +73,7 @@ public abstract class AbstractManagedCon
         throws ResourceException {
         
         LOG.log(Level.FINE, "MATCHING_CONNECTIONS",
-            new Object[] {Integer.valueOf(aMCSet.size()), crInfo, subject});
+            new Object[] {new Integer(aMCSet.size()), crInfo, subject});
 
         for (Iterator iterator = aMCSet.iterator(); iterator.hasNext();) {
             AbstractManagedConnectionImpl conn = (AbstractManagedConnectionImpl)iterator.next();

Modified: cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java (original)
+++ cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java Wed Oct  3 14:55:45 2012
@@ -258,7 +258,7 @@ public class JCABusFactory {
                         LOG.info("ejbServicePropertiesFile modified, initializing/updating servants");
                         initializeServantsFromProperties(loadProperties(propsFile.toURI().toURL()));
                     }
-                    Thread.sleep((long)pollIntervalSeconds * 1000L);
+                    Thread.sleep(pollIntervalSeconds * 1000);
                 } catch (Exception e) {
                     LOG.info("MonitorThread: failed to initialiseServantsFromProperties "
                               + "with properties absolute path=" + propsFile.getAbsolutePath());

Modified: cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java (original)
+++ cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java Wed Oct  3 14:55:45 2012
@@ -114,11 +114,7 @@ public class CXFConnectionSpec implement
     
     // Required by JCA Spec 
     public boolean equals(Object other) {
-        if (other != null && !this.getClass().isAssignableFrom(other.getClass())) {
-            return false;
-        }
-
-        if (!(other instanceof CXFConnectionSpec)) {
+        if (!this.getClass().isAssignableFrom(other.getClass())) {
             return false;
         }
         

Modified: cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java (original)
+++ cxf/branches/2.6.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java Wed Oct  3 14:55:45 2012
@@ -111,11 +111,7 @@ public class ManagedConnectionFactoryImp
     
     // equals method is required by JCA 1.5 because on properties
     public boolean equals(Object o) {
-        if (o != null && !this.getClass().isAssignableFrom(o.getClass())) {
-            return false;
-        }
-
-        if (!(o instanceof ManagedConnectionFactoryImpl)) {
+        if (!this.getClass().isAssignableFrom(o.getClass())) {
             return false;
         }
         

Modified: cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java (original)
+++ cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java Wed Oct  3 14:55:45 2012
@@ -400,7 +400,7 @@ public abstract class AbstractCodegenMoh
         for (Artifact a : pluginArtifacts) {
             File file = a.getFile();
             if (file == null) {
-                throw new MojoExecutionException("Unable to find file for artifact " + a.getGroupId()
+                throw new MojoExecutionException("Unable to find " + file + " for artifact " + a.getGroupId()
                                                  + ":" + a.getArtifactId() + ":" + a.getVersion());
             }
             artifactsPath.add(file.toURI());

Modified: cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java (original)
+++ cxf/branches/2.6.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java Wed Oct  3 14:55:45 2012
@@ -111,7 +111,7 @@ public class WSDL2JavaScriptMojo extends
             for (Artifact a : pluginArtifacts) {
                 File file = a.getFile();
                 if (file == null) {
-                    throw new MojoExecutionException("Unable to find file for artifact "
+                    throw new MojoExecutionException("Unable to find " + file + " for artifact "
                                                      + a.getGroupId() + ":" + a.getArtifactId() + ":"
                                                      + a.getVersion());
                 }

Modified: cxf/branches/2.6.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java (original)
+++ cxf/branches/2.6.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java Wed Oct  3 14:55:45 2012
@@ -212,7 +212,7 @@ public class Java2WSMojo extends Abstrac
                 for (Artifact a : pluginArtifacts) {
                     File file = a.getFile();
                     if (file == null) {
-                        throw new MojoExecutionException("Unable to find file for artifact "
+                        throw new MojoExecutionException("Unable to find " + file + " for artifact "
                                                          + a.getGroupId() + ":" + a.getArtifactId()
                                                          + ":" + a.getVersion());
                     }
@@ -443,4 +443,4 @@ public class Java2WSMojo extends Abstrac
 
         return javaExe;
     }
-}
+}
\ No newline at end of file

Modified: cxf/branches/2.6.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java (original)
+++ cxf/branches/2.6.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java Wed Oct  3 14:55:45 2012
@@ -362,7 +362,7 @@ public abstract class AbstractCodeGenera
         for (Artifact a : pluginArtifacts) {
             File file = a.getFile();
             if (file == null) {
-                throw new MojoExecutionException("Unable to find file for artifact "
+                throw new MojoExecutionException("Unable to find " + file + " for artifact "
                                                  + a.getGroupId() + ":" + a.getArtifactId()
                                                  + ":" + a.getVersion());
             }
@@ -435,7 +435,7 @@ public abstract class AbstractCodeGenera
             for (Artifact a : pluginArtifacts) {
                 File file = a.getFile();
                 if (file == null) {
-                    throw new MojoExecutionException("Unable to find file for artifact "
+                    throw new MojoExecutionException("Unable to find " + file + " for artifact "
                                                      + a.getGroupId() + ":" + a.getArtifactId()
                                                      + ":" + a.getVersion());
                 }

Modified: cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java Wed Oct  3 14:55:45 2012
@@ -159,7 +159,7 @@ public class CorbaObjectReader {
 
     public Character readChar() throws CorbaBindingException {
         try {
-            return Character.valueOf(stream.read_char());
+            return new Character(stream.read_char());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read character");
             throw new CorbaBindingException("CorbaObjectReader: readChar MARSHAL exception", ex);
@@ -168,7 +168,7 @@ public class CorbaObjectReader {
 
     public Character readWChar() throws CorbaBindingException {
         try {
-            return Character.valueOf(stream.read_wchar());
+            return new Character(stream.read_wchar());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read wide character");
             throw new CorbaBindingException("CorbaObjectReader: readWChar MARSHAL exception", ex);
@@ -177,7 +177,7 @@ public class CorbaObjectReader {
 
     public Byte readOctet() throws CorbaBindingException {
         try {
-            return Byte.valueOf(stream.read_octet());
+            return new Byte(stream.read_octet());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read octet");
             throw new CorbaBindingException("CorbaObjectReader: readOctet MARSHAL exception", ex);
@@ -186,7 +186,7 @@ public class CorbaObjectReader {
 
     public Short readShort() throws CorbaBindingException {
         try {
-            return Short.valueOf(stream.read_short());
+            return new Short(stream.read_short());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read short");
             throw new CorbaBindingException("CorbaObjectReader: readShort MARSHAL exception", ex);
@@ -207,7 +207,7 @@ public class CorbaObjectReader {
     }
 
     public Integer readLong() throws CorbaBindingException {
-        Integer result = Integer.valueOf(stream.read_long());
+        Integer result = new Integer(stream.read_long());
         try {
             return result;
         } catch (org.omg.CORBA.MARSHAL ex) {
@@ -229,7 +229,7 @@ public class CorbaObjectReader {
 
     public Long readLongLong() throws CorbaBindingException {
         try {
-            return Long.valueOf(stream.read_longlong());
+            return new Long(stream.read_longlong());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read long long");
             throw new CorbaBindingException("CorbaObjectReader: readLongLong MARSHAL exception", ex);
@@ -258,7 +258,7 @@ public class CorbaObjectReader {
 
     public Float readFloat() throws CorbaBindingException {
         try {
-            return Float.valueOf(stream.read_float());
+            return new Float(stream.read_float());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read float");
             throw new CorbaBindingException("CorbaObjectReader: readFloat MARSHAL exception", ex);
@@ -267,7 +267,7 @@ public class CorbaObjectReader {
 
     public Double readDouble() throws CorbaBindingException {
         try {
-            return Double.valueOf(stream.read_double());
+            return new Double(stream.read_double());
         } catch (org.omg.CORBA.MARSHAL ex) {
             LOG.log(Level.SEVERE, "CorbaObjectReader: could not read double");
             throw new CorbaBindingException("CorbaObjectReader: readDouble MARSHAL exception", ex);

Modified: cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java Wed Oct  3 14:55:45 2012
@@ -196,13 +196,13 @@ public class CorbaPrimitiveHandler exten
             // for values < 0 + 256 
             // This means that we can directly write out the chars in the normal
             // range 0-127 even when using UTF-8
-            obj = Character.valueOf((char)(byteValue.byteValue() < 0 
+            obj = new Character((char)(byteValue.byteValue() < 0 
                                          ? byteValue.byteValue() + UNSIGNED_MAX
                                          : byteValue.byteValue()));
             break;
         case TCKind._tk_wchar:
             // A wide char is mapped to a string, we need it as a character
-            obj = Character.valueOf(data.charAt(0));
+            obj = new Character(data.charAt(0));
             break;
         case TCKind._tk_octet:
             obj = new Short(data).byteValue();

Modified: cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpMessageDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpMessageDecoder.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpMessageDecoder.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpMessageDecoder.java Wed Oct  3 14:55:45 2012
@@ -44,7 +44,7 @@ public class SoapTcpMessageDecoder exten
         if (tempBuffer == null) {
             tempBuffer = new byte[SoapTcpOutputStream.CHUNK_SIZE];
             bufferDataLength = buffer.limit();
-            for (bufferPosition = Integer.valueOf(0); bufferPosition < bufferDataLength; bufferPosition++) {
+            for (bufferPosition = new Integer(0); bufferPosition < bufferDataLength; bufferPosition++) {
                 tempBuffer[bufferPosition] = buffer.get();
             }
             session.setAttribute("tempBuffer", tempBuffer);

Modified: cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/SoapTcpOutputStream.java Wed Oct  3 14:55:45 2012
@@ -257,7 +257,6 @@ public class SoapTcpOutputStream extends
                     try {
                         SoapTcpFrame frame = SoapTcpUtils.readMessageFrame(inStream);
                         baos.write(frame.getPayload());
-                        frameType = frame.getHeader().getFrameType();
                     } catch (IOException e) {
                         break;
                     }

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Wed Oct  3 14:55:45 2012
@@ -277,32 +277,32 @@ public class ArrayType extends AegisType
             } else if (Integer.TYPE.equals(arrayType)) {
                 int[] objects = (int[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Integer.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Integer(objects[i]), writer, context, type, name, ns);
                 }
             } else if (Long.TYPE.equals(arrayType)) {
                 long[] objects = (long[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Long.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Long(objects[i]), writer, context, type, name, ns);
                 }
             } else if (Short.TYPE.equals(arrayType)) {
                 short[] objects = (short[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Short.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Short(objects[i]), writer, context, type, name, ns);
                 }
             } else if (Double.TYPE.equals(arrayType)) {
                 double[] objects = (double[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Double.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Double(objects[i]), writer, context, type, name, ns);
                 }
             } else if (Float.TYPE.equals(arrayType)) {
                 float[] objects = (float[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Float.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Float(objects[i]), writer, context, type, name, ns);
                 }
             } else if (Byte.TYPE.equals(arrayType)) {
                 byte[] objects = (byte[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Byte.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Byte(objects[i]), writer, context, type, name, ns);
                 }
             } else if (Boolean.TYPE.equals(arrayType)) {
                 boolean[] objects = (boolean[])values;
@@ -312,7 +312,7 @@ public class ArrayType extends AegisType
             } else if (Character.TYPE.equals(arrayType)) {
                 char[] objects = (char[])values;
                 for (i = 0, n = objects.length; i < n; i++) {
-                    writeValue(Character.valueOf(objects[i]), writer, context, type, name, ns);
+                    writeValue(new Character(objects[i]), writer, context, type, name, ns);
                 }
             }
         } finally {

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java Wed Oct  3 14:55:45 2012
@@ -31,13 +31,13 @@ import org.apache.cxf.aegis.xml.MessageW
 public class ByteType extends AegisType {
     @Override
     public Object readObject(MessageReader reader, Context context) {
-        return Byte.valueOf(reader.getValue().trim());
+        return new Byte(reader.getValue().trim());
     }
 
     @Override
     public void writeObject(Object object, MessageWriter writer, Context context) {
         int intValue = ((Number)object).intValue();
         byte byteValue = (byte)(intValue & 0xff);
-        writer.writeValueAsByte(Byte.valueOf(byteValue));
+        writer.writeValueAsByte(new Byte(byteValue));
     }
 }

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java Wed Oct  3 14:55:45 2012
@@ -45,7 +45,7 @@ public class CharacterAsStringType exten
     @Override
     public Object readObject(MessageReader reader, Context context) throws DatabindingException {
         Integer readInteger = (Integer)intType.readObject(reader, context);
-        return Character.valueOf((char)readInteger.intValue());
+        return new Character((char)readInteger.intValue());
     }
 
     /** {@inheritDoc}*/

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java Wed Oct  3 14:55:45 2012
@@ -29,7 +29,7 @@ import org.apache.cxf.aegis.xml.MessageW
 public class CharacterType extends AegisType {
     @Override
     public Object readObject(MessageReader reader, Context context) {
-        return Character.valueOf(reader.getValueAsCharacter());
+        return new Character(reader.getValueAsCharacter());
     }
 
     @Override

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java Wed Oct  3 14:55:45 2012
@@ -31,7 +31,7 @@ import org.apache.cxf.aegis.xml.MessageW
 public class IntType extends AegisType {
     @Override
     public Object readObject(MessageReader reader, Context context) {
-        return Integer.valueOf(reader.getValueAsInt());
+        return new Integer(reader.getValueAsInt());
     }
 
     @Override
@@ -39,7 +39,7 @@ public class IntType extends AegisType {
         if (object instanceof Integer) {
             writer.writeValueAsInt((Integer)object);
         } else {
-            writer.writeValueAsInt(Integer.valueOf(((Number)object).intValue()));
+            writer.writeValueAsInt(new Integer(((Number)object).intValue()));
         }
     }
 }

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java Wed Oct  3 14:55:45 2012
@@ -107,19 +107,19 @@ class InterfaceInvocationHandler impleme
         Object prop = readProperty(attrName);
         if (prop == null && method.getReturnType().isPrimitive()) {
             if (method.getReturnType() == int.class) {
-                prop = Integer.valueOf(0);
+                prop = new Integer(0);
             } else if (method.getReturnType() == boolean.class) {
                 prop = Boolean.FALSE;
             } else if (method.getReturnType() == long.class) {
-                prop = Long.valueOf(0);
+                prop = new Long(0);
             } else if (method.getReturnType() == double.class) {
-                prop = Double.valueOf(0);
+                prop = new Double(0);
             } else if (method.getReturnType() == short.class) {
-                prop = Short.valueOf((short)0);
+                prop = new Short((short)0);
             } else if (method.getReturnType() == byte.class) {
-                prop = Byte.valueOf((byte)0);
+                prop = new Byte((byte)0);
             } else if (method.getReturnType() == char.class) {
-                prop = Character.valueOf((char)0);
+                prop = new Character((char)0);
             }
         }
         return prop;
@@ -155,7 +155,7 @@ class InterfaceInvocationHandler impleme
     }
 
     protected Integer proxyHashCode(Object proxy) {
-        return Integer.valueOf(System.identityHashCode(proxy));
+        return new Integer(System.identityHashCode(proxy));
     }
 
     protected Boolean proxyEquals(Object proxy, Object other) {

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java Wed Oct  3 14:55:45 2012
@@ -29,7 +29,7 @@ import org.apache.cxf.aegis.xml.MessageW
 public class LongType extends AegisType {
     @Override
     public Object readObject(MessageReader reader, Context context) {
-        return Long.valueOf(reader.getValueAsLong());
+        return new Long(reader.getValueAsLong());
     }
 
     @Override
@@ -37,7 +37,7 @@ public class LongType extends AegisType 
         if (object instanceof Long) {
             writer.writeValueAsLong((Long)object);
         } else {
-            writer.writeValueAsLong(Long.valueOf(((Number)object).longValue()));
+            writer.writeValueAsLong(new Long(((Number)object).longValue()));
         }
     }
 }

Modified: cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java Wed Oct  3 14:55:45 2012
@@ -29,7 +29,7 @@ import org.apache.cxf.aegis.xml.MessageW
 public class ShortType extends AegisType {
     @Override
     public Object readObject(MessageReader reader, Context context) {
-        return Short.valueOf(reader.getValue().trim());
+        return new Short(reader.getValue().trim());
     }
 
     @Override
@@ -37,7 +37,7 @@ public class ShortType extends AegisType
         if (object instanceof Short) {
             writer.writeValueAsShort((Short)object);
         } else {
-            writer.writeValueAsShort(Short.valueOf(((Number)object).shortValue()));
+            writer.writeValueAsShort(new Short(((Number)object).shortValue()));
         }
     }
 }

Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Wed Oct  3 14:55:45 2012
@@ -252,7 +252,7 @@ public class JAXBDataBinding extends Abs
     @SuppressWarnings("unchecked")
     public <T> DataWriter<T> createWriter(Class<T> c) {
 
-        Integer mtomThresholdInt = Integer.valueOf(getMtomThreshold());
+        Integer mtomThresholdInt = new Integer(getMtomThreshold());
         if (c == XMLStreamWriter.class) {
             DataWriterImpl<XMLStreamWriter> r
                 = new DataWriterImpl<XMLStreamWriter>(this);

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Wed Oct  3 14:55:45 2012
@@ -164,6 +164,7 @@ public class ServiceImpl extends Service
             for (Port port : wsdlports.values()) {
                 QName name = new QName(serviceName.getNamespaceURI(), port.getName());
                 
+                String tpId = null;
                 String address = null;
                 String bindingID = null;
                 List<? extends ExtensibilityElement> extensions 
@@ -181,6 +182,9 @@ public class ServiceImpl extends Service
                 extensions = CastUtils.cast(port.getExtensibilityElements());
                 if (!extensions.isEmpty()) {
                     ExtensibilityElement e = extensions.get(0);
+                    if (tpId == null) {
+                        tpId = e.getElementType().getNamespaceURI();
+                    }
                     if (e instanceof SoapAddress) {
                         address = ((SoapAddress)e).getLocationURI();
                     } else if (e instanceof AddressType) {

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java Wed Oct  3 14:55:45 2012
@@ -65,8 +65,11 @@ public class HandlerResolverImpl impleme
     }
 
     private List<Handler> createHandlerChain(PortInfo portInfo) {
-        List<Handler> chain = new ArrayList<Handler>();
+        List<Handler> chain = null;
 
+        if (null == chain) {
+            chain = new ArrayList<Handler>();
+        }
         if (annotationClass != null) {
             chain.addAll(getHandlersFromAnnotation(annotationClass, portInfo));         
         }

Modified: cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java (original)
+++ cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java Wed Oct  3 14:55:45 2012
@@ -71,7 +71,7 @@ final class AtomPushEngine {
         Validate.notNull(record, "record is null");
         if (isValid()) {
             if (batchSize > 1 && batchTime > 0 && timer == null) {
-                createTimerTask((long)batchTime * 60L * 1000L);
+                createTimerTask(batchTime * 60 * 1000);
             }
             queue.add(record);
             if (queue.size() >= batchSize) {

Modified: cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java (original)
+++ cxf/branches/2.6.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java Wed Oct  3 14:55:45 2012
@@ -81,7 +81,7 @@ public final class RetryingDeliverer imp
             cal = Calendar.getInstance();
             cal.add(Calendar.SECOND, sleep);
             if (timeout == 0 || timeoutDate.after(cal.getTime())) {
-                Thread.sleep((long)sleep * 1000L);
+                Thread.sleep(sleep * 1000);
             } else {
                 pauser.reset();
                 return false;

Modified: cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Wed Oct  3 14:55:45 2012
@@ -173,12 +173,12 @@ public final class JMSUtils {
                 inMessage.put(messageType, messageProperties);
             }
             messageProperties.setJMSCorrelationID(message.getJMSCorrelationID());
-            messageProperties.setJMSDeliveryMode(Integer.valueOf(message.getJMSDeliveryMode()));
-            messageProperties.setJMSExpiration(Long.valueOf(message.getJMSExpiration()));
+            messageProperties.setJMSDeliveryMode(new Integer(message.getJMSDeliveryMode()));
+            messageProperties.setJMSExpiration(new Long(message.getJMSExpiration()));
             messageProperties.setJMSMessageID(message.getJMSMessageID());
-            messageProperties.setJMSPriority(Integer.valueOf(message.getJMSPriority()));
+            messageProperties.setJMSPriority(new Integer(message.getJMSPriority()));
             messageProperties.setJMSRedelivered(Boolean.valueOf(message.getJMSRedelivered()));
-            messageProperties.setJMSTimeStamp(Long.valueOf(message.getJMSTimestamp()));
+            messageProperties.setJMSTimeStamp(new Long(message.getJMSTimestamp()));
             messageProperties.setJMSType(message.getJMSType());
 
             if (message.getJMSReplyTo() != null) {

Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Wed Oct  3 14:55:45 2012
@@ -269,7 +269,7 @@ public class RMManager {
             rma.setBaseRetransmissionInterval(bri);
         }
         if (null == bri.getMilliseconds()) {
-            bri.setMilliseconds(Long.valueOf(RetransmissionQueue.DEFAULT_BASE_RETRANSMISSION_INTERVAL));
+            bri.setMilliseconds(new Long(RetransmissionQueue.DEFAULT_BASE_RETRANSMISSION_INTERVAL));
         }
 
         rmAssertion = rma;
@@ -465,7 +465,7 @@ public class RMManager {
         if (reliableEndpoints.size() > 0) {
             LOG.log(Level.FINE,
                     "Shutting down RMManager with {0} remaining endpoints.",
-                    new Object[] {Integer.valueOf(reliableEndpoints.size())});
+                    new Object[] {new Integer(reliableEndpoints.size())});
             for (RMEndpoint rme : reliableEndpoints.values()) {            
                 rme.shutdown();
             }
@@ -699,4 +699,4 @@ public class RMManager {
             return sid;
         }
     }
-}
+}
\ No newline at end of file

Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SequenceMonitor.java Wed Oct  3 14:55:45 2012
@@ -38,7 +38,7 @@ public class SequenceMonitor {
         if (0 == firstCheck) {
             firstCheck = now + monitorInterval;
         }
-        receiveTimes.add(Long.valueOf(now));
+        receiveTimes.add(new Long(now));
     }
 
     public int getMPM() {

Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Wed Oct  3 14:55:45 2012
@@ -431,10 +431,6 @@ public class IssuedTokenInterceptorProvi
                     mapSecurityProps(message, ctx);
                 
                     client.setMessage(message);
-
-                    if (maps != null) {
-                        client.setAddressingNamespace(maps.getNamespaceURI());
-                    }
                     
                     client.setTrust(getTrust10(aim));
                     client.setTrust(getTrust13(aim));

Modified: cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java (original)
+++ cxf/branches/2.6.x-fixes/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java Wed Oct  3 14:55:45 2012
@@ -32,7 +32,7 @@ public class OrderedParamHolderImpl impl
 
     public void orderedParamHolder(Holder<ComplexStruct> part3, Holder<Integer> part2, Holder<String> part1) {
         // TODO Auto-generated method stub
-        part2.value = Integer.valueOf(part2.value.intValue() + 1);
+        part2.value = new Integer(part2.value.intValue() + 1);
         part1.value = "return " + part1.value;
         part3.value.elem1 = "return " + part3.value.elem1;
         part3.value.elem2 = "return " + part3.value.elem2;

Modified: cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java (original)
+++ cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolErrorListener.java Wed Oct  3 14:55:45 2012
@@ -49,14 +49,14 @@ public class ToolErrorListener {
     List<ErrorInfo> errors = new LinkedList<ErrorInfo>();
     
     public void addError(String file, int line, int column, String message) {
-        addError(file, line, column, null, null);
+        addError(file, line, column, null);
     }
     public void addError(String file, int line, int column, String message, Throwable t) {
         errors.add(new ErrorInfo(file, line, column, message, t));
     }
 
     public void addWarning(String file, int line, int column, String message) {
-        addWarning(file, line, column, null, null);
+        addWarning(file, line, column, null);
     }
     public void addWarning(String file, int line, int column, String message, Throwable t) {
         if (file != null) {

Modified: cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java (original)
+++ cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlArrayBase.java Wed Oct  3 14:55:45 2012
@@ -45,7 +45,7 @@ public class IdlArrayBase extends IdlDef
             elemType = elem;
         }
         
-        dims.add(0, Integer.valueOf(size));            
+        dims.add(0, new Integer(size));            
     }
 
     public void write(PrintWriter pw) {

Modified: cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java (original)
+++ cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/PrimitiveTypesVisitor.java Wed Oct  3 14:55:45 2012
@@ -41,17 +41,17 @@ public class PrimitiveTypesVisitor imple
     private static final List<Integer> PRIMITIVE_TYPES = new ArrayList<Integer>();
 
     static {
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_float));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_double));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_long));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_short));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_unsigned));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_char));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_wchar));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_boolean));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_any));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_octet));
-        PRIMITIVE_TYPES.add(Integer.valueOf(IDLTokenTypes.LITERAL_any));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_float));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_double));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_long));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_short));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_unsigned));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_char));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_wchar));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_boolean));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_any));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_octet));
+        PRIMITIVE_TYPES.add(new Integer(IDLTokenTypes.LITERAL_any));
     }
 
     private XmlSchemaType schemaType;

Modified: cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java (original)
+++ cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/TypesVisitor.java Wed Oct  3 14:55:45 2012
@@ -60,7 +60,7 @@ public class TypesVisitor extends Visito
         } else if (SimpleTypeSpecVisitor.accept(node)) {
             // type_spec - simple_type_spec
             visitor = new SimpleTypeSpecVisitor(getScope(), definition, schema, wsdlVisitor, identifierNode);
-        } else {
+        } else if (visitor == null) {
             // REVISIT: !!!!!
             // This is ugly. It should be done in the SimpleTypeSpecVisitor.accept(node) method.
             // More precisely, that accept method should contained an ORed 

Modified: cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java?rev=1393523&r1=1393522&r2=1393523&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java (original)
+++ cxf/branches/2.6.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java Wed Oct  3 14:55:45 2012
@@ -437,7 +437,9 @@ public final class WSDLParameter {
                 if (corbaTypeImpl == null) {
                     XmlSchemaObject schemaObj = getSchemaObject(wsdlToCorbaBinding, typeName);
                     XmlSchemaAnnotation annotation = null;
-                    if (schemaObj instanceof XmlSchemaElement) {
+                    if (schemaObj instanceof XmlSchemaType) {
+                        schemaType = (XmlSchemaType)schemaObj;
+                    } else if (schemaObj instanceof XmlSchemaElement) {
                         XmlSchemaElement el = (XmlSchemaElement)schemaObj;
                         schemaType = el.getSchemaType();
                         annotation = ((XmlSchemaElement)schemaObj).getAnnotation();



Mime
View raw message