git commit: [CXF-5822] Fixing a possible NPE in PropertiesLoaderUtils, patch from Christoph Eßer applied
Repository: cxf
Updated Branches:
refs/heads/master 5daca2d2b - 403a4fb83
[CXF-5822] Fixing a possible NPE in PropertiesLoaderUtils, patch from Christoph
EÃer applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/403a4fb8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/403a4fb8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/403a4fb8
Branch: refs/heads/master
Commit: 403a4fb83a23b6bae60bc12eb48c357d1f822040
Parents: 5daca2d
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jun 26 10:32:12 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jun 26 10:32:12 2014 +0100
--
.../java/org/apache/cxf/common/util/PropertiesLoaderUtils.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/403a4fb8/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
--
diff --git
a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
index 9c58e38..e7c91d3 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
@@ -63,6 +63,10 @@ public final class PropertiesLoaderUtils {
Logger logger, Level level,
String msg)
throws IOException {
Properties properties = new Properties();
+// Set default class loader if neccessary
+if (classLoader == null) {
+classLoader = PropertiesLoaderUtils.class.getClassLoader();
+}
EnumerationURL urls = classLoader.getResources(resourceName);
while (urls.hasMoreElements()) {
git commit: [CXF-5822] Fixing a possible NPE in PropertiesLoaderUtils, patch from Christoph Eßer applied
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes fdd9c9707 - 03dbe4676
[CXF-5822] Fixing a possible NPE in PropertiesLoaderUtils, patch from Christoph
EÃer applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/03dbe467
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/03dbe467
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/03dbe467
Branch: refs/heads/2.7.x-fixes
Commit: 03dbe4676968d58afd9c3ec932ba1b89979beb61
Parents: fdd9c97
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jun 26 10:38:20 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jun 26 10:38:20 2014 +0100
--
.../java/org/apache/cxf/common/util/PropertiesLoaderUtils.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/03dbe467/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
--
diff --git
a/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
b/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
index ee09367..ad6cfa2 100644
--- a/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
+++ b/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
@@ -65,6 +65,10 @@ public final class PropertiesLoaderUtils {
Logger logger, Level level,
String msg)
throws IOException {
Properties properties = new Properties();
+// Set default class loader if neccessary
+if (classLoader == null) {
+classLoader = PropertiesLoaderUtils.class.getClassLoader();
+}
EnumerationURL urls = classLoader.getResources(resourceName);
while (urls.hasMoreElements()) {
git commit: [CXF-5822] Fixing a possible NPE in PropertiesLoaderUtils, patch from Christoph Eßer applied
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 144ab3915 - 71c73e4a2
[CXF-5822] Fixing a possible NPE in PropertiesLoaderUtils, patch from Christoph
EÃer applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/71c73e4a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/71c73e4a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/71c73e4a
Branch: refs/heads/2.6.x-fixes
Commit: 71c73e4a2604e6f03a07d2c198544500eb91bc57
Parents: 144ab39
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jun 26 10:38:20 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jun 26 10:39:35 2014 +0100
--
.../java/org/apache/cxf/common/util/PropertiesLoaderUtils.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/71c73e4a/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
--
diff --git
a/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
b/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
index ee09367..ad6cfa2 100644
--- a/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
+++ b/api/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
@@ -65,6 +65,10 @@ public final class PropertiesLoaderUtils {
Logger logger, Level level,
String msg)
throws IOException {
Properties properties = new Properties();
+// Set default class loader if neccessary
+if (classLoader == null) {
+classLoader = PropertiesLoaderUtils.class.getClassLoader();
+}
EnumerationURL urls = classLoader.getResources(resourceName);
while (urls.hasMoreElements()) {
[1/2] git commit: Adding support for a cross-domain STS test
Repository: cxf
Updated Branches:
refs/heads/master 403a4fb83 - 417d93849
Adding support for a cross-domain STS test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/417d9384
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/417d9384
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/417d9384
Branch: refs/heads/master
Commit: 417d9384948f93adcc0ce1c9f2786e8dcafa434d
Parents: 68372da
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 13:48:07 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 13:48:34 2014 +0100
--
.../cxf/ws/security/SecurityConstants.java | 12 +-
.../apache/cxf/ws/security/trust/STSUtils.java | 128 +++
.../sts/cross_domain/CrossDomainTest.java | 3 +-
.../cxf/systest/sts/cross_domain/cxf-client.xml | 1 +
4 files changed, 117 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/417d9384/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 131a6ac..7938889 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -455,6 +455,16 @@ public final class SecurityConstants {
ws-security.sts.disable-wsmex-call-using-epr-address;
/**
+ * Whether to prefer to use WS-MEX over a STSClient's
location/wsdlLocation properties
+ * when making an STS RequestSecurityToken call. This can be set to true
for the scenario
+ * of making a WS-MEX call to an initial STS, and using the returned token
to make another
+ * call to an STS (which is configured using the STSClient configuration).
Default is
+ * false.
+ */
+public static final String PREFER_WSMEX_OVER_STS_CLIENT_CONFIG =
+ws-security.sts.prefer-wsmex;
+
+/**
* Switch STS client to send Soap 1.2 messages
*/
public static final String STS_CLIENT_SOAP12_BINDING =
@@ -568,7 +578,7 @@ public final class SecurityConstants {
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
-CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT
+CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/417d9384/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 6003439..6e27209 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -22,6 +22,8 @@ package org.apache.cxf.ws.security.trust;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
@@ -31,6 +33,7 @@ import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.EndpointImpl;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.service.Service;
@@ -90,39 +93,116 @@ public final class STSUtils {
}
public static STSClient getClient(Message message, String type,
IssuedToken itok) {
-STSClient client = (STSClient)message
-.getContextualProperty(SecurityConstants.STS_CLIENT);
-if (client == null) {
-if (type == null) {
-type = ;
-} else {
-type = . + type + -client;
-}
-client = new STSClient(message.getExchange().get(Bus.class));
-Endpoint ep = message.getExchange().get(Endpoint.class);
-client.setEndpointName(ep.getEndpointInfo().getName().toString() +
type);
-
[2/2] git commit: Avoiding NPE if either a location/wsdlLocation is not configured on the STSClient
Avoiding NPE if either a location/wsdlLocation is not configured on the
STSClient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/68372daf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/68372daf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/68372daf
Branch: refs/heads/master
Commit: 68372daf6074e38d9297bb69a7810c51a70bae3e
Parents: 403a4fb
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 11:10:49 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 13:48:34 2014 +0100
--
.../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 4 +++-
.../java/org/apache/cxf/ws/security/trust/Messages.properties| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/68372daf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 65c028e..0812928 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -638,11 +638,13 @@ public abstract class AbstractSTSClient implements
Configurable, InterceptorProv
EndpointInfo ei = service.getEndpointInfo(endpointName);
Endpoint endpoint = new EndpointImpl(bus, service, ei);
client = new ClientImpl(bus, endpoint);
-} else {
+} else if (location != null) {
Endpoint endpoint = STSUtils.createSTSEndpoint(bus, namespace,
null, location, soapVersion,
policy,
endpointName);
client = new ClientImpl(bus, endpoint);
+} else {
+throw new TrustException(LOG, NO_LOCATION);
}
client.getInFaultInterceptors().addAll(inFault);
http://git-wip-us.apache.org/repos/asf/cxf/blob/68372daf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
index d301c27..570dacd 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
@@ -27,3 +27,4 @@ VALIDATION_FAILED=Validation of security token failed: {0}
NO_USER_PASSWORD=No user name and/or password is available, name: {0},
password: {1}
ADDRESS_NOT_MATCHED=Cannot match the address {0} to the WSDL received via
WS-MEX
WS_MEX_ERROR=Exception when trying to retrieve/process a WSDL via WS-MEX
+NO_LOCATION=The STSClient is not configured with either a location or
wsdlLocation property
git commit: [CXFXJC-7] Make sure list types aren't instantiated.
Repository: cxf-xjc-utils
Updated Branches:
refs/heads/master 2d065ea5a - 2283c8d05
[CXFXJC-7] Make sure list types aren't instantiated.
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/2283c8d0
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/2283c8d0
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/2283c8d0
Branch: refs/heads/master
Commit: 2283c8d0588e8765bdfa74010e124eb40e3da2f2
Parents: 2d065ea
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 09:57:27 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 09:57:27 2014 -0400
--
.../src/test/resources/schemas/configuration/foo.xsd | 15 +++
.../org/apache/cxf/xjc/dv/DefaultValuePlugin.java| 10 +-
2 files changed, 24 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2283c8d0/dv-test/src/test/resources/schemas/configuration/foo.xsd
--
diff --git a/dv-test/src/test/resources/schemas/configuration/foo.xsd
b/dv-test/src/test/resources/schemas/configuration/foo.xsd
index 7256fbc..98d0633 100644
--- a/dv-test/src/test/resources/schemas/configuration/foo.xsd
+++ b/dv-test/src/test/resources/schemas/configuration/foo.xsd
@@ -133,4 +133,19 @@
xs:element name=fooElement type=tns:foo/
+
+ xs:element name=itemRedemption
+ xs:complexType
+ xs:sequence
+ xs:element name=userId type=xs:string /
+ xs:element name=redemptions maxOccurs=unbounded
type=tns:externalItem /
+/xs:sequence
+ /xs:complexType
+/xs:element
+
+xs:complexType name=externalItem
+ xs:sequence
+xs:element minOccurs=0 name=redemptionNumber type=xs:string /
+ /xs:sequence
+/xs:complexType
/xs:schema
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2283c8d0/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
--
diff --git a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
index a46ace0..fdd6e2e 100644
--- a/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
+++ b/dv/src/main/java/org/apache/cxf/xjc/dv/DefaultValuePlugin.java
@@ -133,6 +133,14 @@ public class DefaultValuePlugin {
throw new RuntimeException(e);
}
}
+private int getMaxOccurs(XSParticle particle) {
+try {
+Number o =
(Number)particle.getClass().getMethod(getMaxOccurs).invoke(particle);
+return o.intValue();
+} catch (Exception e) {
+throw new RuntimeException(e);
+}
+}
public boolean run(Outline outline, Options opt, ErrorHandler
errorHandler) {
if (!active) {
@@ -173,7 +181,7 @@ public class DefaultValuePlugin {
if (xsType != null
xsType.isComplexType()
((containsDefaultValue(outline, f) complexTypes)
-|| (particle != null getMinOccurs(particle) != 0)))
{
+|| (particle != null getMinOccurs(particle) != 0
getMaxOccurs(particle) == 1))) {
String varName = f.getPropertyInfo().getName(false);
JFieldVar var = co.implClass.fields().get(varName);
if (var != null) {
git commit: Fixing problem with IssuedToken policy validation
Repository: cxf
Updated Branches:
refs/heads/master 417d93849 - 60bad6d65
Fixing problem with IssuedToken policy validation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/60bad6d6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60bad6d6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60bad6d6
Branch: refs/heads/master
Commit: 60bad6d65fa8ef8b51f72304430cdbde478dd9f0
Parents: 417d938
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:01:54 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:01:54 2014 +0100
--
.../interceptors/IssuedTokenInterceptorProvider.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/60bad6d6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index c08a078..7f9fd85 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -558,9 +558,6 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
return;
}
-for (AssertionInfo ai : ais) {
-ai.setAsserted(true);
-}
IssuedToken itok =
(IssuedToken)ais.iterator().next().getAssertion();
assertIssuedToken(itok, aim);
@@ -569,7 +566,11 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
ListWSHandlerResult results =
CastUtils.cast((List?)message.get(WSHandlerConstants.RECV_RESULTS));
if (results != null results.size() 0) {
-parseHandlerResults(results.get(0), message, aim);
+parseHandlerResults(results.get(0), message, ais);
+}
+} else {
+for (AssertionInfo ai : ais) {
+ai.setAsserted(true);
}
}
}
@@ -578,15 +579,13 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
private void parseHandlerResults(
WSHandlerResult rResult,
Message message,
-AssertionInfoMap aim
+CollectionAssertionInfo issuedAis
) {
ListWSSecurityEngineResult signedResults =
WSSecurityUtil.fetchAllActionResults(rResult.getResults(),
WSConstants.SIGN);
IssuedTokenPolicyValidator issuedValidator =
new IssuedTokenPolicyValidator(signedResults, message);
-CollectionAssertionInfo issuedAis =
-NegotiationUtils.getAllAssertionsByLocalname(aim,
SPConstants.ISSUED_TOKEN);
for (SamlAssertionWrapper assertionWrapper :
findSamlTokenResults(rResult.getResults())) {
boolean valid = issuedValidator.validatePolicy(issuedAis,
assertionWrapper);
[3/3] git commit: Fixing STS build
Fixing STS build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce572e40
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce572e40
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce572e40
Branch: refs/heads/2.7.x-fixes
Commit: ce572e4094c960ed7c54ac7af08c89de08410446
Parents: 423cf0c
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:21:58 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:21:58 2014 +0100
--
services/sts/systests/advanced/pom.xml | 89 +--
.../sts/cross_domain/CrossDomainTest.java | 8 -
.../cxf/systest/sts/cross_domain/DoubleIt.wsdl | 159 ---
.../cxf/systest/sts/cross_domain/cxf-client.xml | 43 +
.../systest/sts/cross_domain/cxf-service.xml| 67
.../systest/sts/cross_domain/cxf-sts-saml1.xml | 92 ---
.../systest/sts/cross_domain/cxf-sts-saml2.xml | 83 --
.../cxf/systest/sts/issuer/IssuerTest.java | 10 +-
8 files changed, 4 insertions(+), 547 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/pom.xml
--
diff --git a/services/sts/systests/advanced/pom.xml
b/services/sts/systests/advanced/pom.xml
index 3e33159..4b47f94 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -67,8 +67,7 @@
version${project.version}/version
scopetest/scope
/dependency
-dependency
- HEAD
+ dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-ws-security/artifactId
version${project.version}/version
@@ -105,96 +104,12 @@
artifactIdhazelcast/artifactId
version${cxf.hazelcast.version}/version
/dependency
-===
-groupIdjunit/groupId
-artifactIdjunit/artifactId
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf.services.sts/groupId
-artifactIdcxf-services-sts-core/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-rt-transports-http-jetty/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-rt-rs-client/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-rt-frontend-jaxws/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-rt-ws-policy/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-rt-ws-security/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
+ dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-rt-ws-mex/artifactId
version${project.version}/version
scopetest/scope
/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-testutils/artifactId
-version${project.version}/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.bouncycastle/groupId
-artifactIdbcprov-jdk15on/artifactId
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.directory.server/groupId
-artifactIdapacheds-kerberos-shared/artifactId
-version1.5.7/version
-scopetest/scope
-/dependency
-dependency
-groupIdorg.apache.cxf/groupId
-artifactIdcxf-rt-databinding-jaxb/artifactId
-version${project.version}/version
-/dependency
-dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-jdk14/artifactId
-scoperuntime/scope
-/dependency
-dependency
-groupIdnet.sf.ehcache/groupId
-artifactIdehcache/artifactId
-version${cxf.ehcache.version}/version
-/dependency
-dependency
-groupIdorg.springframework.ldap/groupId
-artifactIdspring-ldap-core/artifactId
-
[2/3] git commit: Recording .gitmergeinfo Changes
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/423cf0c1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/423cf0c1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/423cf0c1 Branch: refs/heads/2.7.x-fixes Commit: 423cf0c13c74e6ba5453f775c7207ed11b70792d Parents: c394bd1 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Thu Jun 26 15:03:12 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Thu Jun 26 15:03:12 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/423cf0c1/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index f7f082a..a176f02 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1619,6 +1619,7 @@ M d96cfb8d8186e36da23410b83bbaefde3fbf31ad M da25b2af7780b39df7953026a83194aefb15a647 M da63682bc7776b57e79b949abe4ee75af8170017 M da66ca88de74811d9565566c232b002d39641a2d +M dae61118761f921691633ff61aaebae79601a8e9 M dbc2475e978173a8d024268cd5204817505d8777 M dbdeafa006f0d3b297a74e7bb9d78f2b5b47 M dbe7e5b4d5e32de6ee2aca00fae6f2b14e9832ca
[1/4] git commit: Avoiding NPE if either a location/wsdlLocation is not configured on the STSClient
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes ce572e409 - aaf7e6638
Avoiding NPE if either a location/wsdlLocation is not configured on the
STSClient
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0c0e20af
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0c0e20af
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0c0e20af
Branch: refs/heads/2.7.x-fixes
Commit: 0c0e20af7cbd57af64584535aa6312e1ec9fcb07
Parents: ce572e4
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 11:10:49 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:22:23 2014 +0100
--
.../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 4 +++-
.../java/org/apache/cxf/ws/security/trust/Messages.properties| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0c0e20af/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index f2cda23..68b36b6 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -638,11 +638,13 @@ public abstract class AbstractSTSClient implements
Configurable, InterceptorProv
EndpointInfo ei = service.getEndpointInfo(endpointName);
Endpoint endpoint = new EndpointImpl(bus, service, ei);
client = new ClientImpl(bus, endpoint);
-} else {
+} else if (location != null) {
Endpoint endpoint = STSUtils.createSTSEndpoint(bus, namespace,
null, location, soapVersion,
policy,
endpointName);
client = new ClientImpl(bus, endpoint);
+} else {
+throw new TrustException(LOG, NO_LOCATION);
}
client.getInFaultInterceptors().addAll(inFault);
http://git-wip-us.apache.org/repos/asf/cxf/blob/0c0e20af/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
index d301c27..570dacd 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
@@ -27,3 +27,4 @@ VALIDATION_FAILED=Validation of security token failed: {0}
NO_USER_PASSWORD=No user name and/or password is available, name: {0},
password: {1}
ADDRESS_NOT_MATCHED=Cannot match the address {0} to the WSDL received via
WS-MEX
WS_MEX_ERROR=Exception when trying to retrieve/process a WSDL via WS-MEX
+NO_LOCATION=The STSClient is not configured with either a location or
wsdlLocation property
[4/4] git commit: Fixing IssuedToken commit
Fixing IssuedToken commit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aaf7e663
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaf7e663
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaf7e663
Branch: refs/heads/2.7.x-fixes
Commit: aaf7e6638eba5d1c91f8e4f132ca9fc8b513914f
Parents: e01a6ce
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:27:30 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:27:30 2014 +0100
--
.../interceptors/IssuedTokenInterceptorProvider.java | 14 --
1 file changed, 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaf7e663/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 2c37826..9130a2d 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -544,13 +544,7 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
if (ais == null) {
return;
}
- HEAD
-===
-IssuedToken itok =
(IssuedToken)ais.iterator().next().getAssertion();
-assertIssuedToken(itok, aim);
-
- 60bad6d... Fixing problem with IssuedToken policy validation
if (!isRequestor(message)) {
message.getExchange().remove(SecurityConstants.TOKEN);
ListWSHandlerResult results =
@@ -559,10 +553,6 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
parseHandlerResults(results.get(0), message, ais);
}
} else {
-for (AssertionInfo ai : ais) {
-ai.setAsserted(true);
-}
-} else {
//client side should be checked on the way out
for (AssertionInfo ai : ais) {
ai.setAsserted(true);
@@ -581,10 +571,6 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
IssuedTokenPolicyValidator issuedValidator =
new IssuedTokenPolicyValidator(signedResults, message);
- HEAD
-CollectionAssertionInfo issuedAis =
aim.get(SP12Constants.ISSUED_TOKEN);
-===
- 60bad6d... Fixing problem with IssuedToken policy validation
for (AssertionWrapper assertionWrapper :
findSamlTokenResults(rResult.getResults())) {
boolean valid = issuedValidator.validatePolicy(issuedAis,
assertionWrapper);
[3/4] git commit: Recording .gitmergeinfo Changes
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/e01a6ce8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e01a6ce8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e01a6ce8 Branch: refs/heads/2.7.x-fixes Commit: e01a6ce8114dd1c0731a44b3f946f62113474ab9 Parents: b3cfe65 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Thu Jun 26 15:22:36 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Thu Jun 26 15:22:36 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e01a6ce8/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index a176f02..dcc1ef0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1364,6 +1364,7 @@ M 5ec1b6025d1fd35157b7ce862198c61a7810e499 M 5f9152b79faa7a49a1d82c864e7306dacba4321f M 6019486954e7e48efbd393f5fe1e7dcee3a2253c M 608b823b5eb576cca77e92ac6298ef63c6d65c99 +M 60bad6d65fa8ef8b51f72304430cdbde478dd9f0 M 60e570276804496f15e04f06ade2e9308ce04a08 M 61adb143a0f5930357140c0d470e9b44957107f4 M 61c94e87eb7328b7466c21e251d8c5eac0c84574
[2/4] git commit: Fixing problem with IssuedToken policy validation
Fixing problem with IssuedToken policy validation
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b3cfe659
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b3cfe659
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b3cfe659
Branch: refs/heads/2.7.x-fixes
Commit: b3cfe6594d7be3ddd0b914e29c5ada240f97fe59
Parents: 0c0e20a
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:01:54 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:22:36 2014 +0100
--
.../IssuedTokenInterceptorProvider.java | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b3cfe659/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 9d69d17..2c37826 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -544,12 +544,23 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
if (ais == null) {
return;
}
+ HEAD
+===
+
+IssuedToken itok =
(IssuedToken)ais.iterator().next().getAssertion();
+assertIssuedToken(itok, aim);
+
+ 60bad6d... Fixing problem with IssuedToken policy validation
if (!isRequestor(message)) {
message.getExchange().remove(SecurityConstants.TOKEN);
ListWSHandlerResult results =
CastUtils.cast((List?)message.get(WSHandlerConstants.RECV_RESULTS));
if (results != null results.size() 0) {
-parseHandlerResults(results.get(0), message, aim);
+parseHandlerResults(results.get(0), message, ais);
+}
+} else {
+for (AssertionInfo ai : ais) {
+ai.setAsserted(true);
}
} else {
//client side should be checked on the way out
@@ -563,14 +574,17 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
private void parseHandlerResults(
WSHandlerResult rResult,
Message message,
-AssertionInfoMap aim
+CollectionAssertionInfo issuedAis
) {
ListWSSecurityEngineResult signedResults =
WSS4JUtils.fetchAllActionResults(rResult.getResults(),
WSConstants.SIGN);
IssuedTokenPolicyValidator issuedValidator =
new IssuedTokenPolicyValidator(signedResults, message);
+ HEAD
CollectionAssertionInfo issuedAis =
aim.get(SP12Constants.ISSUED_TOKEN);
+===
+ 60bad6d... Fixing problem with IssuedToken policy validation
for (AssertionWrapper assertionWrapper :
findSamlTokenResults(rResult.getResults())) {
boolean valid = issuedValidator.validatePolicy(issuedAis,
assertionWrapper);
[2/3] git commit: Adding support for a cross-domain STS test
Adding support for a cross-domain STS test
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5ede8a9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5ede8a9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5ede8a9
Branch: refs/heads/2.7.x-fixes
Commit: c5ede8a9f93bf96d056b6ec34462a8e8c42c1a89
Parents: aaf7e66
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 13:48:07 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:27:58 2014 +0100
--
.../cxf/ws/security/SecurityConstants.java | 16 +++
.../apache/cxf/ws/security/trust/STSUtils.java | 113 +++
.../sts/cross_domain/CrossDomainTest.java | 3 +-
.../cxf/systest/sts/cross_domain/cxf-client.xml | 1 +
4 files changed, 131 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5ede8a9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 35d5698..e255d5a 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -435,6 +435,16 @@ public final class SecurityConstants {
ws-security.sts.disable-wsmex-call-using-epr-address;
/**
+ * Whether to prefer to use WS-MEX over a STSClient's
location/wsdlLocation properties
+ * when making an STS RequestSecurityToken call. This can be set to true
for the scenario
+ * of making a WS-MEX call to an initial STS, and using the returned token
to make another
+ * call to an STS (which is configured using the STSClient configuration).
Default is
+ * false.
+ */
+public static final String PREFER_WSMEX_OVER_STS_CLIENT_CONFIG =
+ws-security.sts.prefer-wsmex;
+
+/**
* Switch STS client to send Soap 1.2 messages
*/
public static final String STS_CLIENT_SOAP12_BINDING =
@@ -546,8 +556,14 @@ public final class SecurityConstants {
DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO,
STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS,
STS_TOKEN_ON_BEHALF_OF,
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
+ HEAD
ASYMMETRIC_SIGNATURE_ALGORITHM, ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE,
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT
+===
+ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
+SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
+CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
+ 417d938... Adding support for a cross-domain STS test
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5ede8a9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 2f418b7..e54545f 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -21,6 +21,8 @@ package org.apache.cxf.ws.security.trust;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
@@ -30,6 +32,7 @@ import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.EndpointImpl;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.service.Service;
@@ -88,6 +91,7 @@ public final class STSUtils {
}
public static STSClient getClient(Message message, String type,
IssuedToken itok) {
+ HEAD
STSClient client = (STSClient)message
[1/3] git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes aaf7e6638 - 67a6c11d4 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/4b77fdde Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4b77fdde Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4b77fdde Branch: refs/heads/2.7.x-fixes Commit: 4b77fddec1876f973784df2e0e87e2a1e5f6106b Parents: c5ede8a Author: Colm O hEigeartaigh cohei...@apache.org Authored: Thu Jun 26 15:27:58 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Thu Jun 26 15:27:58 2014 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4b77fdde/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index dcc1ef0..7da4abd 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1284,6 +1284,7 @@ M 3f927d153e06b47c5e3462a632dc308915af814f M 4052ba50657b9814a991b4c4b18ab31beea88fc2 M 412fcccef8cebaf94b8eebb827672add984ff47c M 415fc29334310285b25d2c9a59c2640ee56a5963 +M 417d9384948f93adcc0ce1c9f2786e8dcafa434d M 4199bf1c6cafedca459603cdc136c7d805226fc5 M 41d039fbd483609bac8837337c6c1b105c251459 M 424c55b1edc445f7cb9f0c69e483f0f16238f07e
[3/3] git commit: Fixing IssuedToken testcase
Fixing IssuedToken testcase
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67a6c11d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67a6c11d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67a6c11d
Branch: refs/heads/2.7.x-fixes
Commit: 67a6c11d4b2f9985c335b1147976b1a9042a689f
Parents: 4b77fdd
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:37:53 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 15:37:53 2014 +0100
--
.../cxf/ws/security/SecurityConstants.java | 6 ---
.../apache/cxf/ws/security/trust/STSUtils.java | 39 ++--
2 files changed, 3 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/67a6c11d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index e255d5a..dcf4a62 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -556,14 +556,8 @@ public final class SecurityConstants {
DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO,
STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS,
STS_TOKEN_ON_BEHALF_OF,
TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER,
SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND,
- HEAD
ASYMMETRIC_SIGNATURE_ALGORITHM, ENABLE_SAML_ONE_TIME_USE_CACHE,
SAML_ONE_TIME_USE_CACHE_INSTANCE,
-CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT
-===
-ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE,
ENABLE_SAML_ONE_TIME_USE_CACHE,
-SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY,
RETURN_SECURITY_ERROR,
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG
- 417d938... Adding support for a cross-domain STS test
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/67a6c11d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index e54545f..d91f6d7 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -48,6 +48,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.VersionTransformer;
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.policy.model.IssuedToken;
import org.apache.neethi.Policy;
@@ -91,42 +92,9 @@ public final class STSUtils {
}
public static STSClient getClient(Message message, String type,
IssuedToken itok) {
- HEAD
-STSClient client = (STSClient)message
-.getContextualProperty(SecurityConstants.STS_CLIENT);
-if (client == null) {
-if (type == null) {
-type = ;
-} else {
-type = . + type + -client;
-}
-client = new STSClient(message.getExchange().get(Bus.class));
-Endpoint ep = message.getExchange().get(Endpoint.class);
-client.setEndpointName(ep.getEndpointInfo().getName().toString() +
type);
-client.setBeanName(ep.getEndpointInfo().getName().toString() +
type);
-if (MessageUtils.getContextualBoolean(message,
SecurityConstants.STS_CLIENT_SOAP12_BINDING, false)) {
-client.setSoap12();
-}
-}
-
-if (client.getLocation() == null client.getWsdlLocation() == null
- itok != null itok.getIssuerEpr() != null) {
-EndpointReferenceType epr = itok.getIssuerEpr();
-//configure via mex
-boolean useEPRWSAAddrAsMEXLocation =
-!Boolean.valueOf((String)message.getContextualProperty(
-
SecurityConstants.DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS));
-client.configureViaEPR(epr, useEPRWSAAddrAsMEXLocation);
-===
// Find out first if we have an EPR to get the STS
git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 71c73e4a2 - 9085c8578 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/9085c857 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9085c857 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9085c857 Branch: refs/heads/2.6.x-fixes Commit: 9085c8578c026b0a7f41c2abdb2186ea2db389cd Parents: 71c73e4 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Thu Jun 26 16:06:04 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Thu Jun 26 16:06:04 2014 +0100 -- .gitmergeinfo | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/9085c857/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 40bb156..709ba2a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -299,6 +299,7 @@ B 415afeef4e5c143175fd9f975939245a9a46c418 B 41a1c6affb500e5a75d2cf67115fdc4db863d8f2 B 41c45daa5aaa78f05b8f975eb92f3975eb50606d B 41e11d892c3976d64a146b6a5489f5a303839d6f +B 423cf0c13c74e6ba5453f775c7207ed11b70792d B 4250e4ef65c5ab4f56967121dea02ca1ed631b01 B 4269d8245445cac23288f0044a3de2ca930f5383 B 426cc33b069f776956f47ae8f2dd476ba1bfc38c @@ -345,6 +346,7 @@ B 4ab70ced8a037666e9c6de658b9575d332dd192b B 4ac67cb41963b23d8874f1d7b883bb945f11943c B 4ae6bbc9304fb1dd17b0abd0ebfc8fb4ac259561 B 4b6f222592f16fc86006557ec0e045a8af1d953b +B 4b77fddec1876f973784df2e0e87e2a1e5f6106b B 4b8bbe90e5a7629709b027da711e0a82b87e9f70 B 4ba78268ef7a6424bec9a8733fb4fd886b833271 B 4bf1ec021bdae5d3df9acf3e7241750569e060e4 @@ -475,6 +477,7 @@ B 662fac4f8c3ca1f179fd75d191f4d2a3c93d5fdc B 664de175a2ad405a61d8bad7aeb5896c701d8f95 B 6695427fe785d38a0cdd1777cf84b9298b659a47 B 671b9fdc20c097ecc9d2b5b9daeb2e7a921f52ed +B 67a6c11d4b2f9985c335b1147976b1a9042a689f B 67db02a1887ea0c7a7d3559ae0fa93bb961bbc8a B 67ed8fbd40d0bfa1b374a441158e8812de879054 B 6845e30623259f0157de9efc2886ee8ae15cbc4e @@ -889,6 +892,7 @@ B c2c50191caf5a7e892bee26d9597652390618221 B c2c9ced19b5acab856e4ef81a2c9e62ca9e14c2d B c31a0c29f07eb66734cc0457130e655faf5248ec B c34f8d5737d77fc1f2e3926217799bbb499d4a0a +B c394bd1dbab8fbef94db1365db77feb486450513 B c3d45a7f2a13c0916cb3ae990dcb7aea8934944d B c3e4c694dce24504edf6a3a22650a0e162e163a3 B c448592ef62960ed158fb7b52d39bd8aeb150801 @@ -900,6 +904,7 @@ B c5317b52dd191fbed6a7331fac1febbfc7cd95df B c55dbb53258a2d13054508994ee352eddbe20e35 B c588595639854a8c4ff17a10741ad587834fae10 B c5a89b7c137566c045a0d13b62132e987ff81b52 +B c5ede8a9f93bf96d056b6ec34462a8e8c42c1a89 B c5ff01a14b9396336c4fe1b939bda7efdd896547 B c6060bf6efecffa40e462b24a99ce1f92a7780bc B c6878bb4ca69aa4cec4282133926ba6434d3d6be @@ -933,6 +938,7 @@ B cd16817a60b2464643cb6c5f50f6e261d1e0b54a B cd21b1c1b2885066d0169fab717b99713ae466ac B cd93bbe6a98ca8b8a4a8f005e533641812dd0281 B ce3285cf3b3d1096c9957164a647af815ad66730 +B ce572e4094c960ed7c54ac7af08c89de08410446 B ce5fa91f11cda1b12f77e011aff59f0ec5182b6b B ce7bb341aad782bd48ee255f8f28fec8b05b3130 B cec0ba1230d9540ec7a8caf2196c44ede1ee2a95 @@ -1014,6 +1020,7 @@ B df59b0005277bf4f232beb28da4b634721275b35 B df73b191b603f5b7a75da3c3f3b043dbff9d3222 B df909075ac5cb11fe993e2a3799e3290dd68e668 B df970c4a4023cdf6e1f1802e485e62f8f3caca12 +B e01a6ce8114dd1c0731a44b3f946f62113474ab9 B e027063c0d5bf5d2f64a08aa032d4320acaea15f B e03f1682952f02952df2a2a4766aad4989ad0732 B e05d81377e5a473a8cf5fe51674bda2c9c8d6246
[4/5] git commit: Recording .gitmergeinfo Changes
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/c632ec3e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c632ec3e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c632ec3e Branch: refs/heads/2.6.x-fixes Commit: c632ec3e8c8636824a7efe98fdd1d89d975dc16c Parents: 45c1a5c Author: Colm O hEigeartaigh cohei...@apache.org Authored: Thu Jun 26 16:06:44 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Thu Jun 26 16:06:44 2014 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c632ec3e/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 709ba2a..be5b77c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1168,6 +1168,7 @@ M 08b9bc0abbebf5d73fdb64bf179db21dedfe4946 M 0973f4f58e4f928d557340cc374364876acbee8d M 0af560bf08cf8f81f8df67d66129ef6f26cf7a6a M 0bd7c311f46a16d17e68e3d505cd04106feaa669 +M 0c0e20af7cbd57af64584535aa6312e1ec9fcb07 M 0c0ee62dc445ca2f18be30359259ea7352283c28 M 0c68ab6767f7f8b02e8f18b75b76c3ef014c243d M 0cdd009473b1cc8dd936e212672a180afdb5b37f @@ -1443,6 +1444,7 @@ M af72503cfd4f4d503168248524155c8b1b3c8a57 M afb0524fa8557cc4d47f480a4d3545ec3a7fcc6d M b1f9617a49526208dee679fd12ee2af5f2719bae M b2021ac991a0d7ac29a308de8bd503a10f71227d +M b3cfe6594d7be3ddd0b914e29c5ada240f97fe59 M b3f6dd19c3b1811746243e922df81a31e6968cc0 M b4f2c0db1b0723d3f622fd02994d4c7aa7f9a2b0 M b5dd92ea99a2a8fc3ae164ac1a66397e5615d6a9
[5/5] git commit: Fixing build
Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ef5d91a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ef5d91a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ef5d91a
Branch: refs/heads/2.6.x-fixes
Commit: 5ef5d91a8cb181dd532c8e83b53e7f8c3f272f5a
Parents: c632ec3
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 16:16:35 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 16:16:35 2014 +0100
--
.../java/org/apache/cxf/ws/security/trust/Messages.properties | 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ef5d91a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
index 94193fb..570dacd 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
@@ -25,9 +25,6 @@ DERIVED_KEY_ERROR=Exception while trying to create secret key
from RequestSecuri
ENCRYPTED_KEY_ERROR=Exception while trying to decrypt key from
RequestSecurityTokenResponse
VALIDATION_FAILED=Validation of security token failed: {0}
NO_USER_PASSWORD=No user name and/or password is available, name: {0},
password: {1}
- HEAD
-===
ADDRESS_NOT_MATCHED=Cannot match the address {0} to the WSDL received via
WS-MEX
WS_MEX_ERROR=Exception when trying to retrieve/process a WSDL via WS-MEX
NO_LOCATION=The STSClient is not configured with either a location or
wsdlLocation property
- 0c0e20a... Avoiding NPE if either a location/wsdlLocation is not
configured on the STSClient
[1/5] git commit: Avoiding NPE if either a location/wsdlLocation is not configured on the STSClient
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 9085c8578 - 5ef5d91a8
Avoiding NPE if either a location/wsdlLocation is not configured on the
STSClient
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/33d66d09
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/33d66d09
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/33d66d09
Branch: refs/heads/2.6.x-fixes
Commit: 33d66d09609196f763524474645e49e0d0136153
Parents: 9085c85
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 11:10:49 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 16:06:36 2014 +0100
--
.../org/apache/cxf/ws/security/trust/AbstractSTSClient.java| 4 +++-
.../java/org/apache/cxf/ws/security/trust/Messages.properties | 6 ++
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/33d66d09/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 5c7e711..5ce96c7 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -559,11 +559,13 @@ public abstract class AbstractSTSClient implements
Configurable, InterceptorProv
EndpointInfo ei = service.getEndpointInfo(endpointName);
Endpoint endpoint = new EndpointImpl(bus, service, ei);
client = new ClientImpl(bus, endpoint);
-} else {
+} else if (location != null) {
Endpoint endpoint = STSUtils.createSTSEndpoint(bus, namespace,
null, location, soapVersion,
policy,
endpointName);
client = new ClientImpl(bus, endpoint);
+} else {
+throw new TrustException(LOG, NO_LOCATION);
}
client.getInFaultInterceptors().addAll(inFault);
http://git-wip-us.apache.org/repos/asf/cxf/blob/33d66d09/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
index dddcc67..94193fb 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
@@ -25,3 +25,9 @@ DERIVED_KEY_ERROR=Exception while trying to create secret key
from RequestSecuri
ENCRYPTED_KEY_ERROR=Exception while trying to decrypt key from
RequestSecurityTokenResponse
VALIDATION_FAILED=Validation of security token failed: {0}
NO_USER_PASSWORD=No user name and/or password is available, name: {0},
password: {1}
+ HEAD
+===
+ADDRESS_NOT_MATCHED=Cannot match the address {0} to the WSDL received via
WS-MEX
+WS_MEX_ERROR=Exception when trying to retrieve/process a WSDL via WS-MEX
+NO_LOCATION=The STSClient is not configured with either a location or
wsdlLocation property
+ 0c0e20a... Avoiding NPE if either a location/wsdlLocation is not
configured on the STSClient
[2/5] git commit: Fixing problem with IssuedToken policy validation
Fixing problem with IssuedToken policy validation
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7c309b52
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7c309b52
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7c309b52
Branch: refs/heads/2.6.x-fixes
Commit: 7c309b52b8d42011cf47c9d76f3e292cf7caf64d
Parents: 33d66d0
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:01:54 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 16:06:40 2014 +0100
--
.../IssuedTokenInterceptorProvider.java | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7c309b52/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 2f5ab2e..fb6697b 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -498,12 +498,23 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
if (ais == null) {
return;
}
+ HEAD
+===
+
+IssuedToken itok =
(IssuedToken)ais.iterator().next().getAssertion();
+assertIssuedToken(itok, aim);
+
+ 60bad6d... Fixing problem with IssuedToken policy validation
if (!isRequestor(message)) {
message.getExchange().remove(SecurityConstants.TOKEN);
ListWSHandlerResult results =
CastUtils.cast((List?)message.get(WSHandlerConstants.RECV_RESULTS));
if (results != null results.size() 0) {
-parseHandlerResults(results.get(0), message, aim);
+parseHandlerResults(results.get(0), message, ais);
+}
+} else {
+for (AssertionInfo ai : ais) {
+ai.setAsserted(true);
}
} else {
//client side should be checked on the way out
@@ -517,7 +528,7 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
private void parseHandlerResults(
WSHandlerResult rResult,
Message message,
-AssertionInfoMap aim
+CollectionAssertionInfo issuedAis
) {
ListWSSecurityEngineResult signedResults = new
ArrayListWSSecurityEngineResult();
WSSecurityUtil.fetchAllActionResults(
@@ -526,7 +537,10 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
IssuedTokenPolicyValidator issuedValidator =
new IssuedTokenPolicyValidator(signedResults, message);
+ HEAD
CollectionAssertionInfo issuedAis =
aim.get(SP12Constants.ISSUED_TOKEN);
+===
+ 60bad6d... Fixing problem with IssuedToken policy validation
for (AssertionWrapper assertionWrapper :
findSamlTokenResults(rResult.getResults())) {
boolean valid = issuedValidator.validatePolicy(issuedAis,
assertionWrapper);
[3/5] git commit: Fixing IssuedToken commit
Fixing IssuedToken commit
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/45c1a5ca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/45c1a5ca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/45c1a5ca
Branch: refs/heads/2.6.x-fixes
Commit: 45c1a5ca5be23a7db38fb623b7e6f2d1933dd9e1
Parents: 7c309b5
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Thu Jun 26 15:27:30 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Thu Jun 26 16:06:43 2014 +0100
--
.../interceptors/IssuedTokenInterceptorProvider.java | 14 --
1 file changed, 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/45c1a5ca/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index fb6697b..35fb3aa 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -498,13 +498,7 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
if (ais == null) {
return;
}
- HEAD
-===
-IssuedToken itok =
(IssuedToken)ais.iterator().next().getAssertion();
-assertIssuedToken(itok, aim);
-
- 60bad6d... Fixing problem with IssuedToken policy validation
if (!isRequestor(message)) {
message.getExchange().remove(SecurityConstants.TOKEN);
ListWSHandlerResult results =
@@ -513,10 +507,6 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
parseHandlerResults(results.get(0), message, ais);
}
} else {
-for (AssertionInfo ai : ais) {
-ai.setAsserted(true);
-}
-} else {
//client side should be checked on the way out
for (AssertionInfo ai : ais) {
ai.setAsserted(true);
@@ -537,10 +527,6 @@ public class IssuedTokenInterceptorProvider extends
AbstractPolicyInterceptorPro
IssuedTokenPolicyValidator issuedValidator =
new IssuedTokenPolicyValidator(signedResults, message);
- HEAD
-CollectionAssertionInfo issuedAis =
aim.get(SP12Constants.ISSUED_TOKEN);
-===
- 60bad6d... Fixing problem with IssuedToken policy validation
for (AssertionWrapper assertionWrapper :
findSamlTokenResults(rResult.getResults())) {
boolean valid = issuedValidator.validatePolicy(issuedAis,
assertionWrapper);
git commit: [CXF-5311] Updating Base64Utility to support urlsafe mode and stream to OutputStream and JweOutputStream accordingly
Repository: cxf
Updated Branches:
refs/heads/master 60bad6d65 - 53270bde1
[CXF-5311] Updating Base64Utility to support urlsafe mode and stream to
OutputStream and JweOutputStream accordingly
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/53270bde
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53270bde
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53270bde
Branch: refs/heads/master
Commit: 53270bde15a66fbfbf3896ef398740400719f5d2
Parents: 60bad6d
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jun 26 16:49:15 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jun 26 16:49:15 2014 +0100
--
.../apache/cxf/common/util/Base64Utility.java | 147 ---
.../cxf/common/util/Base64UtilityTest.java | 10 ++
.../oauth2/jwe/AbstractJweEncryptor.java| 10 +-
.../security/oauth2/jwe/JweCompactProducer.java | 19 +++
.../rs/security/oauth2/jwe/JweOutputStream.java | 7 +-
.../security/oauth2/utils/Base64UrlUtility.java | 34 ++---
6 files changed, 174 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/53270bde/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
index c134fc8..1888d69 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
@@ -28,6 +28,9 @@ package org.apache.cxf.common.util;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.logging.Logger;
import org.apache.cxf.common.i18n.Message;
@@ -66,7 +69,9 @@ public final class Base64Utility {
'8', '9', '+', '/'
};
-// base 64 wadding
+private static final char[] BCS_URL_SAFE = Arrays.copyOf(BCS, BCS.length);
+
+// base 64 padding
private static final char PAD = '=';
// size of base 64 decode table
@@ -80,7 +85,9 @@ public final class Base64Utility {
private static final int PAD_SIZE4 = 2;
private static final int PAD_SIZE8 = 3;
-// class static intializer for building decode table
+private static final Charset CHARSET_UTF8 = Charset.forName(UTF-8);
+
+// class static initializer for building decode table
static {
for (int i = 0; i BDTSIZE; i++) {
BDT[i] = Byte.MAX_VALUE;
@@ -89,6 +96,9 @@ public final class Base64Utility {
for (int i = 0; i BCS.length; i++) {
BDT[BCS[i]] = (byte)i;
}
+
+BCS_URL_SAFE[62] = '-';
+BCS_URL_SAFE[63] = '_';
}
@@ -96,6 +106,8 @@ public final class Base64Utility {
//utility class, never constructed
}
+
+
/**
* The codedecode_chunk/code routine decodes a chunk of data
* into its native encoding.
@@ -173,6 +185,26 @@ public final class Base64Utility {
}
public static byte[] decode(String id) throws Base64Exception {
+return decode(id, false);
+}
+
+public static byte[] decode(String id, boolean urlSafe) throws
Base64Exception {
+if (urlSafe) {
+//TODO: optimize further
+id = id.replace(-, +).replace('_', '/');
+switch (id.length() % 4) {
+case 0:
+break;
+case 2:
+id += ==;
+break;
+case 3:
+id += =;
+break;
+default:
+throw new Base64Exception(new
Message(BASE64_RUNTIME_EXCEPTION, LOG));
+}
+}
try {
char[] cd = id.toCharArray();
return decodeChunk(cd, 0, cd.length);
@@ -214,6 +246,10 @@ public final class Base64Utility {
// Returns base64 representation of specified byte array.
//
public static String encode(byte[] id) {
+return encode(id, false);
+}
+
+public static String encode(byte[] id, boolean urlSafe) {
char[] cd = encodeChunk(id, 0, id.length);
return new String(cd, 0, cd.length);
}
@@ -223,6 +259,13 @@ public final class Base64Utility {
public static char[] encodeChunk(byte[] id,
int o,
int l) {
+return encodeChunk(id, o, l, false);
+}
+
+public static char[] encodeChunk(byte[] id,
+ int o,
+ int l,
+
[2/3] git commit: [CXF-5825] Fix the verbose logic in the tools
[CXF-5825] Fix the verbose logic in the tools
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f24a5bec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f24a5bec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f24a5bec
Branch: refs/heads/master
Commit: f24a5bec9d7236f9b4b7f208b1f570cdf0381a61
Parents: 53270bd
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:05:46 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 11:55:04 2014 -0400
--
core/src/main/java/org/apache/cxf/common/util/Compiler.java | 3 ---
.../src/main/java/org/apache/cxf/tools/common/ToolContext.java | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f24a5bec/core/src/main/java/org/apache/cxf/common/util/Compiler.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 1567b70..e0247d8 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -85,9 +85,6 @@ public class Compiler {
}
protected void addArgs(ListString list) {
-if (verbose) {
-list.add(-verbose);
-}
if (!StringUtils.isEmpty(encoding)) {
list.add(-encoding);
list.add(encoding);
http://git-wip-us.apache.org/repos/asf/cxf/blob/f24a5bec/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
--
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index 0e6ca33..c3535dc 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -160,11 +160,11 @@ public class ToolContext {
}
public boolean isVerbose() {
-Object verboseProperty = get(ToolConstants.CFG_VERBOSE);
+String verboseProperty = get(ToolConstants.CFG_VERBOSE, String.class);
if (verboseProperty == null) {
return false;
} else {
-return ToolConstants.CFG_VERBOSE.equals(verboseProperty);
+return ToolConstants.CFG_VERBOSE.equals(verboseProperty) ||
Boolean.parseBoolean(verboseProperty);
}
}
[4/4] git commit: Recording .gitmergeinfo Changes
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/f72da13c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f72da13c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f72da13c Branch: refs/heads/2.7.x-fixes Commit: f72da13cb5c5b41121fb32221d2c7f664c940dd7 Parents: 93e5d9f Author: Daniel Kulp dk...@apache.org Authored: Thu Jun 26 11:56:56 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Thu Jun 26 11:56:56 2014 -0400 -- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/f72da13c/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7da4abd..5948d58 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -911,6 +911,7 @@ B cbd81c955e5a1f6cef71fe53e088521cdf87c936 B cc0ba3f09068df3397adf5f7c55362bdffb96174 B cc5172ceaffb018e3852c9ae3d9e3487cb65d80e B cc674df55d596c8774d732ff537e490a159abfe5 +B cd058a9772ad8148cd4f67782f7692d9b4770b63 B cd3c7cd9e1deac5dfe8c7e01cfaded27b36734e4 B cd409578835e14f99fbea4d137f84262acce693f B cda59ba670339fe9a404b9e9f29ed891529ba187 @@ -1283,6 +1284,7 @@ M 3e3d4b800e7ce26c32028c1e661a15095a900a04 M 3f927d153e06b47c5e3462a632dc308915af814f M 4052ba50657b9814a991b4c4b18ab31beea88fc2 M 412fcccef8cebaf94b8eebb827672add984ff47c +M 4150c1dd1545fcc4f5d77cfb0d1a86dbea936ca7 M 415fc29334310285b25d2c9a59c2640ee56a5963 M 417d9384948f93adcc0ce1c9f2786e8dcafa434d M 4199bf1c6cafedca459603cdc136c7d805226fc5 @@ -1683,6 +1685,7 @@ M f0ee3631f57ef17b3f7749c35d437c0d9c67b6f3 M f1474c76a33a6d84d588b1138c9816480d3e66de M f179d14aa702fcc08e64fe773eac7f2218c13725 M f1c3bf9af13c5f25e0c354e6145731438aca089b +M f24a5bec9d7236f9b4b7f208b1f570cdf0381a61 M f2f957330bee46c0da7643504377163af212d118 M f37752a54a51861aacb1d27b91ba13af91b92c11 M f37eff902170f60b1b670700b9547d9540862a47
[2/4] git commit: [CXF-5825] Fix the verbose logic in the tools
[CXF-5825] Fix the verbose logic in the tools
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f83cb44
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f83cb44
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f83cb44
Branch: refs/heads/2.7.x-fixes
Commit: 6f83cb44f75093012bab9dbe6e5060fba8f25822
Parents: d4d674c
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:05:46 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 11:56:19 2014 -0400
--
api/src/main/java/org/apache/cxf/common/util/Compiler.java | 3 ---
.../src/main/java/org/apache/cxf/tools/common/ToolContext.java | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f83cb44/api/src/main/java/org/apache/cxf/common/util/Compiler.java
--
diff --git a/api/src/main/java/org/apache/cxf/common/util/Compiler.java
b/api/src/main/java/org/apache/cxf/common/util/Compiler.java
index 1567b70..e0247d8 100644
--- a/api/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/api/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -85,9 +85,6 @@ public class Compiler {
}
protected void addArgs(ListString list) {
-if (verbose) {
-list.add(-verbose);
-}
if (!StringUtils.isEmpty(encoding)) {
list.add(-encoding);
list.add(encoding);
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f83cb44/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
--
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index 0e6ca33..c3535dc 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -160,11 +160,11 @@ public class ToolContext {
}
public boolean isVerbose() {
-Object verboseProperty = get(ToolConstants.CFG_VERBOSE);
+String verboseProperty = get(ToolConstants.CFG_VERBOSE, String.class);
if (verboseProperty == null) {
return false;
} else {
-return ToolConstants.CFG_VERBOSE.equals(verboseProperty);
+return ToolConstants.CFG_VERBOSE.equals(verboseProperty) ||
Boolean.parseBoolean(verboseProperty);
}
}
[3/4] git commit: [CXF-5783] Fix client code generation
[CXF-5783] Fix client code generation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/93e5d9f8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/93e5d9f8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/93e5d9f8
Branch: refs/heads/2.7.x-fixes
Commit: 93e5d9f8f51f62ebe438e1023d62fa89a19ca9da
Parents: 6f83cb4
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:09:47 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 11:56:23 2014 -0400
--
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/93e5d9f8/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
--
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
index 1666ce0..f6dc7b4 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
@@ -77,7 +77,7 @@ public final class ${clientClassName} {
}
$service.Name ss = new ${service.Name}(wsdlURL, SERVICE_NAME);
-$intf.Name port = ss.get${port.Name}();
+$intf.Name port = ss.${port.MethodName}();
#foreach ($method in $intf.Methods)
{
[1/4] git commit: Allow setting the UseAsyn flag via a string to make it easier to set via spring/blueprint
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 67a6c11d4 - f72da13cb
Allow setting the UseAsyn flag via a string to make it easier to set via
spring/blueprint
Conflicts:
rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d4d674cb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d4d674cb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d4d674cb
Branch: refs/heads/2.7.x-fixes
Commit: d4d674cb26679597760e6275a43c53a702ba0ab9
Parents: 67a6c11
Author: Daniel Kulp dk...@apache.org
Authored: Fri Jun 20 12:31:33 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 11:56:09 2014 -0400
--
.../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d4d674cb/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 2712cfc..9855641 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -138,6 +138,9 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
if (o == null) {
o = factory.getUseAsyncPolicy();
}
+if (o instanceof String) {
+o = UseAsyncPolicy.valueOf(o.toString().toUpperCase());
+}
if (o instanceof UseAsyncPolicy) {
switch ((UseAsyncPolicy)o) {
case ALWAYS:
[3/3] git commit: We should NOT be keeping the runtime folders. Causes massive disk usage in target dir
We should NOT be keeping the runtime folders. Causes massive disk usage in
target dir
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cd058a97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cd058a97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cd058a97
Branch: refs/heads/master
Commit: cd058a9772ad8148cd4f67782f7692d9b4770b63
Parents: 1a8809a
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:25:58 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 11:55:05 2014 -0400
--
.../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/cd058a97/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
--
diff --git
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 4e144de..468f4cb 100644
---
a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++
b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -64,7 +64,6 @@ import static org.ops4j.pax.exam.CoreOptions.when;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
/**
*
@@ -113,7 +112,6 @@ public class CXFOSGiTestSupport {
.name(Apache Karaf)
.useDeployFolder(false)
.unpackDirectory(new File(target/paxexam/)),
- keepRuntimeFolder(),
features(cxfUrl, cxf-core, cxf-jaxws),
systemProperty(java.awt.headless).value(true),
when(localRepo != null)
[1/3] git commit: [CXF-5825] Fix the verbose logic in the tools
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 5ef5d91a8 - 3df773fdc
[CXF-5825] Fix the verbose logic in the tools
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f2bda48
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f2bda48
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f2bda48
Branch: refs/heads/2.6.x-fixes
Commit: 6f2bda483ffba734732de60628ce45d19ebaeda9
Parents: 5ef5d91
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:05:46 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 12:10:13 2014 -0400
--
api/src/main/java/org/apache/cxf/common/util/Compiler.java | 3 ---
.../src/main/java/org/apache/cxf/tools/common/ToolContext.java | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f2bda48/api/src/main/java/org/apache/cxf/common/util/Compiler.java
--
diff --git a/api/src/main/java/org/apache/cxf/common/util/Compiler.java
b/api/src/main/java/org/apache/cxf/common/util/Compiler.java
index 57aeaee..2fa4b21 100644
--- a/api/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/api/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -69,9 +69,6 @@ public class Compiler {
}
protected void addArgs(ListString list) {
-if (verbose) {
-list.add(-verbose);
-}
if (!StringUtils.isEmpty(encoding)) {
list.add(-encoding);
list.add(encoding);
http://git-wip-us.apache.org/repos/asf/cxf/blob/6f2bda48/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
--
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index 0e6ca33..c3535dc 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -160,11 +160,11 @@ public class ToolContext {
}
public boolean isVerbose() {
-Object verboseProperty = get(ToolConstants.CFG_VERBOSE);
+String verboseProperty = get(ToolConstants.CFG_VERBOSE, String.class);
if (verboseProperty == null) {
return false;
} else {
-return ToolConstants.CFG_VERBOSE.equals(verboseProperty);
+return ToolConstants.CFG_VERBOSE.equals(verboseProperty) ||
Boolean.parseBoolean(verboseProperty);
}
}
[2/3] git commit: [CXF-5783] Fix client code generation
[CXF-5783] Fix client code generation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/29b6bd0a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29b6bd0a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29b6bd0a
Branch: refs/heads/2.6.x-fixes
Commit: 29b6bd0a90dce881a201f0ceec5d006febfc2e16
Parents: 6f2bda4
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:09:47 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 12:10:16 2014 -0400
--
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/29b6bd0a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
--
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
index 1666ce0..f6dc7b4 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
@@ -77,7 +77,7 @@ public final class ${clientClassName} {
}
$service.Name ss = new ${service.Name}(wsdlURL, SERVICE_NAME);
-$intf.Name port = ss.get${port.Name}();
+$intf.Name port = ss.${port.MethodName}();
#foreach ($method in $intf.Methods)
{
[3/3] git commit: Recording .gitmergeinfo Changes
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/3df773fd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3df773fd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3df773fd Branch: refs/heads/2.6.x-fixes Commit: 3df773fdca372fca05eef60dc536999c7b7b5aa3 Parents: 29b6bd0 Author: Daniel Kulp dk...@apache.org Authored: Thu Jun 26 12:10:16 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Thu Jun 26 12:10:16 2014 -0400 -- .gitmergeinfo | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/3df773fd/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index be5b77c..ee74f4f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -121,6 +121,7 @@ B 18fb77d0040f363145e4e29c14bd3486471a997b B 19333e6ad33bc8070684f92212f49fe9cad5601f B 193848b290f9cc213293f9ad1f6a6ebffa496591 B 1986d0cf1a67d4c60742ad034b9c7274b9d8b266 +B 1a04b1c6a706cc4b6c2992cfa3be33e4a450b2ae B 1a233d97a4d0bc36b0d504da3831ba8eca849dcb B 1a5ec8ca715ce69187d288e817281ee52decde80 B 1a60a057ccb822558e62912c47c5fd95bdaff0ef @@ -312,6 +313,7 @@ B 43b14ae04361948bebc5dc63b8ecfab020927fa3 B 43f74bc07b043490649ad56e0f157779559ad3c3 B 4405c4b41e594a45606a98310196d1e3e8e3aa8c B 440642b8cb546fd3510f39032a693faff462fea6 +B 449255214716339a275f33656f149177f6def60d B 449abe830c52533e79035365a7126e87fc948fb5 B 44a589046eebe0c20c0c5557966ab9f695f19abb B 44d9a96049f4d98db75caa29354125dc99b60b5d @@ -350,6 +352,7 @@ B 4b77fddec1876f973784df2e0e87e2a1e5f6106b B 4b8bbe90e5a7629709b027da711e0a82b87e9f70 B 4ba78268ef7a6424bec9a8733fb4fd886b833271 B 4bf1ec021bdae5d3df9acf3e7241750569e060e4 +B 4d02e15acdd651acd16874afea8dc9459469cb0e B 4ddb76c33e9f46f042645edbeac95a016aa415f0 B 4de31b6f878b52bb5b5a3a5f80509927fcb5a0e5 B 4df9abc38ce4fb6f96f39c7665bf8fa9193e06df @@ -623,6 +626,7 @@ B 8850fd5795caf82667377848bbbd66c86d142afa B 88801791734d1674c1865de3557a4730262735ed B 888dd73fc73fbfe5e90a0fd7c3f9faf4bf387c29 B 889c2c3593773d4b26a3ee62b004792f3083da4d +B 88c98e8a3e300040007bc6552a2986b142204347 B 88f22b6c58766a5dc2ee9abd2c7dda188228a22f B 890389dd26ba329159841e18236e757929704b84 B 897b73a9c9a2d1fcc6978ddac79845341b79d4c9 @@ -838,6 +842,7 @@ B b5d3c8154057a45d2e0b15e80d2b639ca89ba524 B b5d74e98b4635a3feb3092e460babd496dd63dea B b5fa6478c64f0c50361408f99dd7b02a71004e0c B b612282510ceb074afef6094ac2a1467980dac16 +B b6436430930ef11460538270836fe6cd5aa1fabb B b8669c9a39b4d6c8e178fe0303afbaff92323735 B b86d56a10d41f3e470db2105775aec2b16178628 B b8700e9305c0e201ab694aecd0e1dcceb0cdc9a6 @@ -965,6 +970,7 @@ B d32a83895a9d5d643c2953f2d7e002113d57c459 B d3962f78c52bcee36bb14ca97bbe03f111367637 B d3aa4f3a09a8643d69cf7c1406e0d726e67e51c9 B d479c1b40f1f5d39d018cf808ebbdf7331c8f816 +B d4d674cb26679597760e6275a43c53a702ba0ab9 B d501a7707fe3b013c5a6d7e66d1c6f3fa6a59264 B d504ce8a300ab15d4dc768a12a2cb73d8e7507b7 B d524ecdc529792413504392dad4ab366352c6f2b @@ -1120,6 +1126,7 @@ B f67a10f1090a45825285ff8e368376117cb2bb9a B f69d44ebca26bc1ae9e173d9a7135cd847deeb37 B f6fba516e77d46c3c848dbafd1116d3621033e2c B f7165daa3c96fd3b9efea4a2c468e0e523edf01b +B f72da13cb5c5b41121fb32221d2c7f664c940dd7 B f76a1ffdb22d613e15395731003a975891f4a65f B f78aef598e4b525a75dbfd6c82e6a42856d76a88 B f7de9739c5d215ba2ef3265fb9f736bdd56c9c47
[1/3] git commit: [CXF-5783] Fix client code generation
Repository: cxf
Updated Branches:
refs/heads/master 53270bde1 - cd058a977
[CXF-5783] Fix client code generation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a8809a0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a8809a0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a8809a0
Branch: refs/heads/master
Commit: 1a8809a01df93eef947d69d740b921652b687c15
Parents: f24a5be
Author: Daniel Kulp dk...@apache.org
Authored: Thu Jun 26 11:09:47 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Thu Jun 26 11:55:04 2014 -0400
--
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a8809a0/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
--
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
index 1666ce0..f6dc7b4 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
@@ -77,7 +77,7 @@ public final class ${clientClassName} {
}
$service.Name ss = new ${service.Name}(wsdlURL, SERVICE_NAME);
-$intf.Name port = ss.get${port.Name}();
+$intf.Name port = ss.${port.MethodName}();
#foreach ($method in $intf.Methods)
{
git commit: [CXF-5827] Use only local name matching for inbound rpc/literal processing
Repository: cxf
Updated Branches:
refs/heads/master cd058a977 - bf8247f86
[CXF-5827] Use only local name matching for inbound rpc/literal processing
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf8247f8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf8247f8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf8247f8
Branch: refs/heads/master
Commit: bf8247f8640c59b6647e2dde0c5a142624afdd24
Parents: cd058a9
Author: Akitoshi Yoshida a...@apache.org
Authored: Thu Jun 26 21:54:15 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Thu Jun 26 21:54:15 2014 +0200
--
.../apache/cxf/binding/soap/interceptor/RPCInInterceptor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf8247f8/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index cd16a9c..37120a8 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -164,8 +164,9 @@ public class RPCInInterceptor extends
AbstractInDatabindingInterceptor {
partItr.hasNext()) {
part = partItr.next();
}
-
-if (!qn.equals(part.getConcreteName())) {
+
+// only check the localpart as explained above
+if
(!qn.getLocalPart().equals(part.getConcreteName().getLocalPart())) {
throw new Fault(
new org.apache.cxf.common.i18n.Message(
UNKNOWN_RPC_LIT_PART,
git commit: [CXF-5827] Use only local name matching for inbound rpc/literal processing
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes f72da13cb - a25efba08
[CXF-5827] Use only local name matching for inbound rpc/literal processing
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a25efba0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a25efba0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a25efba0
Branch: refs/heads/2.7.x-fixes
Commit: a25efba08960f2cbbe4be209bf7b1b3d8543c55b
Parents: f72da13
Author: Akitoshi Yoshida a...@apache.org
Authored: Thu Jun 26 21:54:15 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Thu Jun 26 21:55:24 2014 +0200
--
.../apache/cxf/binding/soap/interceptor/RPCInInterceptor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a25efba0/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index 8ec9949..fafd0a9 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -166,8 +166,9 @@ public class RPCInInterceptor extends
AbstractInDatabindingInterceptor {
partItr.hasNext()) {
part = partItr.next();
}
-
-if (!qn.equals(part.getConcreteName())) {
+
+// only check the localpart as explained above
+if
(!qn.getLocalPart().equals(part.getConcreteName().getLocalPart())) {
throw new Fault(
new org.apache.cxf.common.i18n.Message(
UNKNOWN_RPC_LIT_PART,
git commit: [CXF-5827] Use only local name matching for inbound rpc/literal processing
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 3df773fdc - 6af5dd43d
[CXF-5827] Use only local name matching for inbound rpc/literal processing
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6af5dd43
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6af5dd43
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6af5dd43
Branch: refs/heads/2.6.x-fixes
Commit: 6af5dd43d2aa810880fb03c890bf3f780bc73e7f
Parents: 3df773f
Author: Akitoshi Yoshida a...@apache.org
Authored: Thu Jun 26 21:54:15 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Thu Jun 26 22:05:04 2014 +0200
--
.../apache/cxf/binding/soap/interceptor/RPCInInterceptor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6af5dd43/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index a5893c4..76e8b49 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -166,8 +166,9 @@ public class RPCInInterceptor extends
AbstractInDatabindingInterceptor {
partItr.hasNext()) {
part = partItr.next();
}
-
-if (!qn.equals(part.getConcreteName())) {
+
+// only check the localpart as explained above
+if
(!qn.getLocalPart().equals(part.getConcreteName().getLocalPart())) {
throw new Fault(
new org.apache.cxf.common.i18n.Message(
UNKNOWN_RPC_LIT_PART,
git commit: Replacing a strong map of jaxrs context proxies with a weak hash map
Repository: cxf
Updated Branches:
refs/heads/master bf8247f86 - d012b94b9
Replacing a strong map of jaxrs context proxies with a weak hash map
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d012b94b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d012b94b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d012b94b
Branch: refs/heads/master
Commit: d012b94b94686dc98762b919a60b765be5b0b3df
Parents: bf8247f
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jun 26 22:00:56 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jun 26 22:00:56 2014 +0100
--
.../java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d012b94b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index 2770ef2..13113dd 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.WeakHashMap;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Context;
@@ -178,7 +178,7 @@ public abstract class AbstractResourceInfo {
property = bus.getProperty(prop);
if (property == null create) {
MapClass?, MapT, ThreadLocalProxy? map
-= new ConcurrentHashMapClass?, MapT,
ThreadLocalProxy?(2);
+= Collections.synchronizedMap(new WeakHashMapClass?,
MapT, ThreadLocalProxy?(2));
bus.setProperty(prop, map);
property = map;
}
@@ -199,7 +199,7 @@ public abstract class AbstractResourceInfo {
Object property = bus.getProperty(CONSTRUCTOR_PROXY_MAP);
if (property == null) {
MapClass?, MapClass?, ThreadLocalProxy? map
-= new ConcurrentHashMapClass?, MapClass?,
ThreadLocalProxy?(2);
+= Collections.synchronizedMap(new WeakHashMapClass?,
MapClass?, ThreadLocalProxy?(2));
bus.setProperty(CONSTRUCTOR_PROXY_MAP, map);
property = map;
}
git commit: [CXF-5826] making sure only setters are checked
Repository: cxf
Updated Branches:
refs/heads/master d012b94b9 - a1157adaf
[CXF-5826] making sure only setters are checked
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a1157ada
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a1157ada
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a1157ada
Branch: refs/heads/master
Commit: a1157adafdb757e461f5b696cc9bce46b2c96a4a
Parents: d012b94
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Jun 26 22:24:03 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Jun 26 22:24:03 2014 +0100
--
.../cxf/jaxrs/client/ClientProxyImpl.java | 22 +++-
1 file changed, 12 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a1157ada/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 91c7f0d..9faed5b 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -478,16 +478,18 @@ public class ClientProxyImpl extends AbstractClient
implements
MapString, BeanPair values = new HashMapString, BeanPair();
for (Method m : bean.getClass().getMethods()) {
-Annotation annotation = m.getAnnotation(annClass);
-if (annotation != null) {
-try {
-String propertyName = m.getName().substring(3);
-Method getter = bean.getClass().getMethod(get +
propertyName, new Class[]{});
-Object value = getter.invoke(bean, new Object[]{});
-String annotationValue =
AnnotationUtils.getAnnotationValue(annotation);
-values.put(annotationValue, new BeanPair(value,
m.getParameterAnnotations()[0]));
-} catch (Throwable t) {
-// ignore
+if (m.getName().startsWith(set)) {
+Annotation annotation = m.getAnnotation(annClass);
+if (annotation != null) {
+try {
+String propertyName = m.getName().substring(3);
+Method getter = bean.getClass().getMethod(get +
propertyName, new Class[]{});
+Object value = getter.invoke(bean, new Object[]{});
+String annotationValue =
AnnotationUtils.getAnnotationValue(annotation);
+values.put(annotationValue, new BeanPair(value,
m.getParameterAnnotations()[0]));
+} catch (Throwable t) {
+// ignore
+}
}
}
}
git commit: Add WS-MakeConnection 1.1 basic policy handling; fix WS-I RSP policy handling.
Repository: cxf
Updated Branches:
refs/heads/master a1157adaf - e0a449ec7
Add WS-MakeConnection 1.1 basic policy handling; fix WS-I RSP policy
handling.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e0a449ec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0a449ec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0a449ec
Branch: refs/heads/master
Commit: e0a449ec78e933b8edbb5cc78d028a2cc6111cb2
Parents: a1157ad
Author: dsosnoski dsosno...@apache.org
Authored: Fri Jun 27 12:52:07 2014 +1200
Committer: dsosnoski dsosno...@apache.org
Committed: Fri Jun 27 12:55:54 2014 +1200
--
rt/ws/rm/pom.xml| 8 +++
rt/ws/rm/src/main/build-resources/catalog.cat | 1 +
.../cxf/ws/rm/policy/MC11AssertionBuilder.java | 64
.../cxf/ws/rm/policy/MC11PolicyLoader.java | 64
.../rm/policy/RMPolicyInterceptorProvider.java | 9 ++-
.../cxf/ws/rm/policy/RSPPolicyLoader.java | 63 +++
.../resources/META-INF/cxf/bus-extensions.txt | 3 +-
.../main/resources/schemas/wsdl/wsmc-1.1.xjb| 36 +++
.../main/resources/schemas/wsdl/wsmc-1.1.xsd| 37 +++
9 files changed, 281 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0a449ec/rt/ws/rm/pom.xml
--
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index ca33bf8..70d122d 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -171,6 +171,14 @@
/deleteDirs
/xsdOption
xsdOption
+
xsd${basedir}/src/main/resources/schemas/wsdl/wsmc-1.1.xsd/xsd
+
bindingFile${basedir}/src/main/resources/schemas/wsdl/wsmc-1.1.xjb/bindingFile
+
catalog${basedir}/src/main/build-resources/catalog.cat/catalog
+deleteDirs
+
deleteDir${basedir}/target/generated/src/main/java/org/apache/cxf/ws/addressing/deleteDir
+/deleteDirs
+/xsdOption
+xsdOption
xsd${basedir}/src/main/resources/schemas/configuration/wsrm-manager-types.xsd/xsd
bindingFile${basedir}/src/main/resources/schemas/configuration/wsrm-policy.xjb/bindingFile
catalog${basedir}/src/main/build-resources/catalog.cat/catalog
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0a449ec/rt/ws/rm/src/main/build-resources/catalog.cat
--
diff --git a/rt/ws/rm/src/main/build-resources/catalog.cat
b/rt/ws/rm/src/main/build-resources/catalog.cat
index 19d8362..9ac8f34 100644
--- a/rt/ws/rm/src/main/build-resources/catalog.cat
+++ b/rt/ws/rm/src/main/build-resources/catalog.cat
@@ -23,6 +23,7 @@ SYSTEM http://schemas.xmlsoap.org/ws/2004/08/addressing;
../../../../../../cor
SYSTEM http://www.w3.org/2006/03/addressing/ws-addr.xsd;
../../../../../../core/src/main/resources/schemas/wsdl/ws-addr.xsd
SYSTEM http://docs.oasis-open.org/ws-rx/wsrm/200702;
../resources/schemas/wsdl/wsrm-1.1.xsd
+SYSTEM http://docs.oasis-open.org/ws-rx/wsmc/200702;
../resources/schemas/wsdl/wsmc-1.1.xsd
SYSTEM http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd;
../resources/schemas/configuration/wsrm-policy.xsd
SYSTEM http://docs.oasis-open.org/ws-rx/wsrmp/200702;
../resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0a449ec/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/MC11AssertionBuilder.java
--
diff --git
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/MC11AssertionBuilder.java
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/MC11AssertionBuilder.java
new file mode 100644
index 000..37a5982
--- /dev/null
+++
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/MC11AssertionBuilder.java
@@ -0,0 +1,64 @@
+/**
+ * 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
