cxf git commit: [CXF-6488] Binding style vs part type R2203 And R2204 problems in wsdl document
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes d426c3adf - b4fcc78f8
[CXF-6488] Binding style vs part type R2203 And R2204 problems in wsdl document
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4fcc78f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4fcc78f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4fcc78f
Branch: refs/heads/2.7.x-fixes
Commit: b4fcc78f86252c606f767ded8f7d10c257375cdd
Parents: d426c3a
Author: Akitoshi Yoshida a...@apache.org
Authored: Mon Aug 17 13:51:32 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Mon Aug 17 14:01:07 2015 +0200
--
.../validator/internal/WSIBPValidator.java | 41 +-
.../cxf/tools/validator/WSDLValidationTest.java | 8 ++
.../test/resources/validator_wsdl/cxf6488.wsdl | 84
3 files changed, 129 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b4fcc78f/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
--
diff --git
a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
index cfc69b7..98fa716 100644
---
a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
+++
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
@@ -22,8 +22,11 @@ package org.apache.cxf.tools.validator.internal;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+
import javax.jws.soap.SOAPBinding;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
@@ -33,6 +36,10 @@ import javax.wsdl.Message;
import javax.wsdl.Operation;
import javax.wsdl.Part;
import javax.wsdl.PortType;
+import javax.wsdl.WSDLElement;
+import javax.wsdl.extensions.mime.MIMEContent;
+import javax.wsdl.extensions.mime.MIMEMultipartRelated;
+import javax.wsdl.extensions.mime.MIMEPart;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.soap.SOAPBindingUtil;
@@ -306,11 +313,12 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
BindingOperation bop = wsdlHelper.getBindingOperation(def,
operation.getName());
if (operation.getInput() != null
operation.getInput().getMessage() != null) {
Message inMess = operation.getInput().getMessage();
+SetString ignorableParts =
getIgnorableParts(bop.getBindingInput());
for (Iterator? ite3 =
inMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
if
(SOAPBinding.Style.RPC.name().equalsIgnoreCase(style) p.getTypeName() == null
- !isHeaderPart(bop, p)) {
+ !isHeaderPart(bop, p)
!isIgnorablePart(p.getName(), ignorableParts)) {
addErrorMessage(An rpc-literal binding in a
DESCRIPTION MUST refer,
+ in its soapbind:body
element(s), only to
+ wsdl:part element(s) that have
been defined
@@ -319,7 +327,7 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
}
if
(SOAPBinding.Style.DOCUMENT.name().equalsIgnoreCase(style)
- p.getElementName() == null) {
+ p.getElementName() == null
!isIgnorablePart(p.getName(), ignorableParts)) {
addErrorMessage(A document-literal binding in a
DESCRIPTION MUST refer,
+ in each of its soapbind:body
element(s),
+ only to wsdl:part element(s)
@@ -331,10 +339,12 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
}
if (operation.getOutput() != null
operation.getOutput().getMessage() != null) {
Message outMess = operation.getOutput().getMessage();
+SetString ignorableParts =
getIgnorableParts(bop.getBindingInput());
+
for (Iterator? ite3 =
outMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
if
(style.equalsIgnoreCase(SOAPBinding.Style.RPC.name()) p.getTypeName() == null
- !isHeaderPart(bop, p)) {
+
cxf git commit: [CXF-6488] Binding style vs part type R2203 And R2204 problems in wsdl document
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 7de1b04ff - 35ae7e451
[CXF-6488] Binding style vs part type R2203 And R2204 problems in wsdl document
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/35ae7e45
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/35ae7e45
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/35ae7e45
Branch: refs/heads/3.0.x-fixes
Commit: 35ae7e4514b22fc42a7d090b4eb83f5c9086b195
Parents: 7de1b04
Author: Akitoshi Yoshida a...@apache.org
Authored: Mon Aug 17 13:51:32 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Mon Aug 17 13:55:52 2015 +0200
--
.../validator/internal/WSIBPValidator.java | 41 +-
.../cxf/tools/validator/WSDLValidationTest.java | 8 ++
.../test/resources/validator_wsdl/cxf6488.wsdl | 84
3 files changed, 129 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/35ae7e45/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
--
diff --git
a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
index fc70e91..e042087 100644
---
a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
+++
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
@@ -22,8 +22,11 @@ package org.apache.cxf.tools.validator.internal;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+
import javax.jws.soap.SOAPBinding;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
@@ -33,6 +36,10 @@ import javax.wsdl.Message;
import javax.wsdl.Operation;
import javax.wsdl.Part;
import javax.wsdl.PortType;
+import javax.wsdl.WSDLElement;
+import javax.wsdl.extensions.mime.MIMEContent;
+import javax.wsdl.extensions.mime.MIMEMultipartRelated;
+import javax.wsdl.extensions.mime.MIMEPart;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.soap.SOAPBindingUtil;
@@ -318,11 +325,12 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
BindingOperation bop = wsdlHelper.getBindingOperation(def,
operation.getName());
if (operation.getInput() != null
operation.getInput().getMessage() != null) {
Message inMess = operation.getInput().getMessage();
+SetString ignorableParts =
getIgnorableParts(bop.getBindingInput());
for (Iterator? ite3 =
inMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
if
(SOAPBinding.Style.RPC.name().equalsIgnoreCase(style) p.getTypeName() == null
- !isHeaderPart(bop, p)) {
+ !isHeaderPart(bop, p)
!isIgnorablePart(p.getName(), ignorableParts)) {
addErrorMessage(An rpc-literal binding in a
DESCRIPTION MUST refer,
+ in its soapbind:body
element(s), only to
+ wsdl:part element(s) that have
been defined
@@ -331,7 +339,7 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
}
if
(SOAPBinding.Style.DOCUMENT.name().equalsIgnoreCase(style)
- p.getElementName() == null) {
+ p.getElementName() == null
!isIgnorablePart(p.getName(), ignorableParts)) {
addErrorMessage(A document-literal binding in a
DESCRIPTION MUST refer,
+ in each of its soapbind:body
element(s),
+ only to wsdl:part element(s)
@@ -343,10 +351,12 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
}
if (operation.getOutput() != null
operation.getOutput().getMessage() != null) {
Message outMess = operation.getOutput().getMessage();
+SetString ignorableParts =
getIgnorableParts(bop.getBindingInput());
+
for (Iterator? ite3 =
outMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
if
(style.equalsIgnoreCase(SOAPBinding.Style.RPC.name()) p.getTypeName() == null
- !isHeaderPart(bop, p)) {
+
cxf git commit: [CXF-6488] Binding style vs part type R2203 And R2204 problems in wsdl document
Repository: cxf
Updated Branches:
refs/heads/master a3b70f3a4 - d1b812ee9
[CXF-6488] Binding style vs part type R2203 And R2204 problems in wsdl document
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1b812ee
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1b812ee
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1b812ee
Branch: refs/heads/master
Commit: d1b812ee948d0412cc0c3864db67a3342b951e7e
Parents: a3b70f3
Author: Akitoshi Yoshida a...@apache.org
Authored: Mon Aug 17 13:51:32 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Mon Aug 17 13:54:47 2015 +0200
--
.../validator/internal/WSIBPValidator.java | 41 +-
.../cxf/tools/validator/WSDLValidationTest.java | 8 ++
.../test/resources/validator_wsdl/cxf6488.wsdl | 84
3 files changed, 129 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d1b812ee/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
--
diff --git
a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
index fc70e91..e042087 100644
---
a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
+++
b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
@@ -22,8 +22,11 @@ package org.apache.cxf.tools.validator.internal;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+
import javax.jws.soap.SOAPBinding;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
@@ -33,6 +36,10 @@ import javax.wsdl.Message;
import javax.wsdl.Operation;
import javax.wsdl.Part;
import javax.wsdl.PortType;
+import javax.wsdl.WSDLElement;
+import javax.wsdl.extensions.mime.MIMEContent;
+import javax.wsdl.extensions.mime.MIMEMultipartRelated;
+import javax.wsdl.extensions.mime.MIMEPart;
import javax.xml.namespace.QName;
import org.apache.cxf.binding.soap.SOAPBindingUtil;
@@ -318,11 +325,12 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
BindingOperation bop = wsdlHelper.getBindingOperation(def,
operation.getName());
if (operation.getInput() != null
operation.getInput().getMessage() != null) {
Message inMess = operation.getInput().getMessage();
+SetString ignorableParts =
getIgnorableParts(bop.getBindingInput());
for (Iterator? ite3 =
inMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
if
(SOAPBinding.Style.RPC.name().equalsIgnoreCase(style) p.getTypeName() == null
- !isHeaderPart(bop, p)) {
+ !isHeaderPart(bop, p)
!isIgnorablePart(p.getName(), ignorableParts)) {
addErrorMessage(An rpc-literal binding in a
DESCRIPTION MUST refer,
+ in its soapbind:body
element(s), only to
+ wsdl:part element(s) that have
been defined
@@ -331,7 +339,7 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
}
if
(SOAPBinding.Style.DOCUMENT.name().equalsIgnoreCase(style)
- p.getElementName() == null) {
+ p.getElementName() == null
!isIgnorablePart(p.getName(), ignorableParts)) {
addErrorMessage(A document-literal binding in a
DESCRIPTION MUST refer,
+ in each of its soapbind:body
element(s),
+ only to wsdl:part element(s)
@@ -343,10 +351,12 @@ public class WSIBPValidator extends
AbstractDefinitionValidator {
}
if (operation.getOutput() != null
operation.getOutput().getMessage() != null) {
Message outMess = operation.getOutput().getMessage();
+SetString ignorableParts =
getIgnorableParts(bop.getBindingInput());
+
for (Iterator? ite3 =
outMess.getParts().values().iterator(); ite3.hasNext();) {
Part p = (Part)ite3.next();
if
(style.equalsIgnoreCase(SOAPBinding.Style.RPC.name()) p.getTypeName() == null
- !isHeaderPart(bop, p)) {
+
cxf git commit: Consolidate some code in WS-Security/STS
Repository: cxf
Updated Branches:
refs/heads/master f37119381 - 17dbc1215
Consolidate some code in WS-Security/STS
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/17dbc121
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17dbc121
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17dbc121
Branch: refs/heads/master
Commit: 17dbc121555c2140599a4da6232f57fa07f19bc1
Parents: f371193
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Aug 17 16:56:06 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 16:56:19 2015 +0100
--
.../cxf/ws/security/wss4j/WSS4JUtils.java | 30
.../policyhandlers/AbstractBindingBuilder.java | 28 +-
.../cxf/sts/operation/AbstractOperation.java| 19 +++--
3 files changed, 35 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/17dbc121/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
index 15e0368..7821703 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
@@ -22,7 +22,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.security.Key;
+import java.security.cert.X509Certificate;
import java.util.Date;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.logging.Logger;
@@ -50,6 +52,9 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.Loader;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.WSSecurityEngineResult;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -312,4 +317,29 @@ public final class WSS4JUtils {
}
return signCrypto;
}
+
+/**
+ * Get the certificate that was used to sign the request
+ */
+public static X509Certificate getReqSigCert(ListWSHandlerResult results)
{
+if (results == null || results.isEmpty()) {
+return null;
+}
+
+for (WSHandlerResult rResult : results) {
+ListWSSecurityEngineResult signedResults =
+rResult.getActionResults().get(WSConstants.SIGN);
+
+if (signedResults != null !signedResults.isEmpty()) {
+for (WSSecurityEngineResult signedResult : signedResults) {
+if
(signedResult.containsKey(WSSecurityEngineResult.TAG_X509_CERTIFICATE)) {
+return (X509Certificate)signedResult.get(
+WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+}
+}
+}
+}
+
+return null;
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/17dbc121/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 460f418..e47fea6 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1618,7 +1618,7 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
CastUtils.cast((List?)
message.getExchange().getInMessage().get(WSHandlerConstants.RECV_RESULTS));
if (results != null) {
-encrKeyBuilder.setUseThisCert(getReqSigCert(results));
+
encrKeyBuilder.setUseThisCert(WSS4JUtils.getReqSigCert(results));
//TODO This is a hack, this should not come under
USE_REQ_SIG_CERT
if (encrKeyBuilder.isCertSet()) {
@@ -1634,32 +1634,6 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
return encrUser;
}
[2/2] cxf-fediz git commit: removed redirect. redirect was wrong.
removed redirect. redirect was wrong.
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/42f597df
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/42f597df
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/42f597df
Branch: refs/heads/1.2.x-fixes
Commit: 42f597df37509481d12639b668816813a91d22c9
Parents: b5af2a7
Author: cschmuell...@talend.com cschmuell...@talend.com
Authored: Mon Aug 17 15:07:03 2015 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 16:46:37 2015 +0100
--
.../org/apache/cxf/fediz/was/tai/FedizInterceptor.java | 13 -
1 file changed, 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/42f597df/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
--
diff --git
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
index e63b3f8..8e585c0 100644
---
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
+++
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
@@ -321,19 +321,6 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
} catch (ServletException e) {
LOG.error(Could not logout users);
}
-FedizContext fedCtx = getFederationContext(request);
-String logoutRedirectUrl = fedCtx.getLogoutRedirectTo();
-String contextPath = request.getContextPath();
-try {
-if (logoutRedirectUrl != null
logoutRedirectUrl.length() 0) {
-response.sendRedirect(contextPath +
logoutRedirectUrl);
-} else {
-response.sendRedirect(contextPath);
-}
-} catch (IOException e) {
-LOG.error(Could not redirect to logout page);
-}
-
return super.signoutCleanup(request, response);
}
cxf git commit: make the swagger samples respond to reflect its changed states
Repository: cxf
Updated Branches:
refs/heads/master d1b812ee9 - f37119381
make the swagger samples respond to reflect its changed states
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3711938
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3711938
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3711938
Branch: refs/heads/master
Commit: f37119381a834019ad15a63fcef2d86e8af96439
Parents: d1b812e
Author: Akitoshi Yoshida a...@apache.org
Authored: Mon Aug 17 17:22:07 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Mon Aug 17 17:22:23 2015 +0200
--
.../java/demo/jaxrs/swagger/server/Sample.java | 28 --
.../java/demo/jaxrs/swagger/server/Sample.java | 31 +---
.../java/demo/jaxrs/swagger/server/Sample.java | 31 +---
.../java/demo/jaxrs/swagger/server/Sample.java | 31 +---
4 files changed, 82 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f3711938/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 545d804..7b83508 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -20,6 +20,9 @@
package demo.jaxrs.swagger.server;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -47,6 +50,15 @@ import com.wordnik.swagger.annotations.ApiParam;
@Path(/sample)
@Api(value = /sample, description = Sample JAX-RS service with Swagger
documentation)
public class Sample {
+private MapString, Item items;
+
+public Sample() {
+items = Collections.synchronizedMap(new TreeMapString,
Item(String.CASE_INSENSITIVE_ORDER));
+items.put(Item 1, new Item(Item 1, Value 1));
+items.put(Item 2, new Item(Item 2, Value 2));
+}
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
@@ -57,12 +69,7 @@ public class Sample {
)
public Response getItems(
@ApiParam(value = Page to fetch, required = true)
@QueryParam(page) @DefaultValue(1) int page) {
-return Response.ok(
-Arrays.asList(
-new Item(Item 1, Value 1),
-new Item(Item 2, Value 2)
-)
-).build();
+return Response.ok(items.values()).build();
}
@Produces({ MediaType.APPLICATION_JSON })
@@ -76,7 +83,7 @@ public class Sample {
public Item getItem(
@ApiParam(value = language, required = true)
@HeaderParam(Accept-Language) final String language,
@ApiParam(value = name, required = true) @PathParam(name) String
name) {
-return new Item(name, Value in + language);
+return items.get(name);
}
@Consumes({ MediaType.APPLICATION_JSON })
@@ -89,7 +96,7 @@ public class Sample {
public Response createItem(
@Context final UriInfo uriInfo,
@ApiParam(value = item, required = true) final Item item) {
-
+items.put(item.getName(), item);
return Response
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
@@ -106,7 +113,9 @@ public class Sample {
public Item updateItem(
@ApiParam(value = name, required = true) @PathParam(name) String
name,
@ApiParam(value = value, required = true) @FormParam(value) String
value) {
-return new Item(name, value);
+Item item = new Item(name, value);
+items.put(name, item);
+return item;
}
@Path(/{name})
@@ -125,6 +134,7 @@ public class Sample {
)
)
public Response delete(@ApiParam(value = name, required = true)
@PathParam(name) String name) {
+items.remove(name);
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f3711938/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git
cxf git commit: make the swagger samples respond to reflect its changed states
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 35ae7e451 - 0e9101fa5
make the swagger samples respond to reflect its changed states
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0e9101fa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e9101fa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e9101fa
Branch: refs/heads/3.0.x-fixes
Commit: 0e9101fa56000500ef97573d24a899c161d4af4b
Parents: 35ae7e4
Author: Akitoshi Yoshida a...@apache.org
Authored: Mon Aug 17 17:22:07 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Mon Aug 17 17:27:18 2015 +0200
--
.../java/demo/jaxrs/swagger/server/Sample.java | 28 --
.../java/demo/jaxrs/swagger/server/Sample.java | 31 +---
.../java/demo/jaxrs/swagger/server/Sample.java | 31 +---
.../java/demo/jaxrs/swagger/server/Sample.java | 31 +---
4 files changed, 82 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e9101fa/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 545d804..7b83508 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -20,6 +20,9 @@
package demo.jaxrs.swagger.server;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.TreeMap;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -47,6 +50,15 @@ import com.wordnik.swagger.annotations.ApiParam;
@Path(/sample)
@Api(value = /sample, description = Sample JAX-RS service with Swagger
documentation)
public class Sample {
+private MapString, Item items;
+
+public Sample() {
+items = Collections.synchronizedMap(new TreeMapString,
Item(String.CASE_INSENSITIVE_ORDER));
+items.put(Item 1, new Item(Item 1, Value 1));
+items.put(Item 2, new Item(Item 2, Value 2));
+}
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
@@ -57,12 +69,7 @@ public class Sample {
)
public Response getItems(
@ApiParam(value = Page to fetch, required = true)
@QueryParam(page) @DefaultValue(1) int page) {
-return Response.ok(
-Arrays.asList(
-new Item(Item 1, Value 1),
-new Item(Item 2, Value 2)
-)
-).build();
+return Response.ok(items.values()).build();
}
@Produces({ MediaType.APPLICATION_JSON })
@@ -76,7 +83,7 @@ public class Sample {
public Item getItem(
@ApiParam(value = language, required = true)
@HeaderParam(Accept-Language) final String language,
@ApiParam(value = name, required = true) @PathParam(name) String
name) {
-return new Item(name, Value in + language);
+return items.get(name);
}
@Consumes({ MediaType.APPLICATION_JSON })
@@ -89,7 +96,7 @@ public class Sample {
public Response createItem(
@Context final UriInfo uriInfo,
@ApiParam(value = item, required = true) final Item item) {
-
+items.put(item.getName(), item);
return Response
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
@@ -106,7 +113,9 @@ public class Sample {
public Item updateItem(
@ApiParam(value = name, required = true) @PathParam(name) String
name,
@ApiParam(value = value, required = true) @FormParam(value) String
value) {
-return new Item(name, value);
+Item item = new Item(name, value);
+items.put(name, item);
+return item;
}
@Path(/{name})
@@ -125,6 +134,7 @@ public class Sample {
)
)
public Response delete(@ApiParam(value = name, required = true)
@PathParam(name) String name) {
+items.remove(name);
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e9101fa/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git
[1/2] cxf-fediz git commit: Added Redirect Logout and fixed parent dependencies
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes fa101eb8f - 42f597df3
Added Redirect Logout and fixed parent dependencies
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b5af2a70
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b5af2a70
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b5af2a70
Branch: refs/heads/1.2.x-fixes
Commit: b5af2a706ff031b2801399e300fbd8fe21a83bdd
Parents: fa101eb
Author: cschmuell...@talend.com cschmuell...@talend.com
Authored: Mon Aug 17 14:32:09 2015 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 16:46:30 2015 +0100
--
examples/websphereWebapp/pom.xml| 2 +-
plugins/websphere/pom.xml | 7 ++--
.../cxf/fediz/was/tai/FedizInterceptor.java | 40
systests/websphere/pom.xml | 2 +-
4 files changed, 31 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b5af2a70/examples/websphereWebapp/pom.xml
--
diff --git a/examples/websphereWebapp/pom.xml b/examples/websphereWebapp/pom.xml
index c57c8b9..9ce3c30 100644
--- a/examples/websphereWebapp/pom.xml
+++ b/examples/websphereWebapp/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.cxf.fediz/groupId
artifactIdexamples/artifactId
-version1.2.1-SNAPSHOT/version
+version1.2.2-SNAPSHOT/version
/parent
groupIdorg.apache.cxf.fediz.examples/groupId
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b5af2a70/plugins/websphere/pom.xml
--
diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml
index 68fc05e..2806ddf 100644
--- a/plugins/websphere/pom.xml
+++ b/plugins/websphere/pom.xml
@@ -22,7 +22,7 @@
parent
groupIdorg.apache.cxf.fediz/groupId
artifactIdplugin/artifactId
-version1.2.1-SNAPSHOT/version
+version1.2.2-SNAPSHOT/version
relativePath../pom.xml/relativePath
/parent
artifactIdfediz-websphere/artifactId
@@ -35,8 +35,9 @@
dependency
groupIdjavax.servlet/groupId
artifactIdjavax.servlet-api/artifactId
-!--version${servlet.version}/version--
-version3.1.0/version
+!-- Servlet since version 3 supports logout.--
+ !--version${servlet.version}/version--
+version3.0.1/version
!--typejar/type--
!--scopecompile/scope--
/dependency
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b5af2a70/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
--
diff --git
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
index e28439c..e63b3f8 100644
---
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
+++
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
@@ -77,8 +77,8 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
private String configFile;
private FedizConfigurator configurator;
private RoleToGroupMapper mapper;
-private String cookieName;
-
+private String cookieName = LtpaToken2;
+
/**
* @see
org.apache.cxf.fediz.was.Constants#PROPERTY_KEY_DIRECT_GROUP_MAPPING
*/
@@ -256,8 +256,7 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
Cookie[] cookies = req.getCookies();
if (cookies != null) {
for (Cookie c : cookies) {
-// TODO Make Cookie Name customizable
-if (LtpaToken2.equals(c.getName())) {
+if (cookieName.equals(c.getName())) {
LOG.debug(User is already authenticated. Fediz
TAI Interceptor will not be invoked);
isTargetInterceptor = false;
break;
@@ -313,10 +312,7 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
@Override
protected boolean signoutCleanup(HttpServletRequest request,
HttpServletResponse response) {
-HttpSession session = request.getSession();
-
session.removeAttribute(Constants.SECURITY_TOKEN_SESSION_ATTRIBUTE_KEY);
-session.removeAttribute(Constants.SUBJECT_TOKEN_KEY);
-session.invalidate();
+
[2/2] cxf-fediz git commit: removed redirect. redirect was wrong.
removed redirect. redirect was wrong.
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3c4652b0
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3c4652b0
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3c4652b0
Branch: refs/heads/master
Commit: 3c4652b09d793d7b9e839fd604992b566633bc1c
Parents: c369c07
Author: cschmuell...@talend.com cschmuell...@talend.com
Authored: Mon Aug 17 15:07:03 2015 +0200
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 16:45:39 2015 +0100
--
.../org/apache/cxf/fediz/was/tai/FedizInterceptor.java | 13 -
1 file changed, 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3c4652b0/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
--
diff --git
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
index ce88185..c7a28de 100644
---
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
+++
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
@@ -321,19 +321,6 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
} catch (ServletException e) {
LOG.error(Could not logout users);
}
-FedizContext fedCtx = getFederationContext(request);
-String logoutRedirectUrl = fedCtx.getLogoutRedirectTo();
-String contextPath = request.getContextPath();
-try {
-if (logoutRedirectUrl != null
logoutRedirectUrl.length() 0) {
-response.sendRedirect(contextPath +
logoutRedirectUrl);
-} else {
-response.sendRedirect(contextPath);
-}
-} catch (IOException e) {
-LOG.error(Could not redirect to logout page);
-}
-
return super.signoutCleanup(request, response);
}
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 0e9101fa5 - edbadd5a9 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/efe03655 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/efe03655 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/efe03655 Branch: refs/heads/3.0.x-fixes Commit: efe0365564cf7c7f3d759e0a139bb38a5fc481ef Parents: c81e8d4 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Mon Aug 17 16:56:40 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Mon Aug 17 16:56:40 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/efe03655/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index c7c59c6..e71d214 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -458,6 +458,7 @@ M 12d070f4392316cdfff03eb41abe22531ed64ee9 M 16ffa0f10dac874cd5727d312ac56a78b13e5ca9 M 1701e6c8d4e794f25d69781e3f69357723ad7fcf M 174bd11dcfeae47998723757542abe56c792cc76 +M 17dbc121555c2140599a4da6232f57fa07f19bc1 M 17f140eb2bf93444e7f8e028b45a371d14688cda M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 1946e323a0df6e5f9748af82106cff39d7b5d01f
svn commit: r962154 - in /websites/production/cxf/content: cache/docs.pageCache docs/bundling-cxf-into-single-jar-with-maven-shade-plugin.html docs/deployment.html
Author: buildbot Date: Mon Aug 17 16:47:24 2015 New Revision: 962154 Log: Production update by buildbot for cxf Added: websites/production/cxf/content/docs/bundling-cxf-into-single-jar-with-maven-shade-plugin.html Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/deployment.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Added: websites/production/cxf/content/docs/bundling-cxf-into-single-jar-with-maven-shade-plugin.html == --- websites/production/cxf/content/docs/bundling-cxf-into-single-jar-with-maven-shade-plugin.html (added) +++ websites/production/cxf/content/docs/bundling-cxf-into-single-jar-with-maven-shade-plugin.html Mon Aug 17 16:47:24 2015 @@ -0,0 +1,157 @@ + +!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +!-- + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the License); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an AS IS BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +-- +html + head + +link type=text/css rel=stylesheet href=/resources/site.css +script src='/resources/space.js'/script + +meta http-equiv=Content-type content=text/html;charset=UTF-8 +meta name=keywords content=business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source +meta name=description content=Apache CXF, Services Framework - Bundling CXF into single jar with Maven shade plugin + + + + +title +Apache CXF -- Bundling CXF into single jar with Maven shade plugin +/title + /head +body onload=init() + + +table width=100% cellpadding=0 cellspacing=0 + tr +td id=cell-0-0 colspan=2nbsp;/td +td id=cell-0-1nbsp;/td +td id=cell-0-2 colspan=2nbsp;/td + /tr + tr +td id=cell-1-0nbsp;/td +td id=cell-1-1nbsp;/td +td id=cell-1-2 + !-- Banner -- +div class=banner id=bannerdivtable border=0 cellpadding=0 cellspacing=0 width=100%trtd align=left colspan=1 nowrap +a shape=rect href=http://cxf.apache.org/; title=Apache CXFspan style=font-weight: bold; font-size: 170%; color: whiteApache CXF/span/a +/tdtd align=right colspan=1 nowrap +a shape=rect href=http://www.apache.org/; title=The Apache Sofware Foundationimg border=0 alt=ASF Logo src=http://cxf.apache.org/images/asf-logo.png;/a +/td/tr/table/div/div + !-- Banner -- + div id=top-menu +table border=0 cellpadding=1 cellspacing=0 width=100% + tr +td + div align=left +!-- Breadcrumbs -- +a href=index.htmlIndex/anbsp;gt;nbsp;a href=deployment.htmlDeployment/anbsp;gt;nbsp;a href=bundling-cxf-into-single-jar-with-maven-shade-plugin.htmlBundling CXF into single jar with Maven shade plugin/a +!-- Breadcrumbs -- + /div +/td +td + div align=right +!-- Quicklinks -- +div id=quicklinkspa shape=rect href=http://cxf.apache.org/download.html;Download/a | a shape=rect href=http://cxf.apache.org/docs/index.html;Documentation/a/p/div +!-- Quicklinks -- + /div +/td + /tr +/table + /div +/td +td id=cell-1-3nbsp;/td +td id=cell-1-4nbsp;/td + /tr + tr +td id=cell-2-0 colspan=2nbsp;/td +td id=cell-2-1 + table +tr valign=top + td height=100% +div id=wrapper-menu-page-right + div id=wrapper-menu-page-top +div id=wrapper-menu-page-bottom + div id=menu-page +!-- NavigationBar -- +div id=navigationul class=alternatelia shape=rect href=overview.htmlOverview/a/lilia shape=rect href=how-tos.htmlHow-Tos/a/lilia shape=rect href=frontends.htmlFrontends/a/lilia shape=rect href=databindings.htmlDataBindings/a/lilia shape=rect href=transports.htmlTransports/a/lilia shape=rect href=configuration.htmlConfiguration/a/lilia shape=rect href=debugging-and-logging.htmlDebugging
[1/2] cxf-fediz git commit: [FEDIZ-128] - Parent POM dependencies wrong in Websphere artifacts. Thanks to Christian Schmulling for the patch.
Repository: cxf-fediz
Updated Branches:
refs/heads/master 34d160e3b - 3c4652b09
[FEDIZ-128] - Parent POM dependencies wrong in Websphere artifacts. Thanks to
Christian Schmulling for the patch.
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c369c076
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c369c076
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c369c076
Branch: refs/heads/master
Commit: c369c076abb7a6432d2bf06cfea0d7cf70b0767b
Parents: 34d160e
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Aug 17 16:45:09 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 16:45:09 2015 +0100
--
examples/websphereWebapp/pom.xml| 2 +-
.../cxf/fediz/was/tai/FedizInterceptor.java | 40
2 files changed, 26 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c369c076/examples/websphereWebapp/pom.xml
--
diff --git a/examples/websphereWebapp/pom.xml b/examples/websphereWebapp/pom.xml
index c57c8b9..da695b0 100644
--- a/examples/websphereWebapp/pom.xml
+++ b/examples/websphereWebapp/pom.xml
@@ -23,7 +23,7 @@
parent
groupIdorg.apache.cxf.fediz/groupId
artifactIdexamples/artifactId
-version1.2.1-SNAPSHOT/version
+version1.3.0-SNAPSHOT/version
/parent
groupIdorg.apache.cxf.fediz.examples/groupId
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c369c076/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
--
diff --git
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
index 0bd9ae0..ce88185 100644
---
a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
+++
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
@@ -77,8 +77,8 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
private String configFile;
private FedizConfigurator configurator;
private RoleToGroupMapper mapper;
-private String cookieName;
-
+private String cookieName = LtpaToken2;
+
/**
* @see
org.apache.cxf.fediz.was.Constants#PROPERTY_KEY_DIRECT_GROUP_MAPPING
*/
@@ -256,8 +256,7 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
Cookie[] cookies = req.getCookies();
if (cookies != null) {
for (Cookie c : cookies) {
-// TODO Make Cookie Name customizable
-if (LtpaToken2.equals(c.getName())) {
+if (cookieName.equals(c.getName())) {
LOG.debug(User is already authenticated. Fediz
TAI Interceptor will not be invoked);
isTargetInterceptor = false;
break;
@@ -313,10 +312,7 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
@Override
protected boolean signoutCleanup(HttpServletRequest request,
HttpServletResponse response) {
-HttpSession session = request.getSession();
-
session.removeAttribute(Constants.SECURITY_TOKEN_SESSION_ATTRIBUTE_KEY);
-session.removeAttribute(Constants.SUBJECT_TOKEN_KEY);
-session.invalidate();
+terminateSession(request);
Cookie cookie = new
Cookie(Constants.PROPERTY_SESSION_COOKIE_NAME, );
cookie.setMaxAge(0);
response.addCookie(cookie);
@@ -324,23 +320,30 @@ public class FedizInterceptor implements
TrustAssociationInterceptor {
request.logout();
} catch (ServletException e) {
LOG.error(Could not logout users);
-// e.printStackTrace();
}
-// WSSecurityHelper.revokeSSOCookies(request, response);
+FedizContext fedCtx = getFederationContext(request);
+String logoutRedirectUrl = fedCtx.getLogoutRedirectTo();
+String contextPath = request.getContextPath();
+try {
+if (logoutRedirectUrl != null
logoutRedirectUrl.length() 0) {
+response.sendRedirect(contextPath +
logoutRedirectUrl);
+} else {
+response.sendRedirect(contextPath);
+
cxf git commit: Updates to build cleanly in Eclipse/Mars
Repository: cxf
Updated Branches:
refs/heads/master 17dbc1215 - b48c79cc1
Updates to build cleanly in Eclipse/Mars
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b48c79cc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b48c79cc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b48c79cc
Branch: refs/heads/master
Commit: b48c79cc187d16a81e45be8a24e56437a0df56e3
Parents: 17dbc12
Author: Daniel Kulp dk...@apache.org
Authored: Mon Aug 17 15:05:09 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Mon Aug 17 15:05:09 2015 -0400
--
.../apache/cxf/jaxws/WrapperClassGenerator.java | 2 +-
.../org/apache/cxf/jaxws/EndpointImplTest.java | 2 +-
.../cxf/jaxws/spring/SpringBeansTest.java | 2 +-
.../http/asyncclient/AsyncHTTPConduit.java | 1 -
.../spring/ApplicationContextTest.java | 2 +-
.../http/netty/client/NettyHttpConduit.java | 1 -
.../server/spring/ApplicationContextTest.java | 2 +-
.../apache/cxf/transport/http/ChunkedUtil.java | 1 -
.../apache/cxf/transport/udp/UDPConduit.java| 134 +--
.../factory/ReflectionServiceFactoryBean.java | 4 +-
10 files changed, 72 insertions(+), 79 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b48c79cc/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
--
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
index 977b7dd..6141c86 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
@@ -347,7 +347,7 @@ public final class WrapperClassGenerator extends ASMHelper {
if (!addJAXBAnnotations(fv, jaxbAnnos, name)) {
AnnotationVisitor av0 =
fv.visitAnnotation(Ljavax/xml/bind/annotation/XmlElement;, true);
av0.visit(name, name);
-if (factory.isWrapperPartQualified(mpi)) {
+if (Boolean.TRUE.equals(factory.isWrapperPartQualified(mpi))) {
av0.visit(namespace,
mpi.getConcreteName().getNamespaceURI());
}
if (factory.isWrapperPartNillable(mpi)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/b48c79cc/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
--
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
index 40092d1..655ff0a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
@@ -182,7 +182,7 @@ public class EndpointImplTest extends AbstractJaxWsTest {
serviceFactory.setServiceClass(HelloWrongAnnotation.class);
try {
-new EndpointImpl(getBus(), hello, new
JaxWsServerFactoryBean(serviceFactory));
+new EndpointImpl(getBus(), hello, new
JaxWsServerFactoryBean(serviceFactory)).close();
} catch (Exception e) {
String expeced = Method [sayHi] processing error: SOAPBinding can
not on method with RPC style;
assertEquals(expeced, e.getMessage());
http://git-wip-us.apache.org/repos/asf/cxf/blob/b48c79cc/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
--
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
index b68b96f..e38553b 100644
---
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
+++
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
@@ -437,7 +437,7 @@ public class SpringBeansTest extends Assert {
@Test
public void testEndpointWithUndefinedBus() throws Exception {
try {
-new
ClassPathXmlApplicationContext(/org/apache/cxf/jaxws/spring/endpoints3.xml);
+new
ClassPathXmlApplicationContext(/org/apache/cxf/jaxws/spring/endpoints3.xml).close();
fail(Should have thrown an exception);
} catch (BeanCreationException ex) {
assertEquals(ep2, ex.getBeanName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/b48c79cc/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
cxf git commit: Released
Repository: cxf Updated Branches: refs/heads/master b48c79cc1 - c4ce1dd67 Released Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c4ce1dd6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c4ce1dd6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c4ce1dd6 Branch: refs/heads/master Commit: c4ce1dd672146fa49f7d6b0aabc563843828fe93 Parents: b48c79c Author: Daniel Kulp dk...@apache.org Authored: Mon Aug 17 15:12:41 2015 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Mon Aug 17 15:12:41 2015 -0400 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c4ce1dd6/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 71d8f8c..18dd8ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -126,7 +126,7 @@ cxf.oauth.bundle.version20100527_1/cxf.oauth.bundle.version cxf.oauth.version20100527/cxf.oauth.version cxf.opensaml.version3.1.1/cxf.opensaml.version -cxf.opensaml.osgi.version3.1.1_3-SNAPSHOT/cxf.opensaml.osgi.version +cxf.opensaml.osgi.version3.1.1_3/cxf.opensaml.osgi.version cxf.opensaml.osgi.version.range[3.1,4)/cxf.opensaml.osgi.version.range cxf.rhino.version1.7R2/cxf.rhino.version cxf.servlet-api.grouporg.apache.geronimo.specs/cxf.servlet-api.group
[3/3] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/edbadd5a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/edbadd5a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/edbadd5a
Branch: refs/heads/3.0.x-fixes
Commit: edbadd5a9e980694106979e85221714e600f8b7c
Parents: efe0365
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Aug 17 17:08:06 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 17:08:06 2015 +0100
--
.../cxf/ws/security/wss4j/WSS4JUtils.java | 58
.../policyhandlers/AbstractBindingBuilder.java | 26 -
.../cxf/sts/operation/AbstractOperation.java| 18 --
3 files changed, 12 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/edbadd5a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
index 387fb56..5ff2500 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
@@ -24,11 +24,7 @@ import java.net.URL;
import java.security.Key;
import java.security.cert.X509Certificate;
import java.util.Date;
- HEAD
-===
import java.util.List;
-import java.util.Map;
- 17dbc12... Consolidate some code in WS-Security/STS
import java.util.Properties;
import javax.crypto.SecretKey;
@@ -55,13 +51,9 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
- HEAD
-===
-import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
- 17dbc12... Consolidate some code in WS-Security/STS
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -363,36 +355,6 @@ public final class WSS4JUtils {
return CryptoFactory.getInstance(propFilename, classLoader);
}
- HEAD
-===
-public static Crypto getSignatureCrypto(
-Object s,
-SoapMessage message,
-PasswordEncryptor passwordEncryptor
-) throws WSSecurityException {
-Crypto signCrypto = null;
-if (s instanceof Crypto) {
-signCrypto = (Crypto)s;
-} else if (s != null) {
-URL propsURL = SecurityUtils.loadResource(message, s);
-Properties props = WSS4JUtils.getProps(s, propsURL);
-if (props == null) {
-LOG.fine(Cannot find Crypto Signature properties: + s);
-Exception ex = new Exception(Cannot find Crypto Signature
properties: + s);
-throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex);
-}
-
-signCrypto = CryptoFactory.getInstance(props,
Loader.getClassLoader(CryptoFactory.class),
- passwordEncryptor);
-
-EndpointInfo info =
message.getExchange().getEndpoint().getEndpointInfo();
-synchronized (info) {
-info.setProperty(SecurityConstants.SIGNATURE_CRYPTO,
signCrypto);
-}
-}
-return signCrypto;
-}
-
/**
* Get the certificate that was used to sign the request
*/
@@ -402,20 +364,24 @@ public final class WSS4JUtils {
}
for (WSHandlerResult rResult : results) {
-ListWSSecurityEngineResult signedResults =
-rResult.getActionResults().get(WSConstants.SIGN);
+ListWSSecurityEngineResult wsSecEngineResults =
rResult.getResults();
-if (signedResults != null !signedResults.isEmpty()) {
-for (WSSecurityEngineResult signedResult : signedResults) {
-if
(signedResult.containsKey(WSSecurityEngineResult.TAG_X509_CERTIFICATE)) {
-return (X509Certificate)signedResult.get(
-WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+if (wsSecEngineResults != null !wsSecEngineResults.isEmpty()) {
+for (WSSecurityEngineResult wser : wsSecEngineResults) {
+Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
+if
[2/3] cxf git commit: Consolidate some code in WS-Security/STS
Consolidate some code in WS-Security/STS
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c81e8d44
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c81e8d44
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c81e8d44
Branch: refs/heads/3.0.x-fixes
Commit: c81e8d440a5300e3b9390e2b8bb7b3aa8c70ad61
Parents: 0e9101f
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Aug 17 16:56:06 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Aug 17 16:56:40 2015 +0100
--
.../cxf/ws/security/wss4j/WSS4JUtils.java | 68
.../policyhandlers/AbstractBindingBuilder.java | 5 +-
.../cxf/sts/operation/AbstractOperation.java| 8 ++-
3 files changed, 79 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c81e8d44/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
index d872a47..387fb56 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
@@ -22,7 +22,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.security.Key;
+import java.security.cert.X509Certificate;
import java.util.Date;
+ HEAD
+===
+import java.util.List;
+import java.util.Map;
+ 17dbc12... Consolidate some code in WS-Security/STS
import java.util.Properties;
import javax.crypto.SecretKey;
@@ -49,6 +55,13 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
+ HEAD
+===
+import org.apache.wss4j.common.util.Loader;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.WSSecurityEngineResult;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
+ 17dbc12... Consolidate some code in WS-Security/STS
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -350,4 +363,59 @@ public final class WSS4JUtils {
return CryptoFactory.getInstance(propFilename, classLoader);
}
+ HEAD
+===
+public static Crypto getSignatureCrypto(
+Object s,
+SoapMessage message,
+PasswordEncryptor passwordEncryptor
+) throws WSSecurityException {
+Crypto signCrypto = null;
+if (s instanceof Crypto) {
+signCrypto = (Crypto)s;
+} else if (s != null) {
+URL propsURL = SecurityUtils.loadResource(message, s);
+Properties props = WSS4JUtils.getProps(s, propsURL);
+if (props == null) {
+LOG.fine(Cannot find Crypto Signature properties: + s);
+Exception ex = new Exception(Cannot find Crypto Signature
properties: + s);
+throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex);
+}
+
+signCrypto = CryptoFactory.getInstance(props,
Loader.getClassLoader(CryptoFactory.class),
+ passwordEncryptor);
+
+EndpointInfo info =
message.getExchange().getEndpoint().getEndpointInfo();
+synchronized (info) {
+info.setProperty(SecurityConstants.SIGNATURE_CRYPTO,
signCrypto);
+}
+}
+return signCrypto;
+}
+
+/**
+ * Get the certificate that was used to sign the request
+ */
+public static X509Certificate getReqSigCert(ListWSHandlerResult results)
{
+if (results == null || results.isEmpty()) {
+return null;
+}
+
+for (WSHandlerResult rResult : results) {
+ListWSSecurityEngineResult signedResults =
+rResult.getActionResults().get(WSConstants.SIGN);
+
+if (signedResults != null !signedResults.isEmpty()) {
+for (WSSecurityEngineResult signedResult : signedResults) {
+if
(signedResult.containsKey(WSSecurityEngineResult.TAG_X509_CERTIFICATE)) {
+
