cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [4/7] cxf git commit: fixed typo in log message and invalid javadocs
Date Wed, 24 May 2017 18:19:44 GMT
fixed typo in log message and invalid javadocs

# Conflicts:
#	core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
#	maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
#	rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
#	rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
#	testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d913cdf4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d913cdf4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d913cdf4

Branch: refs/heads/3.1.x-fixes
Commit: d913cdf45b2d54136f05c4870ed643fe0b542026
Parents: dcc7e93
Author: Dennis Kieselhorst <deki@apache.org>
Authored: Sat May 20 10:23:20 2017 +0200
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed May 24 13:45:53 2017 -0400

----------------------------------------------------------------------
 .../cxf/staxutils/StreamWriterContentHandler.java  |  4 ++--
 .../cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java  |  8 ++++----
 .../transport/http/AbstractHTTPDestination.java    |  5 +++--
 .../org/apache/cxf/transport/http/HTTPConduit.java | 17 ++++++-----------
 .../org/apache/cxf/ws/policy/PolicyEngineImpl.java |  2 +-
 .../org/apache/cxf/test/AbstractCXFSpringTest.java |  1 -
 6 files changed, 16 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
index 22266b3..7b07699 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
@@ -174,9 +174,9 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
 
     /**
      * Method getPrefix.
-     * @param namespaceURI 
      *
-     * @param qname
+     * @param ns
+     * @param namespaceURI
      * @return Returns String.
      */
     private String getPrefix(String ns, String namespaceURI) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
index fecc18b..c56628b 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
@@ -157,8 +157,8 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
     /**
      * Merge WsdlOptions that point to the same file by adding the extraargs to the first
option and deleting
      * the second from the options list
-     * 
-     * @param options
+     *
+     * @param effectiveWsdlOptions
      */
     protected void mergeOptions(List<GenericWsdlOption> effectiveWsdlOptions) {
 
@@ -205,8 +205,8 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
 
     /**
      * Determine if code should be generated from the given wsdl
-     * 
-     * @param wsdlOption
+     *
+     * @param genericWsdlOption
      * @param doneFile
      * @param wsdlURI
      * @return

http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index e6ab823..58494cb 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -132,8 +132,9 @@ public abstract class AbstractHTTPDestination
      * Constructor
      * 
      * @param b the associated Bus
-     * @param ci the associated conduit initiator
-     * @param ei the endpoint info of the destination 
+     * @param registry the destination registry
+     * @param ei the endpoint info of the destination
+     * @param path the path
      * @param dp true for adding the default port if it is missing
      * @throws IOException
      */    

http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index f3e28f5..4fbaa7c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -291,7 +291,7 @@ public abstract class HTTPConduit
      * Constructor
      * 
      * @param b the associated Bus.
-     * @param endpoint the endpoint info of the initiator.
+     * @param ei the endpoint info of the initiator.
      * @param t the endpoint reference of the target.
      * @throws IOException
      */
@@ -526,7 +526,7 @@ public abstract class HTTPConduit
             needToCacheRequest = true;
             isChunking = false;
             LOG.log(Level.FINE,
-                    "Auth Supplier, but no Premeptive User Pass or Digest auth (nonce may
be stale)"
+                    "Auth Supplier, but no Preemptive User Pass or Digest auth (nonce may
be stale)"
                     + " We must cache request.");
         }
         if (csPolicy.isAutoRedirect()) {
@@ -786,7 +786,7 @@ public abstract class HTTPConduit
      * type?
      * 
      * @param message
-     * @param headers
+     * @param currentURI
      */
     protected void setHeadersByAuthorizationPolicy(
             Message message,
@@ -1498,12 +1498,8 @@ public abstract class HTTPConduit
         
         /**
          * This method performs a retransmit for authorization information.
-         * 
-         * @param connection The currently active connection.
-         * @param message The outbound message.
-         * @param cachedStream The cached request.
-         * @return A new connection if retransmitted. If not retransmitted
-         *         then this method returns the same connection.
+         *
+         * @return true if there was a retransmit
          * @throws IOException
          */
         protected boolean authorizationRetransmit() throws IOException {
@@ -1754,8 +1750,7 @@ public abstract class HTTPConduit
          * 
          * If trust cannot be established the Trust Decider implemenation
          * throws an IOException.
-         * 
-         * @param message      The message being sent.
+         *
          * @throws IOException This exception is thrown if trust cannot be
          *                     established by the configured MessageTrustDecider.
          * @see MessageTrustDecider

http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 6155a38..58e19b8 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -619,7 +619,7 @@ public class PolicyEngineImpl implements PolicyEngine, BusExtension {
      * that implements the Assertor interface).
      * 
      * @param alternative the policy alternative
-     * @param Assertor the assertor
+     * @param assertor the assertor
      * @return true iff the alternative can be supported
      */
     public boolean supportsAlternative(Collection<? extends PolicyComponent> alternative,


http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
index 0b6f27a..36e1351 100644
--- a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
+++ b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
@@ -42,7 +42,6 @@ public abstract class AbstractCXFSpringTest extends AbstractCXFTest {
     private Class<?> configContextClass = AbstractCXFSpringTest.class;
     /**
      * Load up all the beans from the XML files returned by the getConfigLocations method.
-     * @throws Exception 
      */
     protected AbstractCXFSpringTest() {
     }


Mime
View raw message