cxf git commit: [CXF-6131] Minor updates
Repository: cxf
Updated Branches:
refs/heads/master 25d92ab9b - 29f0620a9
[CXF-6131] Minor updates
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/29f0620a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29f0620a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29f0620a
Branch: refs/heads/master
Commit: 29f0620a9a025afcd2057cdf97c7d93caf6c179f
Parents: 25d92ab
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 10:56:45 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 10:56:45 2014 +
--
.../apache/cxf/common/util/SpringClasspathScanner.java| 3 +++
.../spring/JAXRSServerFactoryBeanDefinitionParser.java| 10 +-
2 files changed, 4 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/29f0620a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
--
diff --git
a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
index ce4dd7f..de9369e 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
@@ -165,6 +165,9 @@ class SpringClasspathScanner extends ClasspathScanner {
//in OSGi should use spring-dm OsgiBundleResourcePatternResolver
// which can handle bundle url
Bundle bundle = null;
+if (loader == null) {
+loader = Thread.currentThread().getContextClassLoader();
+}
if (loader instanceof BundleDelegatingClassLoader) {
bundle = ((BundleDelegatingClassLoader)loader).getBundle();
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/29f0620a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index e17bd1a..7f15346 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -21,7 +21,6 @@ package org.apache.cxf.jaxrs.spring;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -32,7 +31,6 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
-import org.apache.cxf.bus.osgi.CXFActivator;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
import org.apache.cxf.common.util.ClasspathScanner;
import org.apache.cxf.common.util.StringUtils;
@@ -194,14 +192,8 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
try {
if (basePackages != null) {
-//if run CXF in OSGi, we should pass in the classloader
associated with
-//the bundle which has JAXRS resources under a certain
basePackages
-ClassLoader loader =
Thread.currentThread().getContextClassLoader();
final Map Class ? extends Annotation , Collection
Class ?classes =
-CXFActivator.isInOSGi()
-? ClasspathScanner.findClasses(
- basePackages, Arrays.asList(Provider.class,
Path.class), loader)
-: ClasspathScanner.findClasses(basePackages,
Provider.class, Path.class);
+ClasspathScanner.findClasses(basePackages,
Provider.class, Path.class);
this.setProviders(createBeans(classes.get(Provider.class)));
this.setServiceBeans(createBeans(classes.get(Path.class)));
[2/2] cxf git commit: Adding Kerberos STS test
Adding Kerberos STS test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/89dda2e8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/89dda2e8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/89dda2e8
Branch: refs/heads/master
Commit: 89dda2e87d6e3daf3977f26cffdf67e81597f362
Parents: 29f0620
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Dec 3 10:49:29 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Dec 3 11:35:07 2014 +
--
systests/kerberos/pom.xml | 5 +
.../common/KeystorePasswordCallback.java| 3 +
.../kerberos/common/SecurityTestUtil.java | 22 ++
.../wssec/kerberos/KerberosTokenTest.java | 71 -
.../systest/kerberos/wssec/sts/STSServer.java | 50 +++
.../kerberos/wssec/sts/StaxSTSServer.java | 50 +++
.../test/resources/clientKeystore.properties| 24 ++
.../kerberos/src/test/resources/clientstore.jks | Bin 0 - 4436 bytes
.../wssec/kerberos/DoubleItKerberos.wsdl| 92 +-
.../systest/kerberos/wssec/kerberos/server.xml | 24 ++
.../kerberos/wssec/kerberos/sts-client.xml | 71 +
.../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 101 ++
.../systest/kerberos/wssec/sts/stax-cxf-sts.xml | 106 ++
.../wssec/sts/ws-trust-1.4-service.wsdl | 319 +++
.../test/resources/serviceKeystore.properties | 24 ++
.../src/test/resources/servicestore.jks | Bin 0 - 3350 bytes
.../src/test/resources/stsKeystore.properties | 23 ++
.../kerberos/src/test/resources/stsstore.jks| Bin 0 - 3978 bytes
18 files changed, 983 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/89dda2e8/systests/kerberos/pom.xml
--
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index 2aedb2d..0356ee9 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -143,6 +143,11 @@
version${project.version}/version
/dependency
dependency
+groupIdorg.apache.cxf.services.sts/groupId
+artifactIdcxf-services-sts-core/artifactId
+version${project.version}/version
+/dependency
+dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-testutils/artifactId
version${project.version}/version
http://git-wip-us.apache.org/repos/asf/cxf/blob/89dda2e8/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
--
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
index 0bada6a..3cc798b 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
@@ -45,6 +45,9 @@ public class KeystorePasswordCallback implements
CallbackHandler {
passwords.put(abcd, dcba);
passwords.put(6e0e88f36ebb8744d470f62f604d03ea4ebe5094, password);
passwords.put(wss40rev, security);
+passwords.put(myclientkey, ckpass);
+passwords.put(myservicekey, skpass);
+passwords.put(mystskey, stskpass);
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/89dda2e8/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
--
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
index d2af280..059d535 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
@@ -26,6 +26,7 @@ import javax.crypto.spec.SecretKeySpec;
import javax.xml.ws.BindingProvider;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
/**
@@ -88,4 +89,25 @@ public final class SecurityTestUtil {
);
}
+public static void updateSTSPort(BindingProvider p, String port) {
+STSClient stsClient =
(STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+if (stsClient != null) {
+String location = stsClient.getWsdlLocation();
+
[1/2] cxf git commit: Some more kerberos stuff
Repository: cxf
Updated Branches:
refs/heads/master 29f0620a9 - 6233ee16b
Some more kerberos stuff
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6233ee16
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6233ee16
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6233ee16
Branch: refs/heads/master
Commit: 6233ee16bd88430f18e60f1733d0a89472b83a76
Parents: 89dda2e
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Dec 3 11:34:50 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Dec 3 11:35:07 2014 +
--
services/sts/systests/advanced/pom.xml | 6 -
.../systest/sts/kerberos/KerberosTokenTest.java | 137 ---
.../cxf/systest/sts/kerberos/cxf-client.xml | 67 -
.../wssec/kerberos/KerberosTokenTest.java | 8 +-
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 6 +-
5 files changed, 7 insertions(+), 217 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6233ee16/services/sts/systests/advanced/pom.xml
--
diff --git a/services/sts/systests/advanced/pom.xml
b/services/sts/systests/advanced/pom.xml
index 385e53a..cae3751 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -90,12 +90,6 @@
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
http://git-wip-us.apache.org/repos/asf/cxf/blob/6233ee16/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
--
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
deleted file mode 100644
index 2227056..000
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.sts.kerberos;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.sts.common.SecurityTestUtil;
-import org.apache.cxf.systest.sts.common.TestParam;
-import org.apache.cxf.systest.sts.common.TokenTestUtils;
-import org.apache.cxf.systest.sts.deployment.STSServer;
-import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.example.contract.doubleit.DoubleItPortType;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * In this test, a CXF client requests a SAML2 HOK Assertion from the STS,
which has a policy of requiring
- * a KerberosToken over the TransportBinding. The CXF client retrieves a
service ticket from the KDC and
- * inserts it into the security header of the request. The STS validates the
ticket using the
- * KerberosTokenValidator.
- *
- * The tests are @Ignored by default, as a KDC is needed. To replicate the
test scenario, set up a KDC with
- * user principal alice (keytab in /etc/alice.keytab), and host service
b...@service.ws.apache.org
- * (keytab in /etc/bob.keytab).
- */
-@RunWith(value = org.junit.runners.Parameterized.class)
-@org.junit.Ignore
-public class
[1/2] cxf git commit: Adding Kerberos STS test
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 4daa8a05d - 892913e71
Adding Kerberos STS test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1314a594
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1314a594
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1314a594
Branch: refs/heads/3.0.x-fixes
Commit: 1314a594481392384c9fbd83040697f3492f05b2
Parents: 4daa8a0
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Dec 3 10:49:29 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Dec 3 11:36:06 2014 +
--
systests/kerberos/pom.xml | 5 +
.../common/KeystorePasswordCallback.java| 3 +
.../kerberos/common/SecurityTestUtil.java | 22 ++
.../wssec/kerberos/KerberosTokenTest.java | 71 -
.../systest/kerberos/wssec/sts/STSServer.java | 50 +++
.../kerberos/wssec/sts/StaxSTSServer.java | 50 +++
.../test/resources/clientKeystore.properties| 24 ++
.../kerberos/src/test/resources/clientstore.jks | Bin 0 - 4436 bytes
.../wssec/kerberos/DoubleItKerberos.wsdl| 92 +-
.../systest/kerberos/wssec/kerberos/server.xml | 24 ++
.../kerberos/wssec/kerberos/sts-client.xml | 71 +
.../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 101 ++
.../systest/kerberos/wssec/sts/stax-cxf-sts.xml | 106 ++
.../wssec/sts/ws-trust-1.4-service.wsdl | 319 +++
.../test/resources/serviceKeystore.properties | 24 ++
.../src/test/resources/servicestore.jks | Bin 0 - 3350 bytes
.../src/test/resources/stsKeystore.properties | 23 ++
.../kerberos/src/test/resources/stsstore.jks| Bin 0 - 3978 bytes
18 files changed, 983 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1314a594/systests/kerberos/pom.xml
--
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index e5bc330..622517f 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -143,6 +143,11 @@
version${project.version}/version
/dependency
dependency
+groupIdorg.apache.cxf.services.sts/groupId
+artifactIdcxf-services-sts-core/artifactId
+version${project.version}/version
+/dependency
+dependency
groupIdorg.apache.cxf/groupId
artifactIdcxf-testutils/artifactId
version${project.version}/version
http://git-wip-us.apache.org/repos/asf/cxf/blob/1314a594/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
--
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
index 0bada6a..3cc798b 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
@@ -45,6 +45,9 @@ public class KeystorePasswordCallback implements
CallbackHandler {
passwords.put(abcd, dcba);
passwords.put(6e0e88f36ebb8744d470f62f604d03ea4ebe5094, password);
passwords.put(wss40rev, security);
+passwords.put(myclientkey, ckpass);
+passwords.put(myservicekey, skpass);
+passwords.put(mystskey, stskpass);
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/1314a594/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
--
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
index d2af280..059d535 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
@@ -26,6 +26,7 @@ import javax.crypto.spec.SecretKeySpec;
import javax.xml.ws.BindingProvider;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
/**
@@ -88,4 +89,25 @@ public final class SecurityTestUtil {
);
}
+public static void updateSTSPort(BindingProvider p, String port) {
+STSClient stsClient =
(STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+if
[2/2] cxf git commit: Some more kerberos stuff
Some more kerberos stuff
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/892913e7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/892913e7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/892913e7
Branch: refs/heads/3.0.x-fixes
Commit: 892913e71e5bed58419c953ca551a3d13bd7b22d
Parents: 1314a59
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Dec 3 11:34:50 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Dec 3 11:36:07 2014 +
--
services/sts/systests/advanced/pom.xml | 6 -
.../systest/sts/kerberos/KerberosTokenTest.java | 137 ---
.../cxf/systest/sts/kerberos/cxf-client.xml | 67 -
.../wssec/kerberos/KerberosTokenTest.java | 8 +-
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 6 +-
5 files changed, 7 insertions(+), 217 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/892913e7/services/sts/systests/advanced/pom.xml
--
diff --git a/services/sts/systests/advanced/pom.xml
b/services/sts/systests/advanced/pom.xml
index 446c21f..8af3813 100644
--- a/services/sts/systests/advanced/pom.xml
+++ b/services/sts/systests/advanced/pom.xml
@@ -90,12 +90,6 @@
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
http://git-wip-us.apache.org/repos/asf/cxf/blob/892913e7/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
--
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
deleted file mode 100644
index 2227056..000
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.sts.kerberos;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.sts.common.SecurityTestUtil;
-import org.apache.cxf.systest.sts.common.TestParam;
-import org.apache.cxf.systest.sts.common.TokenTestUtils;
-import org.apache.cxf.systest.sts.deployment.STSServer;
-import org.apache.cxf.systest.sts.deployment.StaxSTSServer;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.example.contract.doubleit.DoubleItPortType;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * In this test, a CXF client requests a SAML2 HOK Assertion from the STS,
which has a policy of requiring
- * a KerberosToken over the TransportBinding. The CXF client retrieves a
service ticket from the KDC and
- * inserts it into the security header of the request. The STS validates the
ticket using the
- * KerberosTokenValidator.
- *
- * The tests are @Ignored by default, as a KDC is needed. To replicate the
test scenario, set up a KDC with
- * user principal alice (keytab in /etc/alice.keytab), and host service
b...@service.ws.apache.org
- * (keytab in /etc/bob.keytab).
- */
-@RunWith(value = org.junit.runners.Parameterized.class)
-@org.junit.Ignore
-public class KerberosTokenTest extends AbstractBusClientServerTestBase {
-
-static final
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes fe7082617 - f82f08b17 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/f82f08b1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f82f08b1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f82f08b1 Branch: refs/heads/2.7.x-fixes Commit: f82f08b171a1d91f61f6dc95f44810d3af3c99c7 Parents: fe70826 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Wed Dec 3 11:43:26 2014 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Wed Dec 3 11:43:26 2014 + -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/f82f08b1/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index a00996f..470b255 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -126,6 +126,7 @@ B 12d19ffe7af4b18472aa571c5bb9531c8a68e9b0 B 12e8613a90c00b8d34cf624003e7549423639e2b B 12eda4f03c46507e78ffc78b0fb1b8f4b5726efa B 12ee3fb1475d16010a6df3b0580c0f67b893d511 +B 1314a594481392384c9fbd83040697f3492f05b2 B 133b213787c6e83d094d6ab67a4888aa095861ce B 1353a31981751cc4b66242db5ff425275bb04ec3 B 13b02383a3590149174d0f22bd07853d5cf31a03 @@ -896,6 +897,7 @@ B 885290da4c6f3c8426b1453903cb9308e44eed05 B 885d450243af92377f0d83d90c7a9dae124a4d2d B 887d71995728dbd2365017e17226fa457b5d6847 B 888bfa0ee1fcb1c649b8af7291bad431bb3f9474 +B 892913e71e5bed58419c953ca551a3d13bd7b22d B 893263d9f832d052c396d3532784c667c60c5037 B 89824150b76cd12324c8bac50964dd79293eafbb B 8a49565e6a27aaf9a023ceec99851bffdc280fc8
cxf git commit: [CXF-6121] Extending JAX-RS Spring parser to support an annotation based filtering of the resources, modified patch from Thorsten Hoeger applied
Repository: cxf
Updated Branches:
refs/heads/master 6233ee16b - 50f5cd8c3
[CXF-6121] Extending JAX-RS Spring parser to support an annotation based
filtering of the resources, modified patch from Thorsten Hoeger applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/50f5cd8c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/50f5cd8c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/50f5cd8c
Branch: refs/heads/master
Commit: 50f5cd8c3b7c6d174f59ee111646f2625b890a00
Parents: 6233ee1
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 12:17:57 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 12:17:57 2014 +
--
.../JAXRSServerFactoryBeanDefinitionParser.java | 60
.../jaxrs/src/main/resources/schemas/jaxrs.xsd | 1 +
2 files changed, 50 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/50f5cd8c/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 7f15346..e6f33ce 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -32,6 +33,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.ClasspathScanner;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
@@ -78,6 +80,8 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
bean.addPropertyValue(name, q);
} else if (basePackages.equals(name)) {
bean.addPropertyValue(basePackages,
ClasspathScanner.parsePackages(val));
+} else if (serviceAnnotation.equals(name)) {
+bean.addPropertyValue(serviceAnnotation, val);
} else {
mapToProperty(bean, name, val);
}
@@ -151,6 +155,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
private ListSpringResourceFactory tempFactories;
private ListString basePackages;
+private String serviceAnnotation;
private ApplicationContext context;
public SpringJAXRSServerFactoryBean() {
super();
@@ -171,6 +176,10 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
this.basePackages = basePackages;
}
+public void setServiceAnnotation(String serviceAnnotation) {
+this.serviceAnnotation = serviceAnnotation;
+}
+
public void setTempResourceProviders(ListSpringResourceFactory
providers) {
tempFactories = providers;
}
@@ -189,29 +198,58 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
tempFactories.clear();
super.setResourceProviders(factories);
}
-
-try {
-if (basePackages != null) {
+Class? extends Annotation serviceAnnotationClass =
loadServiceAnnotationClass();
+if (basePackages != null) {
+try {
final Map Class ? extends Annotation , Collection
Class ?classes =
ClasspathScanner.findClasses(basePackages,
Provider.class, Path.class);
-
this.setProviders(createBeans(classes.get(Provider.class)));
-this.setServiceBeans(createBeans(classes.get(Path.class)));
+
this.setServiceBeans(createBeansFromDiscoveredClasses(classes.get(Path.class),
+
serviceAnnotationClass));
+
this.setProviders(createBeansFromDiscoveredClasses(classes.get(Provider.class),
+
serviceAnnotationClass));
+} catch
cxf git commit: [CXF-6121] Extending JAX-RS Spring parser to support an annotation based filtering of the resources, modified patch from Thorsten Hoeger applied
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 892913e71 - 6c9dab7e7
[CXF-6121] Extending JAX-RS Spring parser to support an annotation based
filtering of the resources, modified patch from Thorsten Hoeger applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c9dab7e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c9dab7e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c9dab7e
Branch: refs/heads/3.0.x-fixes
Commit: 6c9dab7e7120d4e880af8e6e8fcacb153487366e
Parents: 892913e
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 12:17:57 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 12:21:42 2014 +
--
.../JAXRSServerFactoryBeanDefinitionParser.java | 56
.../jaxrs/src/main/resources/schemas/jaxrs.xsd | 1 +
2 files changed, 48 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6c9dab7e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 4ab0137..f786c28 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -32,6 +33,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.ClasspathScanner;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
@@ -78,6 +80,8 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
bean.addPropertyValue(name, q);
} else if (basePackages.equals(name)) {
bean.addPropertyValue(basePackages,
ClasspathScanner.parsePackages(val));
+} else if (serviceAnnotation.equals(name)) {
+bean.addPropertyValue(serviceAnnotation, val);
} else {
mapToProperty(bean, name, val);
}
@@ -151,6 +155,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
private ListSpringResourceFactory tempFactories;
private ListString basePackages;
+private String serviceAnnotation;
private ApplicationContext context;
public SpringJAXRSServerFactoryBean() {
super();
@@ -171,6 +176,10 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
this.basePackages = basePackages;
}
+public void setServiceAnnotation(String serviceAnnotation) {
+this.serviceAnnotation = serviceAnnotation;
+}
+
public void setTempResourceProviders(ListSpringResourceFactory
providers) {
tempFactories = providers;
}
@@ -189,30 +198,59 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
tempFactories.clear();
super.setResourceProviders(factories);
}
-
+Class? extends Annotation serviceAnnotationClass =
loadServiceAnnotationClass();
try {
if (basePackages != null) {
@SuppressWarnings(unchecked)
final Map Class ? extends Annotation , Collection
Class ?classes =
ClasspathScanner.findClasses(basePackages,
Provider.class, Path.class);
-
this.setProviders(createBeans(classes.get(Provider.class)));
-this.setServiceBeans(createBeans(classes.get(Path.class)));
+
this.setServiceBeans(createBeansFromDiscoveredClasses(classes.get(Path.class),
+
serviceAnnotationClass));
+
this.setProviders(createBeansFromDiscoveredClasses(classes.get(Provider.class),
+
serviceAnnotationClass));
+} catch (IOException
cxf git commit: Fixing a merge problem
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 6c9dab7e7 - cdcc51054
Fixing a merge problem
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cdcc5105
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cdcc5105
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cdcc5105
Branch: refs/heads/3.0.x-fixes
Commit: cdcc510544fc9b8ce519410fa0a08245301958b6
Parents: 6c9dab7
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 12:31:31 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 12:31:31 2014 +
--
.../cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/cdcc5105/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index f786c28..65cf836 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -199,8 +199,8 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
super.setResourceProviders(factories);
}
Class? extends Annotation serviceAnnotationClass =
loadServiceAnnotationClass();
-try {
-if (basePackages != null) {
+if (basePackages != null) {
+try {
@SuppressWarnings(unchecked)
final Map Class ? extends Annotation , Collection
Class ?classes =
ClasspathScanner.findClasses(basePackages,
Provider.class, Path.class);
cxf git commit: Updating JAX-RS Spring parser to do a last try and check the matching resources if none of them have been set previously
Repository: cxf
Updated Branches:
refs/heads/master 50f5cd8c3 - 83205e07b
Updating JAX-RS Spring parser to do a last try and check the matching resources
if none of them have been set previously
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/83205e07
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83205e07
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83205e07
Branch: refs/heads/master
Commit: 83205e07bc890c794032a85735adde1fedd0f565
Parents: 50f5cd8
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 14:37:31 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 14:37:31 2014 +
--
.../AbstractSpringComponentScanServer.java | 18 ++
.../AbstractSpringConfigurationFactory.java | 6 ++---
.../JAXRSServerFactoryBeanDefinitionParser.java | 25 ++--
.../org/apache/cxf/jaxrs/spring/servers.xml | 4
4 files changed, 43 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/83205e07/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index cb05d1c..31284aa 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -37,23 +37,31 @@ public abstract class AbstractSpringComponentScanServer
extends AbstractSpringCo
private ListResourceProvider resourceProviders = new
LinkedListResourceProvider();
private ListObject jaxrsProviders = new LinkedListObject();
-
-
-protected void setRootResources(JAXRSServerFactoryBean factory) {
+private Class? extends Annotation serviceAnnotation;
+protected AbstractSpringComponentScanServer() {
+
+}
+protected AbstractSpringComponentScanServer(Class? extends Annotation
serviceAnnotation) {
+this.serviceAnnotation = serviceAnnotation;
+}
+protected void setJaxrsResources(JAXRSServerFactoryBean factory) {
boolean checkJaxrsRoots = checkJaxrsRoots();
boolean checkJaxrsProviders = checkJaxrsProviders();
for (String beanName : applicationContext.getBeanDefinitionNames()) {
-if (checkJaxrsRoots isAnnotationAvailable(beanName,
Path.class)) {
+if (checkJaxrsRoots isAnnotationAvailable(beanName, Path.class)
+ (serviceAnnotation == null ||
isAnnotationAvailable(beanName, serviceAnnotation))) {
SpringResourceFactory resourceFactory = new
SpringResourceFactory(beanName);
resourceFactory.setApplicationContext(applicationContext);
resourceProviders.add(resourceFactory);
-} else if (checkJaxrsProviders isAnnotationAvailable(beanName,
Provider.class)) {
+} else if (checkJaxrsProviders isAnnotationAvailable(beanName,
Provider.class)
+ (serviceAnnotation == null ||
isAnnotationAvailable(beanName, serviceAnnotation))) {
jaxrsProviders.add(applicationContext.getBean(beanName));
}
}
factory.setResourceProviders(getResourceProviders());
+factory.setProviders(getJaxrsProviders());
}
protected A extends Annotation boolean isAnnotationAvailable(String
beanName, ClassA annClass) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/83205e07/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
index f8f827e..1ee09fa 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
@@ -44,8 +44,8 @@ public abstract class AbstractSpringConfigurationFactory
factory.setTransportId(getTransportId());
factory.setBus(applicationContext.getBean(SpringBus.class));
-setRootResources(factory);
-factory.setProviders(getJaxrsProviders());
+setJaxrsResources(factory);
+
factory.setInInterceptors(getInInterceptors());
cxf git commit: Updating JAX-RS Spring parser to do a last try and check the matching resources if none of them have been set previously
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes cdcc51054 - e68a620a1
Updating JAX-RS Spring parser to do a last try and check the matching resources
if none of them have been set previously
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e68a620a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e68a620a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e68a620a
Branch: refs/heads/3.0.x-fixes
Commit: e68a620a1d896b9e8c258b48ca6b129d6d53884c
Parents: cdcc510
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 14:37:31 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 14:39:08 2014 +
--
.../AbstractSpringComponentScanServer.java | 18 ++
.../AbstractSpringConfigurationFactory.java | 6 ++---
.../JAXRSServerFactoryBeanDefinitionParser.java | 25 ++--
.../org/apache/cxf/jaxrs/spring/servers.xml | 4
4 files changed, 43 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e68a620a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index cb05d1c..31284aa 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -37,23 +37,31 @@ public abstract class AbstractSpringComponentScanServer
extends AbstractSpringCo
private ListResourceProvider resourceProviders = new
LinkedListResourceProvider();
private ListObject jaxrsProviders = new LinkedListObject();
-
-
-protected void setRootResources(JAXRSServerFactoryBean factory) {
+private Class? extends Annotation serviceAnnotation;
+protected AbstractSpringComponentScanServer() {
+
+}
+protected AbstractSpringComponentScanServer(Class? extends Annotation
serviceAnnotation) {
+this.serviceAnnotation = serviceAnnotation;
+}
+protected void setJaxrsResources(JAXRSServerFactoryBean factory) {
boolean checkJaxrsRoots = checkJaxrsRoots();
boolean checkJaxrsProviders = checkJaxrsProviders();
for (String beanName : applicationContext.getBeanDefinitionNames()) {
-if (checkJaxrsRoots isAnnotationAvailable(beanName,
Path.class)) {
+if (checkJaxrsRoots isAnnotationAvailable(beanName, Path.class)
+ (serviceAnnotation == null ||
isAnnotationAvailable(beanName, serviceAnnotation))) {
SpringResourceFactory resourceFactory = new
SpringResourceFactory(beanName);
resourceFactory.setApplicationContext(applicationContext);
resourceProviders.add(resourceFactory);
-} else if (checkJaxrsProviders isAnnotationAvailable(beanName,
Provider.class)) {
+} else if (checkJaxrsProviders isAnnotationAvailable(beanName,
Provider.class)
+ (serviceAnnotation == null ||
isAnnotationAvailable(beanName, serviceAnnotation))) {
jaxrsProviders.add(applicationContext.getBean(beanName));
}
}
factory.setResourceProviders(getResourceProviders());
+factory.setProviders(getJaxrsProviders());
}
protected A extends Annotation boolean isAnnotationAvailable(String
beanName, ClassA annClass) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e68a620a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
index f8f827e..1ee09fa 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
@@ -44,8 +44,8 @@ public abstract class AbstractSpringConfigurationFactory
factory.setTransportId(getTransportId());
factory.setBus(applicationContext.getBean(SpringBus.class));
-setRootResources(factory);
-factory.setProviders(getJaxrsProviders());
+setJaxrsResources(factory);
+
factory.setInInterceptors(getInInterceptors());
cxf git commit: [CXF-6121] Minor refactoring
Repository: cxf
Updated Branches:
refs/heads/master 83205e07b - b0ba2d1d4
[CXF-6121] Minor refactoring
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b0ba2d1d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b0ba2d1d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b0ba2d1d
Branch: refs/heads/master
Commit: b0ba2d1d425056b091946050333bb783a002c3e1
Parents: 83205e0
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 15:17:28 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 15:17:28 2014 +
--
.../JAXRSServerFactoryBeanDefinitionParser.java | 27 +++-
1 file changed, 9 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b0ba2d1d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 672d709..ffdbf45 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -230,28 +229,20 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
} catch (ClassNotFoundException ex) {
throw new BeanCreationException(Failed to create bean
from classfile, ex);
}
-} else if (serviceAnnotationClass != null) {
-ListObject services = new LinkedListObject();
-ListObject providers = new LinkedListObject();
-for (Object obj :
ctx.getBeansWithAnnotation(serviceAnnotationClass).values()) {
-Class? cls = obj.getClass();
-if (cls.getAnnotation(Path.class) != null) {
-services.add(obj);
-} else if (cls.getAnnotation(Provider.class) != null) {
-providers.add(obj);
-}
-}
-this.setServiceBeans(services);
-this.setProviders(providers);
-} else if (!serviceBeansAvailable !providerBeansAvailable
!resourceProvidersAvailable) {
-AbstractSpringComponentScanServer scanServer = new
AbstractSpringComponentScanServer() { };
-scanServer.setApplicationContext(context);
-scanServer.setJaxrsResources(this);
+} else if (serviceAnnotationClass != null
+|| !serviceBeansAvailable !providerBeansAvailable
!resourceProvidersAvailable) {
+discoverContextResources(serviceAnnotationClass);
}
if (bus == null) {
setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
}
}
+private void discoverContextResources(Class? extends Annotation
serviceAnnotationClass) {
+AbstractSpringComponentScanServer scanServer =
+new AbstractSpringComponentScanServer(serviceAnnotationClass)
{ };
+scanServer.setApplicationContext(context);
+scanServer.setJaxrsResources(this);
+}
@SuppressWarnings(unchecked)
private Class? extends Annotation loadServiceAnnotationClass() {
if (serviceAnnotation != null) {
cxf git commit: [CXF-6121] Minor refactoring
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes e68a620a1 - ea800588a
[CXF-6121] Minor refactoring
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ea800588
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ea800588
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ea800588
Branch: refs/heads/3.0.x-fixes
Commit: ea800588ade0031678b8da0e211cca52f54f3401
Parents: e68a620
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 15:17:28 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 15:18:40 2014 +
--
.../JAXRSServerFactoryBeanDefinitionParser.java | 27 +++-
1 file changed, 9 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ea800588/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 8ed1310..b9a1ae3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -231,28 +230,20 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
} catch (ClassNotFoundException ex) {
throw new BeanCreationException(Failed to create bean
from classfile, ex);
}
-} else if (serviceAnnotationClass != null) {
-ListObject services = new LinkedListObject();
-ListObject providers = new LinkedListObject();
-for (Object obj :
ctx.getBeansWithAnnotation(serviceAnnotationClass).values()) {
-Class? cls = obj.getClass();
-if (cls.getAnnotation(Path.class) != null) {
-services.add(obj);
-} else if (cls.getAnnotation(Provider.class) != null) {
-providers.add(obj);
-}
-}
-this.setServiceBeans(services);
-this.setProviders(providers);
-} else if (!serviceBeansAvailable !providerBeansAvailable
!resourceProvidersAvailable) {
-AbstractSpringComponentScanServer scanServer = new
AbstractSpringComponentScanServer() { };
-scanServer.setApplicationContext(context);
-scanServer.setJaxrsResources(this);
+} else if (serviceAnnotationClass != null
+|| !serviceBeansAvailable !providerBeansAvailable
!resourceProvidersAvailable) {
+discoverContextResources(serviceAnnotationClass);
}
if (bus == null) {
setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
}
}
+private void discoverContextResources(Class? extends Annotation
serviceAnnotationClass) {
+AbstractSpringComponentScanServer scanServer =
+new AbstractSpringComponentScanServer(serviceAnnotationClass)
{ };
+scanServer.setApplicationContext(context);
+scanServer.setJaxrsResources(this);
+}
@SuppressWarnings(unchecked)
private Class? extends Annotation loadServiceAnnotationClass() {
if (serviceAnnotation != null) {
cxf git commit: Only write the kdc port out once
Repository: cxf
Updated Branches:
refs/heads/master b0ba2d1d4 - ec98e18c8
Only write the kdc port out once
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec98e18c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec98e18c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec98e18c
Branch: refs/heads/master
Commit: ec98e18c87b33a6157757f1f8879ae0c4fe895fb
Parents: b0ba2d1
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Dec 3 16:33:51 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Dec 3 16:33:51 2014 +
--
.../wssec/kerberos/KerberosTokenTest.java | 45 +++
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 47 +++-
2 files changed, 53 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec98e18c/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
--
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index ccac694..b613270 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -49,6 +49,7 @@ import
org.apache.directory.server.core.kerberos.KeyDerivationInterceptor;
import org.apache.wss4j.dom.WSSConfig;
import org.example.contract.doubleit.DoubleItPortType;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
@@ -113,27 +114,33 @@ public class KerberosTokenTest extends
AbstractLdapTestUnit {
SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
private static boolean runTests;
+private static boolean portUpdated;
-public KerberosTokenTest() throws Exception {
-String basedir = System.getProperty(basedir);
-if (basedir == null) {
-basedir = new File(.).getCanonicalPath();
+@Before
+public void updatePort() throws Exception {
+if (!portUpdated) {
+String basedir = System.getProperty(basedir);
+if (basedir == null) {
+basedir = new File(.).getCanonicalPath();
+}
+
+// Read in krb5.conf and substitute in the correct port
+File f = new File(basedir + /src/test/resources/krb5.conf);
+
+FileInputStream inputStream = new FileInputStream(f);
+String content = IOUtils.toString(inputStream, UTF-8);
+inputStream.close();
+content = content.replaceAll(port, +
super.getKdcServer().getTransports()[0].getPort());
+
+File f2 = new File(basedir + /target/test-classes/krb5.conf);
+FileOutputStream outputStream = new FileOutputStream(f2);
+IOUtils.write(content, outputStream, UTF-8);
+outputStream.close();
+
+System.setProperty(java.security.krb5.conf, f2.getPath());
+
+portUpdated = true;
}
-
-// Read in krb5.conf and substitute in the correct port
-File f = new File(basedir + /src/test/resources/krb5.conf);
-
-FileInputStream inputStream = new FileInputStream(f);
-String content = IOUtils.toString(inputStream, UTF-8);
-inputStream.close();
-content = content.replaceAll(port, +
super.getKdcServer().getTransports()[0].getPort());
-
-File f2 = new File(basedir + /target/test-classes/krb5.conf);
-FileOutputStream outputStream = new FileOutputStream(f2);
-IOUtils.write(content, outputStream, UTF-8);
-outputStream.close();
-
-System.setProperty(java.security.krb5.conf, f2.getPath());
}
@BeforeClass
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec98e18c/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
--
diff --git
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 6003d40..df18e8f 100644
---
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -46,6 +46,7 @@ import
[1/2] cxf git commit: [CXF-6121] Optimizing a bit SpringResourceFactory
Repository: cxf
Updated Branches:
refs/heads/master ec98e18c8 - 2b2f97fe1
[CXF-6121] Optimizing a bit SpringResourceFactory
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cba91b8f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cba91b8f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cba91b8f
Branch: refs/heads/master
Commit: cba91b8f1b4c207c35d8c3d49eed66d274aaa28f
Parents: b0ba2d1
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 17:01:00 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 17:01:00 2014 +
--
.../cxf/jaxrs/spring/SpringResourceFactory.java | 28 ++--
1 file changed, 20 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/cba91b8f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
index 99f496c..826f619 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
@@ -54,6 +54,7 @@ public class SpringResourceFactory implements
ResourceProvider, ApplicationConte
private boolean callPreDestroy = true;
private String postConstructMethodName;
private String preDestroyMethodName;
+private Object singletonInstance;
public SpringResourceFactory() {
@@ -78,21 +79,32 @@ public class SpringResourceFactory implements
ResourceProvider, ApplicationConte
isSingleton = ac.isSingleton(beanId);
if (!isSingleton) {
isPrototype = ac.isPrototype(beanId);
+} else {
+try {
+singletonInstance = ac.getBean(beanId);
+} catch (BeansException ex) {
+// ignore for now, can be to do with no default constructor
available
+}
}
+
}
/**
* {@inheritDoc}
*/
public Object getInstance(Message m) {
-ProviderInfo? application = m == null ? null
-:
(ProviderInfo?)m.getExchange().getEndpoint().get(Application.class.getName());
-MapClass?, Object mapValues = CastUtils.cast(application == null ?
null
-: Collections.singletonMap(Application.class,
application.getProvider()));
-Object[] values = ResourceUtils.createConstructorArguments(c, m,
!isSingleton(), mapValues);
-Object instance = values.length 0 ? ac.getBean(beanId, values) :
ac.getBean(beanId);
-initInstance(m, instance);
-return instance;
+if (singletonInstance != null) {
+return singletonInstance;
+} else {
+ProviderInfo? application = m == null ? null
+:
(ProviderInfo?)m.getExchange().getEndpoint().get(Application.class.getName());
+MapClass?, Object mapValues = CastUtils.cast(application ==
null ? null
+: Collections.singletonMap(Application.class,
application.getProvider()));
+Object[] values = ResourceUtils.createConstructorArguments(c, m,
!isSingleton(), mapValues);
+Object instance = values.length 0 ? ac.getBean(beanId, values) :
ac.getBean(beanId);
+initInstance(m, instance);
+return instance;
+}
}
protected void initInstance(Message m, Object instance) {
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2b2f97fe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b2f97fe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b2f97fe Branch: refs/heads/master Commit: 2b2f97fe176c0537b38081f35fb85f2fca415e04 Parents: cba91b8 ec98e18 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Dec 3 17:01:22 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Dec 3 17:01:22 2014 + -- .../wssec/kerberos/KerberosTokenTest.java | 45 +++ .../kerberos/wssec/spnego/SpnegoTokenTest.java | 47 +++- 2 files changed, 53 insertions(+), 39 deletions(-) --
cxf git commit: [CXF-6121] Optimizing a bit SpringResourceFactory
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ea800588a - 1cdac9254
[CXF-6121] Optimizing a bit SpringResourceFactory
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1cdac925
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1cdac925
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1cdac925
Branch: refs/heads/3.0.x-fixes
Commit: 1cdac92540d5df49edf92876150fcb5bf873f49a
Parents: ea80058
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Wed Dec 3 17:01:00 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Wed Dec 3 17:02:41 2014 +
--
.../cxf/jaxrs/spring/SpringResourceFactory.java | 28 ++--
1 file changed, 20 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1cdac925/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
index 99f496c..826f619 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/SpringResourceFactory.java
@@ -54,6 +54,7 @@ public class SpringResourceFactory implements
ResourceProvider, ApplicationConte
private boolean callPreDestroy = true;
private String postConstructMethodName;
private String preDestroyMethodName;
+private Object singletonInstance;
public SpringResourceFactory() {
@@ -78,21 +79,32 @@ public class SpringResourceFactory implements
ResourceProvider, ApplicationConte
isSingleton = ac.isSingleton(beanId);
if (!isSingleton) {
isPrototype = ac.isPrototype(beanId);
+} else {
+try {
+singletonInstance = ac.getBean(beanId);
+} catch (BeansException ex) {
+// ignore for now, can be to do with no default constructor
available
+}
}
+
}
/**
* {@inheritDoc}
*/
public Object getInstance(Message m) {
-ProviderInfo? application = m == null ? null
-:
(ProviderInfo?)m.getExchange().getEndpoint().get(Application.class.getName());
-MapClass?, Object mapValues = CastUtils.cast(application == null ?
null
-: Collections.singletonMap(Application.class,
application.getProvider()));
-Object[] values = ResourceUtils.createConstructorArguments(c, m,
!isSingleton(), mapValues);
-Object instance = values.length 0 ? ac.getBean(beanId, values) :
ac.getBean(beanId);
-initInstance(m, instance);
-return instance;
+if (singletonInstance != null) {
+return singletonInstance;
+} else {
+ProviderInfo? application = m == null ? null
+:
(ProviderInfo?)m.getExchange().getEndpoint().get(Application.class.getName());
+MapClass?, Object mapValues = CastUtils.cast(application ==
null ? null
+: Collections.singletonMap(Application.class,
application.getProvider()));
+Object[] values = ResourceUtils.createConstructorArguments(c, m,
!isSingleton(), mapValues);
+Object instance = values.length 0 ? ac.getBean(beanId, values) :
ac.getBean(beanId);
+initInstance(m, instance);
+return instance;
+}
}
protected void initInstance(Message m, Object instance) {
cxf git commit: [CXF-6129]fix CXF STS basic systests failure (cherry picked from commit 25d92ab9baa3e7c82aa5eb53d87e9e94af940d3e)
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 1cdac9254 - 374c8ad50
[CXF-6129]fix CXF STS basic systests failure
(cherry picked from commit 25d92ab9baa3e7c82aa5eb53d87e9e94af940d3e)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/374c8ad5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/374c8ad5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/374c8ad5
Branch: refs/heads/3.0.x-fixes
Commit: 374c8ad502993e87763fe6dcef0f132714431d76
Parents: 1cdac92
Author: Freeman Fang freeman.f...@gmail.com
Authored: Wed Dec 3 15:27:00 2014 +0800
Committer: Freeman Fang freeman.f...@gmail.com
Committed: Thu Dec 4 11:37:10 2014 +0800
--
.../cxf/systest/sts/username_actas/Server2.java | 46 +++
.../sts/username_actas/UsernameActAsTest.java | 4 +-
.../sts/username_onbehalfof/Server2.java| 46 +++
.../UsernameOnBehalfOfTest.java | 4 +-
.../systest/sts/username_actas/cxf-service2.xml | 82
.../sts/username_onbehalfof/cxf-service2.xml| 82
6 files changed, 260 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/374c8ad5/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/Server2.java
--
diff --git
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/Server2.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/Server2.java
new file mode 100644
index 000..e261df8
--- /dev/null
+++
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/Server2.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.username_actas;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server2 extends AbstractBusTestServerBase {
+
+public Server2() {
+
+}
+
+protected void run() {
+URL busFile = Server2.class.getResource(cxf-service2.xml);
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server2();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/374c8ad5/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
--
diff --git
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
index f648633..0fbfe2e 100644
---
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
+++
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
@@ -57,7 +57,7 @@ public class UsernameActAsTest extends
AbstractBusClientServerTestBase {
private static final String NAMESPACE =
http://www.example.org/contract/DoubleIt;;
private static final QName SERVICE_QNAME = new QName(NAMESPACE,
DoubleItService);
-private static final String PORT = allocatePort(Server.class);
+private static final String PORT = allocatePort(Server2.class);
final TestParam test;
@@ -71,7 +71,7 @@ public class UsernameActAsTest extends
AbstractBusClientServerTestBase {
Server failed to launch,
// run the server in the same process
// set this to false to fork
-launchServer(Server.class, true)
+launchServer(Server2.class, true)
);
assertTrue(
