You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/04/21 12:03:53 UTC

[1/2] cxf git commit: Updating XMLSec

Repository: cxf
Updated Branches:
  refs/heads/master 05a7ad32b -> 44ddee3a9


Updating XMLSec


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

Branch: refs/heads/master
Commit: edad336c781c59cc6feab1d641439c7ddf840678
Parents: 05a7ad3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Apr 21 10:49:30 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Apr 21 10:49:30 2015 +0100

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/edad336c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 71d4984..d31f6f6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,7 +176,7 @@
         <cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
         <cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
         <cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
-        <cxf.xmlsec.bundle.version>2.0.3</cxf.xmlsec.bundle.version>
+        <cxf.xmlsec.bundle.version>2.0.4</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
         <cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
         <cxf.xerces.bundle.version>2.11.0_1</cxf.xerces.bundle.version>


[2/2] cxf git commit: Fixing a few Javadoc warnings

Posted by co...@apache.org.
Fixing a few Javadoc warnings


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

Branch: refs/heads/master
Commit: 44ddee3a98918261f18699b895295b53785bb9a7
Parents: edad336
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Apr 21 11:03:41 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Apr 21 11:03:41 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/attachment/AttachmentDeserializer.java     | 1 -
 core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java        | 1 -
 .../java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java | 1 -
 .../cxf/interceptor/security/callback/CallbackHandlerTlsCert.java  | 1 -
 .../cxf/interceptor/security/callback/CertKeyToUserNameMapper.java | 2 +-
 core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java         | 2 --
 6 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/44ddee3a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index c4f99cf..5bf78d1 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -260,7 +260,6 @@ public class AttachmentDeserializer {
      * Create an Attachment from the MIME stream. If there is a previous attachment
      * that is not read, cache that attachment.
      *
-     * @return
      * @throws IOException
      */
     private Attachment createAttachment(Map<String, List<String>> headers) throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/44ddee3a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
index 7bac53c..208c1c8 100644
--- a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
@@ -75,7 +75,6 @@ public final class ServiceUtils {
      * Does not modify the Message context (other than what is done in the getContextualProperty itself)
      * 
      * @param message
-     * @param type
      */
     public static SchemaValidationType getSchemaValidationType(Message message) {
         SchemaValidationType validationType = getOverrideSchemaValidationType(message);

http://git-wip-us.apache.org/repos/asf/cxf/blob/44ddee3a/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
index 2716478..83ca251 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
@@ -158,7 +158,6 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
     /**
      * Get the Executor for this invocation.
      * @param endpoint
-     * @return
      */
     private Executor getExecutor(final Endpoint endpoint) {
         return endpoint.getService().getExecutor();

http://git-wip-us.apache.org/repos/asf/cxf/blob/44ddee3a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
index 29c18ab..cfb95ce 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
@@ -63,7 +63,6 @@ public class CallbackHandlerTlsCert implements CallbackHandlerProvider {
      * Extracts certificate from message, expecting to find TLSSessionInfo inside.
      *
      * @param message
-     * @return
      */
     private Certificate getCertificate(Message message) {
         TLSSessionInfo tlsSessionInfo = message.get(TLSSessionInfo.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/44ddee3a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
index e8159b6..7952faa 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
@@ -31,7 +31,7 @@ public class CertKeyToUserNameMapper implements CertificateToNameMapper {
     /**
      * Returns Subject DN from X509Certificate
      *
-     * @param certificate
+     * @param cert
      * @return Subject DN as a user name
      */
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/44ddee3a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 49a551f..d7c2720 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -262,7 +262,6 @@ public final class StaxUtils {
     
     /**
      * Return a cached, namespace-aware, factory.
-     * @return
      */
     private static XMLInputFactory getXMLInputFactory() {
         if (SAFE_INPUT_FACTORY != null) {
@@ -1186,7 +1185,6 @@ public final class StaxUtils {
 
     /**
      * @param parent
-     * @return
      */
     private static Document getDocument(Node parent) {
         return (parent instanceof Document) ? (Document)parent : parent.getOwnerDocument();