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 build
Date Tue, 27 May 2014 13:59:02 GMT
Fixing build


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

Branch: refs/heads/2.7.x-fixes
Commit: 6fa55c04e83472f4455db1d3c8c9a8de851f50a6
Parents: 6845e30
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue May 27 14:58:51 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue May 27 14:58:51 2014 +0100

----------------------------------------------------------------------
 .../IssuedTokenInterceptorProvider.java         |   4 -
 .../apache/cxf/systest/sts/renew/DoubleIt.wsdl  |  94 -----------------
 .../apache/cxf/systest/sts/renew/cxf-client.xml | 100 +------------------
 .../cxf/systest/sts/renew/cxf-service.xml       |  72 +------------
 .../cxf/systest/sts/renew/cxf-sts-pop.xml       |  54 ----------
 5 files changed, 2 insertions(+), 322 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6fa55c04/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index df5a5a4..9d69d17 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -30,11 +30,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Element;
-<<<<<<< HEAD
-
-=======
 import org.apache.cxf.common.logging.LogUtils;
->>>>>>> 7851f41... [CXF-5768] - Fallback to "Issue" if "Renew" fails
in the STSClient
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Fault;

http://git-wip-us.apache.org/repos/asf/cxf/blob/6fa55c04/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
index 8f56919..1771f1e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/DoubleIt.wsdl
@@ -16,99 +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="DoubleItTransportSaml1Binding" type="tns:DoubleItPortType">
-		<wsp:PolicyReference URI="#DoubleItBindingTransportSaml1Policy" />
-		<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:binding name="DoubleItTransportSaml1BearerBinding" type="tns:DoubleItPortType">
-		<wsp:PolicyReference URI="#DoubleItBindingTransportSaml1BearerPolicy" />
-		<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:binding name="DoubleItTransportSaml2Binding" type="tns:DoubleItPortType">
-		<wsp:PolicyReference URI="#DoubleItBindingTransportSaml2Policy" />
-		<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="DoubleItTransportSaml1Port" binding="tns:DoubleItTransportSaml1Binding">
-			<soap:address
-				location="https://localhost:8081/doubleit/services/doubleittransportsaml1" />
-		</wsdl:port>
-		<wsdl:port name="DoubleItTransportSaml1BearerPort" binding="tns:DoubleItTransportSaml1BearerBinding">
-			<soap:address
-				location="https://localhost:8081/doubleit/services/doubleittransportsaml1bearer" />
-		</wsdl:port>
-		<wsdl:port name="DoubleItTransportSaml2Port" binding="tns:DoubleItTransportSaml2Binding">
-			<soap:address
-				location="https://localhost:8081/doubleit/services/doubleittransportsaml2" />
-		</wsdl:port>
-	</wsdl:service>
-	
-	<wsp:Policy wsu:Id="DoubleItBindingTransportSaml1Policy">
-		<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/>
-=======
 <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="DoubleItTransportSaml1Binding" type="tns:DoubleItPortType">
@@ -182,7 +89,6 @@
                             <wsp:Policy>
                                 <sp:HttpsToken>
                                     <wsp:Policy/>
->>>>>>> 7851f41... [CXF-5768] - Fallback to "Issue" if "Renew" fails
in the STSClient
                                 </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>

