cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] git commit: Fixing STS build
Date Thu, 26 Jun 2014 14:22:12 GMT
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 <coheigea@apache.org>
Authored: Thu Jun 26 15:21:58 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@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>
            <scope>test</scope>
        </dependency>
-        <dependency>
-<<<<<<< HEAD
+       <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-rt-ws-security</artifactId>
            <version>${project.version}</version>
@@ -105,96 +104,12 @@
           <artifactId>hazelcast</artifactId>
           <version>${cxf.hazelcast.version}</version>
        </dependency> 
-=======
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf.services.sts</groupId>
-            <artifactId>cxf-services-sts-core</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-client</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-security</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
+       <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-mex</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-kerberos-shared</artifactId>
-            <version>1.5.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-jaxb</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>${cxf.ehcache.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ldap</groupId>
-            <artifactId>spring-ldap-core</artifactId>
-            <version>${cxf.spring.ldap.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast</artifactId>
-            <version>${cxf.hazelcast.version}</version>
-        </dependency>
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
index 001f0c2..9b169fa 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
@@ -33,16 +33,8 @@ import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 
 /**
-<<<<<<< HEAD
- * In this test, a CXF client checks to see that the location defined on it's STSClient is
different
- * from that configured in the Issuer of the IssuedToken policy supplied in the WSDL of the
- * service provider. It obtains a SAML Token from the configured STS first, and then sends
it in
- * the security header to the second STS. The returned token is then sent to the service
provider.
- * This illustrates cross-domain SSO: https://issues.apache.org/jira/browse/CXF-3520
-=======
  * Some tests that illustrate how CXF clients can get tokens from different STS instances
for 
  * service invocations.
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
  */
 public class CrossDomainTest extends AbstractBusClientServerTestBase {
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
index 5214940..c8919c4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl
@@ -16,164 +16,6 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<<<<<<< HEAD
-<wsdl:definitions name="DoubleIt"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:di="http://www.example.org/schema/DoubleIt"
-	xmlns:tns="http://www.example.org/contract/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy"
-	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
-	xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsaw="http://www.w3.org/2005/08/addressing"
-	xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" targetNamespace="http://www.example.org/contract/DoubleIt">
-
-    <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" 
-                 namespace="http://www.example.org/contract/DoubleIt"/>
-
-	<wsdl:binding name="DoubleItTransportBinding" type="tns:DoubleItPortType">
-		<wsp:PolicyReference URI="#DoubleItBindingTransportPolicy" />
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="DoubleIt">
-			<soap:operation soapAction="" />
-			<wsdl:input>
-				<soap:body use="literal" />
-				<wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-				<wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="DoubleItService">
-		<wsdl:port name="DoubleItCrossDomainPort" binding="tns:DoubleItTransportBinding">
-			<soap:address
-				location="https://localhost:8081/doubleit/services/doubleitcrossdomain" />
-		</wsdl:port>
-	</wsdl:service>
-	
-	<wsp:Policy wsu:Id="DoubleItBindingTransportPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<wsam:Addressing wsp:Optional="false">
-					<wsp:Policy />
-				</wsam:Addressing>
-				<sp:TransportBinding
-					xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken>
-                                    <wsp:Policy/>
-                                </sp:HttpsToken>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:TripleDes />
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Lax />
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp />
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:SupportingTokens
-					xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-					<wsp:Policy>
-						<sp:IssuedToken
-							sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-							<sp:RequestSecurityTokenTemplate>
-								<t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
-								<t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer</t:KeyType>
-							</sp:RequestSecurityTokenTemplate>
-							<wsp:Policy>
-								<sp:RequireInternalReference />
-							</wsp:Policy>
-							<sp:Issuer>
-								<wsaw:Address>http://localhost:8080/SecurityTokenService/UT
-								</wsaw:Address>
-							</sp:Issuer>
-						</sp:IssuedToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-				<sp:Wss11>
-					<wsp:Policy>
-						<sp:MustSupportRefIssuerSerial />
-						<sp:MustSupportRefThumbprint />
-						<sp:MustSupportRefEncryptedKey />
-					</wsp:Policy>
-				</sp:Wss11>
-				<sp:Trust13>
-					<wsp:Policy>
-						<sp:MustSupportIssuedTokens />
-						<sp:RequireClientEntropy />
-						<sp:RequireServerEntropy />
-					</wsp:Policy>
-				</sp:Trust13>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	
-	<wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:EncryptedParts>
-					<sp:Body />
-				</sp:EncryptedParts>
-				<sp:SignedParts>
-					<sp:Body />
-					<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="AckRequested"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="SequenceAcknowledgement"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="Sequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="CreateSequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-				</sp:SignedParts>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:EncryptedParts>
-					<sp:Body />
-				</sp:EncryptedParts>
-				<sp:SignedParts>
-					<sp:Body />
-					<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="AckRequested"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="SequenceAcknowledgement"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="Sequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="CreateSequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-				</sp:SignedParts>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-=======
 <wsdl:definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:di="http://www.example.org/schema/DoubleIt"
xmlns:tns="http://www.example.org/contract/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsaw="http://www.w3.org/2005/08/addressing"
xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" name="DoubleIt" targetNamespace="http://www.example.org/contract/DoubleIt">
     <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" namespace="http://www.example.org/contract/DoubleIt"/>
     <wsdl:binding name="DoubleItTransportBinding" type="tns:DoubleItPortType">
@@ -392,5 +234,4 @@
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
 </wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
index 85322cc..838b818 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
@@ -36,47 +36,7 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-<<<<<<< HEAD
-    
-   <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCrossDomainPort"

-                 createdFromAPI="true">
-       <jaxws:properties>
-           <entry key="ws-security.sts.client">
-               <bean class="org.apache.cxf.ws.security.trust.STSClient">
-                   <constructor-arg ref="cxf"/>
-                   <property name="wsdlLocation" 
-                             value="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/a?wsdl"/>
-                   <property name="serviceName" 
-                             value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
-                   <property name="endpointName" 
-                             value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
-                   <property name="properties">
-                       <map>
-                           <entry key="ws-security.username" value="alice"/>
-                           <entry key="ws-security.callback-handler" 
-                                  value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-                           <entry key="ws-security.sts.token.username" value="myclientkey"/>
-                           <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

-                           <entry key="ws-security.sts.token.usecert" value="true"/>

-                       </map>
-                   </property>
-               </bean>            
-           </entry> 
-       </jaxws:properties>
-   </jaxws:client>
-   
-   <http:conduit name="https://localhost:.*">
-      <http:tlsClientParameters disableCNCheck="true">
-        <sec:keyManagers keyPassword="ckpass">
-           <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
-        </sec:keyManagers>
-        <sec:trustManagers>
-          <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
-        </sec:trustManagers>
-      </http:tlsClientParameters>
-   </http:conduit>
-   
-=======
+
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCrossDomainPort"
createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.sts.client">
@@ -132,6 +92,5 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
index f24006f..de60f87 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
@@ -16,72 +16,6 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<<<<<<< HEAD
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:cxf="http://cxf.apache.org/core"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:sec="http://cxf.apache.org/configuration/security"
-  xmlns:http="http://cxf.apache.org/transports/http/configuration"
-  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
-  xmlns:jaxws="http://cxf.apache.org/jaxws"
-  xsi:schemaLocation="
-            http://cxf.apache.org/core
-            http://cxf.apache.org/schemas/core.xsd
-            http://cxf.apache.org/configuration/security
-            http://cxf.apache.org/schemas/configuration/security.xsd
-            http://cxf.apache.org/jaxws
-            http://cxf.apache.org/schemas/jaxws.xsd
-            http://cxf.apache.org/transports/http/configuration
-            http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://cxf.apache.org/transports/http-jetty/configuration
-            http://cxf.apache.org/schemas/configuration/http-jetty.xsd
-            http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans.xsd">
-   
-   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-   
-   <jaxws:endpoint id="doubleitcrossdomain"
-      implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
-      endpointName="s:DoubleItCrossDomainPort"
-      serviceName="s:DoubleItService"
-      depends-on="ClientAuthHttpsSettings"
-      address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleitcrossdomain"
-      wsdlLocation="org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl"
-      xmlns:s="http://www.example.org/contract/DoubleIt">
-        
-      <jaxws:properties>
-         <entry key="ws-security.saml2.validator">
-            <bean class="org.apache.cxf.systest.sts.cross_domain.CrossDomainValidator"/>
-         </entry>
-         <entry key="ws-security.callback-handler" 
-                value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-         <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-      </jaxws:properties> 
-   </jaxws:endpoint>
-   
-   <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
-   <httpj:engine port="${testutil.ports.Server}">
-    <httpj:tlsServerParameters>
-      <sec:keyManagers keyPassword="skpass">
-          <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
-      </sec:keyManagers>
-      <sec:trustManagers>
-          <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
-      </sec:trustManagers>
-      <sec:cipherSuitesFilter>
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_AES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-        </sec:cipherSuitesFilter>
-      <sec:clientAuthentication want="false" required="false"/>
-    </httpj:tlsServerParameters>
-   </httpj:engine>
-  </httpj:engine-factory>
-  
-=======
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security"
xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation="             http://cxf.apache.org/core
            http://cxf.apache.org/schemas/core.xsd             http://cxf.apache.org/configuration/security
            http://cxf.apache.org/schemas/configuration/security.xsd             http://cxf.apache.org/jaxws
            http://cxf.apache.org/schemas/jaxws.xsd             http://cxf.apache.org/transports/http/configuration
            http://cxf.apache.org/schemas/configuration/http-conf.xsd             http://cxf.apache.org/transports/http-jetty/configuration
            http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             http://www.springframework.org/schema/beans/spring-beans.xsd">
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitcrossdomain"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItCrossDomainPort"
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleitcrossdomain"
wsdlLocation="org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl">
@@ -124,6 +58,5 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
index facac56..4688d30 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
@@ -47,97 +47,6 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-<<<<<<< HEAD
-
-	<bean id="transportSTSProviderBean"
-		class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
-		<property name="issueOperation" ref="transportIssueDelegate" />
-		<property name="validateOperation" ref="transportValidateDelegate" />
-	</bean>
-
-	<bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
-		<property name="tokenProviders" ref="transportTokenProviders" />
-		<property name="services" ref="transportService" />
-		<property name="stsProperties" ref="transportSTSProperties" />
-	</bean>
-
-	<bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
-		<property name="tokenProviders" ref="transportTokenProviders" />
-		<property name="tokenValidators" ref="transportTokenValidators" />
-		<property name="stsProperties" ref="transportSTSProperties" />
-	</bean>
-
-	<util:list id="transportTokenProviders">
-		<ref bean="transportSAMLProvider" />
-	</util:list>
-
-	<util:list id="transportTokenValidators">
-		<ref bean="transportSAMLValidator" />
-	</util:list>
-
-	<bean id="transportSAMLProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
-	</bean>
-
-	<bean id="transportSAMLValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
-	</bean>
-
-	<bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
-		<property name="endpoints" ref="transportEndpoints" />
-	</bean>
-
-	<util:list id="transportEndpoints">
-		<value>https://localhost:(\d)*/doubleit/services/doubleit.*
-		</value>
-	</util:list>
-
-	<bean id="customRealmParser" class="org.apache.cxf.systest.sts.realms.URLRealmParser"
/>
-
-	<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-		<property name="signaturePropertiesFile"
-			value="stsKeystore.properties" />
-		<property name="signatureUsername" value="mystskey" />
-		<property name="callbackHandlerClass"
-			value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
-		<property name="issuer" value="a-issuer" />
-	</bean>
-
-	<jaxws:endpoint id="DefaultSTS" implementor="#transportSTSProviderBean"
-		address="https://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/a"
-		wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
-		xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-		depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
-		endpointName="ns1:Transport_Port">
-		<jaxws:properties>
-			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
-		</jaxws:properties>
-	</jaxws:endpoint>
-
-	<httpj:engine-factory id="ClientAuthHttpsSettings"
-		bus="cxf">
-		<httpj:engine port="${testutil.ports.STSServer.2}">
-			<httpj:tlsServerParameters>
-				<sec:trustManagers>
-					<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
-				</sec:trustManagers>
-				<sec:keyManagers keyPassword="stskpass">
-					<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
-				</sec:keyManagers>
-				<sec:cipherSuitesFilter>
-					<sec:include>.*_EXPORT_.*</sec:include>
-					<sec:include>.*_EXPORT1024_.*</sec:include>
-					<sec:include>.*_WITH_DES_.*</sec:include>
-					<sec:include>.*_WITH_AES_.*</sec:include>
-					<sec:include>.*_WITH_NULL_.*</sec:include>
-					<sec:exclude>.*_DH_anon_.*</sec:exclude>
-				</sec:cipherSuitesFilter>
-				<sec:clientAuthentication want="true"
-					required="true" />
-			</httpj:tlsServerParameters>
-		</httpj:engine>
-	</httpj:engine-factory>
-   
-=======
     <bean id="transportSTSProviderBean" class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
         <property name="issueOperation" ref="transportIssueDelegate"/>
         <property name="validateOperation" ref="transportValidateDelegate"/>
@@ -202,6 +111,5 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
index 53fb337..9983dc7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
@@ -53,88 +53,6 @@
 	    <property name="issueOperation" ref="transportIssueDelegate" />
 	    <property name="validateOperation" ref="transportValidateDelegate" />
     </bean>
-<<<<<<< HEAD
-
-	<bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
-		<property name="tokenProviders" ref="transportTokenProviders" />
-		<property name="services" ref="transportService" />
-		<property name="stsProperties" ref="transportSTSProperties" />
-	</bean>
-
-	<bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
-		<property name="tokenProviders" ref="transportTokenProviders" />
-		<property name="tokenValidators" ref="transportTokenValidators" />
-		<property name="stsProperties" ref="transportSTSProperties" />
-	</bean>
-
-	<util:list id="transportTokenProviders">
-		<ref bean="transportSAMLProvider" />
-	</util:list>
-
-	<util:list id="transportTokenValidators">
-		<ref bean="transportSAMLValidator" />
-	</util:list>
-
-	<bean id="transportSAMLProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
-	</bean>
-
-	<bean id="transportSAMLValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
-	</bean>
-
-	<bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
-		<property name="endpoints" ref="transportEndpoints" />
-	</bean>
-
-	<util:list id="transportEndpoints">
-		<value>https://localhost:(\d)*/doubleit/services/doubleit.*
-		</value>
-	</util:list>
-
-	<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-		<property name="signaturePropertiesFile" value="stsKeystore.properties" />
-		<property name="signatureUsername" value="mystskey" />
-		<property name="callbackHandlerClass"
-			value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
-		<property name="issuer" value="b-issuer" />
-	</bean>
-
-	<jaxws:endpoint id="BSTS" implementor="#transportSTSProviderBean"
-		address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/b"
-		wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
-		xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-		depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService"
-		endpointName="ns1:Transport_Port">
-		<jaxws:properties>
-			<entry key="ws-security.callback-handler"
-				value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
-		</jaxws:properties>
-	</jaxws:endpoint>
-
-	<httpj:engine-factory id="ClientAuthHttpsSettings"
-		bus="cxf">
-		<httpj:engine port="${testutil.ports.STSServer}">
-			<httpj:tlsServerParameters>
-				<sec:trustManagers>
-					<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
-				</sec:trustManagers>
-				<sec:keyManagers keyPassword="stskpass">
-					<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks" />
-				</sec:keyManagers>
-				<sec:cipherSuitesFilter>
-					<sec:include>.*_EXPORT_.*</sec:include>
-					<sec:include>.*_EXPORT1024_.*</sec:include>
-					<sec:include>.*_WITH_DES_.*</sec:include>
-					<sec:include>.*_WITH_AES_.*</sec:include>
-					<sec:include>.*_WITH_NULL_.*</sec:include>
-					<sec:exclude>.*_DH_anon_.*</sec:exclude>
-				</sec:cipherSuitesFilter>
-				<sec:clientAuthentication want="true"
-					required="true" />
-			</httpj:tlsServerParameters>
-		</httpj:engine>
-	</httpj:engine-factory>
-   
-=======
     <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
         <property name="tokenProviders" ref="transportTokenProviders"/>
         <property name="services" ref="transportService"/>
@@ -195,6 +113,5 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce572e40/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
index d3a4894..a3fa4bc 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
@@ -42,12 +42,10 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
 
     private static final String PORT = allocatePort(Server.class);
     
-<<<<<<< HEAD
     private static boolean standalone;
-=======
+
     // These tests require port numbers in the WSDLs and so we can't easily do variable substitution
     private static boolean portFree = true;
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
     
     @BeforeClass
     public static void startServers() throws Exception {
@@ -90,17 +88,14 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testSAML1Issuer() throws Exception {
         
-<<<<<<< HEAD
         if (!standalone) {
             return;
         }
 
-=======
         if (!portFree) {
             return;
         }
         
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = IssuerTest.class.getResource("cxf-client.xml");
 
@@ -125,17 +120,14 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
     @org.junit.Test
     public void testSAML2MEX() throws Exception {
         
-<<<<<<< HEAD
         if (!standalone) {
             return;
         }
 
-=======
         if (!portFree) {
             return;
         }
         
->>>>>>> dae6111... Adding another @Ignore'd cross domain test
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = IssuerTest.class.getResource("cxf-client.xml");
 


Mime
View raw message