Author: coheigea
Date: Wed Dec 4 17:29:39 2013
New Revision: 1547851
URL: http://svn.apache.org/r1547851
Log:
Upgrading to BouncyCastle 1.50
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1547851&r1=1547850&r2=1547851&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Dec 4 17:29:39 2013
@@ -74,7 +74,7 @@
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.activemq.version>5.8.0</cxf.activemq.version>
<cxf.axiom.version>1.2.14</cxf.axiom.version>
- <cxf.bcprov.version>1.49</cxf.bcprov.version>
+ <cxf.bcprov.version>1.50</cxf.bcprov.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
<cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
<cxf.commons-codec.version>1.8</cxf.commons-codec.version>
Modified:
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml?rev=1547851&r1=1547850&r2=1547851&view=diff
==============================================================================
---
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
(original)
+++
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml
Wed Dec 4 17:29:39 2013
@@ -50,12 +50,9 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <!-- <bean id="kerberosTicketDecoderImpl"
-
class="org.apache.cxf.systest.ws.kerberos.server.KerberosTokenDecoderImpl"/>-->
<bean id="kerberosValidator"
class="org.apache.wss4j.dom.validate.KerberosTokenValidator">
<property name="contextName" value="bob"/>
<property name="serviceName" value="[email protected]"/>
- <!--<property name="kerberosTokenDecoder"
ref="kerberosTicketDecoderImpl"/>-->
</bean>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt";
id="KerberosOverTransport"
address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransport";
serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort"
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl"
depends-on="tls-settings">
<jaxws:properties>
Modified:
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml?rev=1547851&r1=1547850&r2=1547851&view=diff
==============================================================================
---
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
(original)
+++
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
Wed Dec 4 17:29:39 2013
@@ -50,8 +50,6 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <!-- <bean id="kerberosTicketDecoderImpl"
-
class="org.apache.cxf.systest.ws.kerberos.server.KerberosTokenDecoderImpl"/>-->
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt";
id="KerberosOverTransport"
address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransport";
serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort"
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
wsdlLocation="org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl"
depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.is-bsp-compliant" value="false"/>