http://git-wip-us.apache.org/repos/asf/cxf/blob/6fa55c04/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
index 92397d3..f8c53816 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
@@ -36,104 +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}DoubleItTransportSaml1Port"
createdFromAPI="true">
-       <jaxws:properties>
-           <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.signature.properties" value="clientKeystore.properties"/>
-           <entry key="ws-security.signature.username" value="myclientkey"/>
-           <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.STSServerPOP}/SecurityTokenService/Transport?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="ttl" value="8"/>
-                   <property name="enableLifetime" value="true"/>
-                   <property name="allowRenewingAfterExpiry" value="true"/>
-                   <property name="properties">
-                       <map>
-                           <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>
-   
-   <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml1BearerPort"
createdFromAPI="true">
-       <jaxws:properties>
-           <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.client">
-               <bean class="org.apache.cxf.ws.security.trust.STSClient">
-                   <constructor-arg ref="cxf"/>
-                   <property name="wsdlLocation" 
-                             value="https://localhost:${testutil.ports.STSServerPOP}/SecurityTokenService/Transport?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="ttl" value="8"/>
-                   <property name="enableLifetime" value="true"/>
-                   <property name="allowRenewingAfterExpiry" value="true"/>
-               </bean>            
-           </entry> 
-       </jaxws:properties>
-   </jaxws:client>
-   
-   <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml2Port"
createdFromAPI="true">
-       <jaxws:properties>
-           <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.signature.properties" value="clientKeystore.properties"/>
-           <entry key="ws-security.signature.username" value="myclientkey"/>
-           <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.STSServerPOP}/SecurityTokenService/Transport?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="ttl" value="8"/>
-                   <property name="enableLifetime" value="true"/>
-                   <property name="allowRenewingAfterExpiry" value="true"/>
-                   <property name="properties">
-                       <map>
-                           <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:trustManagers>
-          <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
-        </sec:trustManagers>
-        <sec:keyManagers keyPassword="ckpass">
-           <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
-        </sec:keyManagers>
-      </http:tlsClientParameters>
-   </http:conduit>
-   
-=======
+
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml1Port"
createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="alice"/>
@@ -242,6 +145,5 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
             </sec:keyManagers>
         </http:tlsClientParameters>
     </http:conduit>
->>>>>>> 7851f41... [CXF-5768] - Fallback to "Issue" if "Renew" fails
in the STSClient
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6fa55c04/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
index 3380bf4..b169170 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
@@ -44,76 +44,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-<<<<<<< HEAD
-   
-   <jaxws:endpoint id="doubleittransportsaml1"
-      implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
-      endpointName="s:DoubleItTransportSaml1Port"
-      serviceName="s:DoubleItService"
-      depends-on="ClientAuthHttpsSettings"
-      address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1"
-      wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl"
-      xmlns:s="http://www.example.org/contract/DoubleIt">
-        
-      <jaxws:properties>
-           <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>
-   
-   <jaxws:endpoint id="doubleittransportsaml1bearer"
-      implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
-      endpointName="s:DoubleItTransportSaml1BearerPort"
-      serviceName="s:DoubleItService"
-      depends-on="ClientAuthHttpsSettings"
-      address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1bearer"
-      wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl"
-      xmlns:s="http://www.example.org/contract/DoubleIt">
-        
-      <jaxws:properties>
-           <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>
-   
-   <jaxws:endpoint id="doubleittransportsaml2"
-      implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl"
-      endpointName="s:DoubleItTransportSaml2Port"
-      serviceName="s:DoubleItService"
-      depends-on="ClientAuthHttpsSettings"
-      address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2"
-      wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl"
-      xmlns:s="http://www.example.org/contract/DoubleIt">
-        
-      <jaxws:properties>
-           <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: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>
-  
-=======
+
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSaml1Port"
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1"
wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
@@ -156,6 +87,5 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
->>>>>>> 7851f41... [CXF-5768] - Fallback to "Issue" if "Renew" fails
in the STSClient
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/6fa55c04/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
index 30f458e..6d4bf58 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
@@ -137,60 +137,7 @@
     <bean id="SAMLConditionsProvider" class="org.apache.cxf.sts.token.provider.DefaultConditionsProvider">
         <property name="acceptClientLifetime" value="true"/>
     </bean>
-<<<<<<< HEAD
 
-	<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/doubleittransport.*
-		</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="encryptionPropertiesFile" value="stsKeystore.properties" />
-		<property name="issuer" value="DoubleItSTSIssuer" />
-		<property name="encryptionUsername" value="myservicekey" />
-	</bean>
-
-	<jaxws:endpoint id="localSTS" implementor="#transportSTSProviderBean"
-		address="https://localhost:${testutil.ports.STSServerPOP}/SecurityTokenService/Transport"
-		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:endpoint>
-	
-	<httpj:engine-factory id="ClientAuthHttpsSettings"
-		bus="cxf">
-		<httpj:engine port="${testutil.ports.STSServerPOP}">
-			<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="transportService" class="org.apache.cxf.sts.service.StaticService">
         <property name="endpoints" ref="transportEndpoints"/>
     </bean>
@@ -238,6 +185,5 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
->>>>>>> 7851f41... [CXF-5768] - Fallback to "Issue" if "Renew" fails
in the STSClient
 </beans>
 


Mime
View raw message