You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/05/11 16:14:31 UTC
svn commit: r1337175 - in /cxf/fediz/trunk: ./ services/idp/
services/idp/src/main/java/org/apache/cxf/fediz/service/idp/
services/idp/src/main/webapp/WEB-INF/ services/sts/
services/sts/src/main/java/org/apache/cxf/fediz/service/sts/
services/sts/src/...
Author: coheigea
Date: Fri May 11 14:14:30 2012
New Revision: 1337175
URL: http://svn.apache.org/viewvc?rev=1337175&view=rev
Log:
Upgrading to 2.6.1-SNAPSHOT + fixing faulty SecurityPolicy assertions
Modified:
cxf/fediz/trunk/pom.xml
cxf/fediz/trunk/services/idp/pom.xml
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpSTSClient.java
cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpServlet.java
cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/beans.xml
cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/services/sts/pom.xml
cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java
cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java
cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/UsernamePasswordCallbackHandler.java
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
Modified: cxf/fediz/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Fri May 11 14:14:30 2012
@@ -29,10 +29,11 @@
<properties>
<slf4j.version>1.6.1</slf4j.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
<tomcat.version>7.0.21</tomcat.version>
<junit.version>4.8.2</junit.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
- <cxf.version>2.5.3</cxf.version>
+ <cxf.version>2.6.1-SNAPSHOT</cxf.version>
<wss4j.version>1.6.5</wss4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.6</jdk.version>
Modified: cxf/fediz/trunk/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Fri May 11 14:14:30 2012
@@ -49,14 +49,19 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpSTSClient.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpSTSClient.java?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpSTSClient.java (original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpSTSClient.java Fri May 11 14:14:30 2012
@@ -1,3 +1,21 @@
+/**
+ * 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.fediz.service.idp;
import java.io.StringWriter;
@@ -10,6 +28,8 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.helpers.DOMUtils;
@@ -20,9 +40,9 @@ import org.apache.cxf.ws.security.tokens
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.cxf.ws.security.trust.STSUtils;
import org.apache.ws.security.components.crypto.Crypto;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
public class IdpSTSClient extends STSClient {
Modified: cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpServlet.java?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpServlet.java (original)
+++ cxf/fediz/trunk/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/IdpServlet.java Fri May 11 14:14:30 2012
@@ -1,20 +1,21 @@
-/*
- * 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.
+/**
+ * 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.fediz.service.idp;
import java.io.IOException;
@@ -219,10 +220,11 @@ public class IdpServlet extends HttpServ
ApplicationContext ctx = (ApplicationContext) bus
.getExtension(ApplicationContext.class);
try {
+ @SuppressWarnings("unchecked")
Map<String, List<String>> realmClaimsMap = (Map<String, List<String>>) ctx
.getBean("realm2ClaimsMap");
realmClaims = realmClaimsMap.get(wtrealm);
- if (realmClaims != null && realmClaims.size() > 0) {
+ if (realmClaims != null && realmClaims.size() > 0 && LOG.isDebugEnabled()) {
LOG.debug("claims for realm " + wtrealm);
for (String item : realmClaims) {
LOG.debug(" " + item);
@@ -270,8 +272,9 @@ public class IdpServlet extends HttpServ
private Element createClaimsElement(List<String> realmClaims)
throws Exception {
- if (realmClaims == null || realmClaims.size() == 0)
+ if (realmClaims == null || realmClaims.size() == 0) {
return null;
+ }
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
writer.writeStartElement("wst", "Claims", STSUtils.WST_NS_05_12);
Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/beans.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/beans.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/beans.xml Fri May 11 14:14:30 2012
@@ -27,7 +27,7 @@
</cxf:bus>
- <http:conduit name="https://localhost:9443/.*">
+ <http:conduit name="https://localhost:8443/.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:trustManagers>
<sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml Fri May 11 14:14:30 2012
@@ -13,7 +13,7 @@
<servlet-class>org.apache.cxf.fediz.service.idp.IdpServlet</servlet-class>
<init-param>
<param-name>sts.wsdl.url</param-name>
- <param-value>https://localhost:9443/fedizidpsts/STSService?wsdl</param-value>
+ <param-value>https://localhost:8443/fedizidpsts/STSService?wsdl</param-value>
</init-param>
<init-param>
<param-name>sts.wsdl.service</param-name>
Modified: cxf/fediz/trunk/services/sts/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/pom.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/pom.xml (original)
+++ cxf/fediz/trunk/services/sts/pom.xml Fri May 11 14:14:30 2012
@@ -36,6 +36,11 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
Modified: cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java (original)
+++ cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FileClaimsHandler.java Fri May 11 14:14:30 2012
@@ -1,30 +1,28 @@
-/*
- * 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.
+/**
+ * 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.fediz.service.sts;
import java.net.URI;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.sts.claims.Claim;
import org.apache.cxf.sts.claims.ClaimCollection;
import org.apache.cxf.sts.claims.ClaimTypes;
@@ -52,19 +50,6 @@ public class FileClaimsHandler implement
}
@Override
- public ClaimCollection retrieveClaimValues(
- Principal principal, RequestClaimCollection claims, WebServiceContext context, String realm
- ) {
-
- ClaimsParameters params = new ClaimsParameters();
- params.setPrincipal(principal);
- params.setWebServiceContext(context);
- params.setRealm(realm);
-
- return this.retrieveClaimValues(claims, params);
- }
-
- @Override
public List<URI> getSupportedClaimTypes() {
ArrayList<URI> list = new ArrayList<URI>();
list.add(ClaimTypes.EMAILADDRESS);
Modified: cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java (original)
+++ cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/PasswordCallbackHandler.java Fri May 11 14:14:30 2012
@@ -1,20 +1,21 @@
-/*
- * 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.
+/**
+ * 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.fediz.service.sts;
import java.io.IOException;
Modified: cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/UsernamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/UsernamePasswordCallbackHandler.java?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/UsernamePasswordCallbackHandler.java (original)
+++ cxf/fediz/trunk/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/UsernamePasswordCallbackHandler.java Fri May 11 14:14:30 2012
@@ -1,20 +1,21 @@
-/*
- * 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.
+/**
+ * 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.fediz.service.sts;
import java.io.IOException;
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml Fri May 11 14:14:30 2012
@@ -51,7 +51,7 @@
</bean>
<util:list id="encryptedUtEndpoints">
- <value>http://localhost:8082/doubleit/services/doubleitasymmetricsaml1encrypted</value>
+ <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted</value>
</util:list>
<bean id="encryptedUtSTSProperties"
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml Fri May 11 14:14:30 2012
@@ -114,7 +114,7 @@
<util:list id="transportEndpoints">
<value>.*</value>
- <value>https://localhost:(8081|8083)/doubleit/services/doubleittransport.*</value>
+ <value>https://localhost:(\d)*/doubleit/services/doubleittransport.*</value>
</util:list>
<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-ut.xml Fri May 11 14:14:30 2012
@@ -57,7 +57,7 @@
</bean>
<util:list id="utEndpoints">
- <value>http://localhost:(8080|8082)/doubleit/services/doubleit(UT|.*symmetric.*)</value>
+ <value>http://localhost:(\d)*/doubleit/services/doubleit(UT|.*symmetric.*)</value>
</util:list>
<bean id="utSTSProperties"
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-x509.xml Fri May 11 14:14:30 2012
@@ -57,8 +57,8 @@
</bean>
<util:list id="x509Endpoints">
- <value>http://localhost:8082/doubleit/services/doubleitsymmetric.*</value>
- <value>http://localhost:8082/doubleit/services/doubleitasymmetric.*</value>
+ <value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*</value>
+ <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetric.*</value>
</util:list>
<bean id="x509STSProperties"
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl?rev=1337175&r1=1337174&r2=1337175&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl Fri May 11 14:14:30 2012
@@ -678,7 +678,9 @@
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>
@@ -735,7 +737,9 @@
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>
@@ -781,7 +785,9 @@
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>