cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [6/6] cxf git commit: Deleting sts-war
Date Wed, 03 Aug 2016 16:40:36 GMT
Deleting sts-war


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

Branch: refs/heads/master
Commit: bacef091c2152d51ebdefbe20244e73d1c26b39d
Parents: ff0c73b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Aug 3 17:40:15 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Aug 3 17:40:15 2016 +0100

----------------------------------------------------------------------
 services/sts/pom.xml                            |   1 -
 services/sts/sts-war/pom.xml                    | 122 ----
 .../cxf/sts/war/PasswordCallbackHandler.java    |  47 --
 .../src/main/resources/logging.properties       |  71 ---
 .../src/main/resources/stsKeystore.properties   |  24 -
 .../sts/sts-war/src/main/resources/stsstore.jks | Bin 4557 -> 0 bytes
 .../src/main/resources/tomcatKeystore.jks       | Bin 1195 -> 0 bytes
 .../main/webapp/WEB-INF/applicationContext.xml  |  31 -
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml    |  58 --
 .../src/main/webapp/WEB-INF/cxf-transport.xml   |  55 --
 .../sts-war/src/main/webapp/WEB-INF/cxf-ut.xml  |  53 --
 .../src/main/webapp/WEB-INF/cxf-x509.xml        |  68 --
 .../sts/sts-war/src/main/webapp/WEB-INF/web.xml |  41 --
 .../WEB-INF/wsdl/ws-trust-1.4-service.wsdl      | 613 -------------------
 .../main/webapp/WEB-INF/wsdl/ws-trust-1.4.wsdl  |  92 ---
 15 files changed, 1276 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index e9040c0..6bddc1e 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -32,7 +32,6 @@
     </parent>
     <modules>
         <module>sts-core</module>
-        <module>sts-war</module>
         <module>systests</module>
     </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/pom.xml b/services/sts/sts-war/pom.xml
deleted file mode 100644
index bddcdfb..0000000
--- a/services/sts/sts-war/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Soft 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,
-  softwwareare 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf.services.sts</groupId>
-    <artifactId>cxf-services-sts-war</artifactId>
-    <name>Apache CXF STS war deployment</name>
-    <packaging>war</packaging>
-    <parent>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-parent</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
-    </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf.services.sts</groupId>
-            <artifactId>cxf-services-sts-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>${cxf.slf4j.version}</version>
-            <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>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>cxf25</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-ws-mex</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>Tomcat6</id>
-            <properties>
-                <tomcat.url>http://localhost:8080/manager</tomcat.url>
-            </properties>
-        </profile>
-        <profile>
-            <id>Tomcat7</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
-            </properties>
-        </profile>
-    </profiles>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tomcat-maven-plugin</artifactId>
-                <version>1.1</version>
-                <configuration>
-                    <server>myTomcat</server>
-                    <url>${tomcat.url}</url>
-                    <path>/${project.build.finalName}</path>
-                </configuration>
-            </plugin>
-        </plugins>
-        <!-- Name of the generated WAR file -->
-        <finalName>SecurityTokenService</finalName>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/java/org/apache/cxf/sts/war/PasswordCallbackHandler.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/java/org/apache/cxf/sts/war/PasswordCallbackHandler.java b/services/sts/sts-war/src/main/java/org/apache/cxf/sts/war/PasswordCallbackHandler.java
deleted file mode 100644
index b83e798..0000000
--- a/services/sts/sts-war/src/main/java/org/apache/cxf/sts/war/PasswordCallbackHandler.java
+++ /dev/null
@@ -1,47 +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.sts.war;
-
-import java.io.IOException;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.wss4j.common.ext.WSPasswordCallback;
-
-public class PasswordCallbackHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException,
-            UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            if (callbacks[i] instanceof WSPasswordCallback) { // CXF
-                WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
-                if ("alice".equals(pc.getIdentifier())) {
-                    pc.setPassword("clarinet");
-                    break;
-                } else if ("bob".equals(pc.getIdentifier())) {
-                    pc.setPassword("trombone");
-                    break;
-                } else if ("mystskey".equals(pc.getIdentifier())) {
-                    pc.setPassword("stskpass");
-                    break;
-                }
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/resources/logging.properties
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/resources/logging.properties b/services/sts/sts-war/src/main/resources/logging.properties
deleted file mode 100644
index 7e0771c..0000000
--- a/services/sts/sts-war/src/main/resources/logging.properties
+++ /dev/null
@@ -1,71 +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.
-#
-
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the WARNING and above levels.
-handlers= java.util.logging.ConsoleHandler
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overridden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = %h/java%u.log
-java.util.logging.FileHandler.limit = 50000
-java.util.logging.FileHandler.count = 1
-java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
-
-# Limit the message that are printed on the console to WARNING and above.
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-#com.xyz.foo.level = SEVERE

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/resources/stsKeystore.properties
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/resources/stsKeystore.properties b/services/sts/sts-war/src/main/resources/stsKeystore.properties
deleted file mode 100644
index bde4bb6..0000000
--- a/services/sts/sts-war/src/main/resources/stsKeystore.properties
+++ /dev/null
@@ -1,24 +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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=stsspass
-org.apache.ws.security.crypto.merlin.keystore.alias=mystskey
-org.apache.ws.security.crypto.merlin.keystore.file=stsstore.jks
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/resources/stsstore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/resources/stsstore.jks b/services/sts/sts-war/src/main/resources/stsstore.jks
deleted file mode 100644
index 51f131f..0000000
Binary files a/services/sts/sts-war/src/main/resources/stsstore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/resources/tomcatKeystore.jks
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/resources/tomcatKeystore.jks b/services/sts/sts-war/src/main/resources/tomcatKeystore.jks
deleted file mode 100644
index e01e33d..0000000
Binary files a/services/sts/sts-war/src/main/resources/tomcatKeystore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 92182f3..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd         http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd         http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd         http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <import resource="cxf-transport.xml"/>
-    <import resource="cxf-ut.xml"/>
-    <import resource="cxf-encrypted-ut.xml"/>
-    <import resource="cxf-x509.xml"/>
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
deleted file mode 100644
index ac56be8..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd         http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd         http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd         http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    <bean id="encryptedUtSTSProviderBean" class="org.apache.cxf.sts.provider.DefaultSecurityTokenServiceProvider">
-        <property name="services" ref="encryptedUtService"/>
-        <property name="stsProperties" ref="encryptedUtSTSProperties"/>
-        <property name="encryptIssuedToken" value="true"/>
-    </bean>
-    <bean id="encryptedUtService" class="org.apache.cxf.sts.service.StaticService">
-        <property name="endpoints" ref="encryptedUtEndpoints"/>
-    </bean>
-    <util:list id="encryptedUtEndpoints">
-        <value>http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted
-                </value>
-    </util:list>
-    <bean id="encProperties" class="org.apache.cxf.sts.service.EncryptionProperties">
-        <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <property name="keyWrapAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </bean>
-    <bean id="encryptedUtSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-        <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
-        <property name="signatureUsername" value="mystskey"/>
-        <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-        <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-        <property name="encryptionProperties" ref="encProperties"/>
-        <property name="issuer" value="DoubleItSTSIssuer"/>
-        <property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean" address="/UTEncrypted" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-            <entry key="security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="security.signature.username" value="mystskey"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
deleted file mode 100644
index 3b8a3ee..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd         http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd         http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd         http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    <bean id="mapEventLogger" class="org.apache.cxf.sts.event.map.MapEventLogger"/>
-    <bean id="eventMapper" class="org.apache.cxf.sts.event.map.EventMapper">
-        <constructor-arg ref="mapEventLogger" />
-    </bean>
-    <bean id="transportSTSProviderBean" class="org.apache.cxf.sts.provider.DefaultSecurityTokenServiceProvider">
-        <property name="services" ref="transportService"/>
-        <property name="stsProperties" ref="transportSTSProperties"/>
-        <property name="eventListener" ref="eventMapper"/>
-    </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/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.sts.war.PasswordCallbackHandler"/>
-        <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-        <property name="issuer" value="DoubleItSTSIssuer"/>
-        <property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="/Transport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
deleted file mode 100644
index d091733..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd         http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd         http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd         http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    <bean id="utSTSProviderBean" class="org.apache.cxf.sts.provider.DefaultSecurityTokenServiceProvider">
-        <property name="services" ref="utService"/>
-        <property name="stsProperties" ref="utSTSProperties"/>
-    </bean>
-    <bean id="utService" class="org.apache.cxf.sts.service.StaticService">
-        <property name="endpoints" ref="utEndpoints"/>
-    </bean>
-    <util:list id="utEndpoints">
-        <value>http://localhost:(\d)*/(doubleit|metrowsp)/services/doubleit(UT|.*symmetric.*|.*)
-                </value>
-    </util:list>
-    <bean id="utSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-        <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
-        <property name="signatureUsername" value="mystskey"/>
-        <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-        <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-        <property name="issuer" value="DoubleItSTSIssuer"/>
-        <property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="UTSTS" implementor="#utSTSProviderBean" address="/UT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-            <entry key="security.signature.properties" value="stsKeystore.properties"/>
-            <!-- Below needs to be set to non-default value of false for Metro clients -->
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
deleted file mode 100644
index c9c2557..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd         http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd         http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd         http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    <bean id="x509STSProviderBean" class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
-        <property name="issueOperation" ref="x509IssueDelegate"/>
-        <property name="validateOperation" ref="x509ValidateDelegate"/>
-    </bean>
-    <bean id="x509IssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
-        <property name="tokenProviders" ref="x509SamlTokenProvider"/>
-        <property name="services" ref="x509Service"/>
-        <property name="stsProperties" ref="x509STSProperties"/>
-    </bean>
-    <bean id="x509ValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
-        <property name="tokenValidators" ref="x509SamlTokenValidator"/>
-        <property name="stsProperties" ref="x509STSProperties"/>
-    </bean>
-    <bean id="x509SamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
-        </bean>
-    <bean id="x509SamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
-        </bean>
-    <bean id="x509Service" class="org.apache.cxf.sts.service.StaticService">
-        <property name="endpoints" ref="x509Endpoints"/>
-    </bean>
-    <util:list id="x509Endpoints">
-        <value>http://localhost:(\d)*/doubleit/services/doubleitsymmetric.*
-                </value>
-        <value>http://localhost:(\d)*/doubleit/services/doubleitasymmetric.*
-                </value>
-    </util:list>
-    <bean id="x509STSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-        <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
-        <property name="signatureUsername" value="mystskey"/>
-        <property name="callbackHandlerClass" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-        <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-        <property name="issuer" value="DoubleItSTSIssuer"/>
-        <property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="X509STS" implementor="#x509STSProviderBean" address="/X509" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-            <entry key="security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="security.signature.username" value="mystskey"/>
-            <entry key="security.encryption.username" value="useReqSigCert"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e09988f..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee           http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    <display-name>CXF STS</display-name>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/applicationContext.xml</param-value>
-    </context-param>
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-    <servlet>
-        <servlet-name>sts</servlet-name>
-        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>sts</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-    <session-config>
-        <session-timeout>60</session-timeout>
-    </session-config>
-</web-app>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl b/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
deleted file mode 100644
index 24c0fe7..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
+++ /dev/null
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:tns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:wstrust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsap10="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-    <wsdl:types>
-        <xs:schema elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
-            <xs:element name="RequestSecurityToken" type="wst:AbstractRequestSecurityTokenType"/>
-            <xs:element name="RequestSecurityTokenResponse" type="wst:AbstractRequestSecurityTokenType"/>
-            <xs:complexType name="AbstractRequestSecurityTokenType">
-                <xs:sequence>
-                    <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-                <xs:attribute name="Context" type="xs:anyURI" use="optional"/>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:complexType>
-            <xs:element name="RequestSecurityTokenCollection" type="wst:RequestSecurityTokenCollectionType"/>
-            <xs:complexType name="RequestSecurityTokenCollectionType">
-                <xs:sequence>
-                    <xs:element name="RequestSecurityToken" type="wst:AbstractRequestSecurityTokenType" minOccurs="2" maxOccurs="unbounded"/>
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="RequestSecurityTokenResponseCollection" type="wst:RequestSecurityTokenResponseCollectionType"/>
-            <xs:complexType name="RequestSecurityTokenResponseCollectionType">
-                <xs:sequence>
-                    <xs:element ref="wst:RequestSecurityTokenResponse" minOccurs="1" maxOccurs="unbounded"/>
-                </xs:sequence>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:complexType>
-        </xs:schema>
-    </wsdl:types>
-    <!-- WS-Trust defines the following GEDs -->
-    <wsdl:message name="RequestSecurityTokenMsg">
-        <wsdl:part name="request" element="wst:RequestSecurityToken"/>
-    </wsdl:message>
-    <wsdl:message name="RequestSecurityTokenResponseMsg">
-        <wsdl:part name="response" element="wst:RequestSecurityTokenResponse"/>
-    </wsdl:message>
-    <wsdl:message name="RequestSecurityTokenCollectionMsg">
-        <wsdl:part name="requestCollection" element="wst:RequestSecurityTokenCollection"/>
-    </wsdl:message>
-    <wsdl:message name="RequestSecurityTokenResponseCollectionMsg">
-        <wsdl:part name="responseCollection" element="wst:RequestSecurityTokenResponseCollection"/>
-    </wsdl:message>
-    <!-- This portType an example of a Requestor (or other) endpoint that 
-         Accepts SOAP-based challenges from a Security Token Service -->
-    <wsdl:portType name="WSSecurityRequestor">
-        <wsdl:operation name="Challenge">
-            <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
-            <wsdl:output message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <!-- This portType is an example of an STS supporting full protocol -->
-    <wsdl:portType name="STS">
-        <wsdl:operation name="Cancel">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/CancelFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="Issue">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/IssueFinal" message="tns:RequestSecurityTokenResponseCollectionMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="Renew">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/RenewFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="Validate">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/ValidateFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="KeyExchangeToken">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KET" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/KETFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="RequestCollection">
-            <wsdl:input message="tns:RequestSecurityTokenCollectionMsg"/>
-            <wsdl:output message="tns:RequestSecurityTokenResponseCollectionMsg"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <!-- This portType is an example of an endpoint that accepts 
-         Unsolicited RequestSecurityTokenResponse messages -->
-    <wsdl:portType name="SecurityTokenResponseService">
-        <wsdl:operation name="RequestSecurityTokenResponse">
-            <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="UT_Binding" type="wstrust:STS">
-        <wsp:PolicyReference URI="#UT_policy"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="Issue">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Validate">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Cancel">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Renew">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="KeyExchangeToken">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="RequestCollection">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="UTEncrypted_Binding" type="wstrust:STS">
-        <wsp:PolicyReference URI="#UTEncrypted_policy"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="Issue">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Validate">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Cancel">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Renew">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="KeyExchangeToken">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="RequestCollection">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="X509_Binding" type="wstrust:STS">
-        <wsp:PolicyReference URI="#X509_policy"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="Issue">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Validate">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Cancel">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Renew">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="KeyExchangeToken">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="RequestCollection">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="Transport_Binding" type="wstrust:STS">
-        <wsp:PolicyReference URI="#Transport_policy"/>
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="Issue">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Validate">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"/>
-            <wsdl:input>
-                <wsp:PolicyReference URI="#Input_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <wsp:PolicyReference URI="#Output_policy"/>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Cancel">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="Renew">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="KeyExchangeToken">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="RequestCollection">
-            <soap:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="SecurityTokenService">
-        <wsdl:port name="UT_Port" binding="tns:UT_Binding">
-            <soap:address location="http://localhost:8080/jaxws-sts/sts"/>
-        </wsdl:port>
-        <wsdl:port name="X509_Port" binding="tns:X509_Binding">
-            <soap:address location="http://localhost:8080/jaxws-sts/sts"/>
-        </wsdl:port>
-        <wsdl:port name="Transport_Port" binding="tns:Transport_Binding">
-            <soap:address location="http://localhost:8080/jaxws-sts/sts"/>
-        </wsdl:port>
-        <wsdl:port name="UTEncrypted_Port" binding="tns:UTEncrypted_Binding">
-            <soap:address location="http://localhost:8080/jaxws-sts/sts"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsp:Policy wsu:Id="UT_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsap10:UsingAddressing/>
-                <sp:SymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:RequireDerivedKeys/>
-                                        <sp:RequireThumbprintReference/>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:EncryptSignature/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <sp:SignedSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                            <wsp:Policy>
-                                <sp:WssUsernameToken10/>
-                            </wsp:Policy>
-                        </sp:UsernameToken>
-                    </wsp:Policy>
-                </sp:SignedSupportingTokens>
-                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportRefKeyIdentifier/>
-                        <sp:MustSupportRefIssuerSerial/>
-                        <sp:MustSupportRefThumbprint/>
-                        <sp:MustSupportRefEncryptedKey/>
-                    </wsp:Policy>
-                </sp:Wss11>
-                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportIssuedTokens/>
-                        <sp:RequireClientEntropy/>
-                        <sp:RequireServerEntropy/>
-                    </wsp:Policy>
-                </sp:Trust13>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="UTEncrypted_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsap10:UsingAddressing/>
-                <sp:SymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:RequireDerivedKeys/>
-                                        <sp:RequireThumbprintReference/>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:EncryptSignature/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <sp:SignedSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                            <wsp:Policy>
-                                <sp:WssUsernameToken10/>
-                            </wsp:Policy>
-                        </sp:UsernameToken>
-                    </wsp:Policy>
-                </sp:SignedSupportingTokens>
-                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportRefKeyIdentifier/>
-                        <sp:MustSupportRefIssuerSerial/>
-                        <sp:MustSupportRefThumbprint/>
-                        <sp:MustSupportRefEncryptedKey/>
-                    </wsp:Policy>
-                </sp:Wss11>
-                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportIssuedTokens/>
-                        <sp:RequireClientEntropy/>
-                        <sp:RequireServerEntropy/>
-                    </wsp:Policy>
-                </sp:Trust13>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="X509_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsap10:UsingAddressing/>
-                <sp:AsymmetricBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:TripleDes/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:EncryptSignature/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportRefKeyIdentifier/>
-                        <sp:MustSupportRefIssuerSerial/>
-                        <sp:MustSupportRefThumbprint/>
-                        <sp:MustSupportRefEncryptedKey/>
-                    </wsp:Policy>
-                </sp:Wss11>
-                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportIssuedTokens/>
-                        <sp:RequireClientEntropy/>
-                        <sp:RequireServerEntropy/>
-                    </wsp:Policy>
-                </sp:Trust13>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="Transport_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsap10:UsingAddressing/>
-                <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:SignedSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                            <wsp:Policy>
-                                <sp:WssUsernameToken10/>
-                            </wsp:Policy>
-                        </sp:UsernameToken>
-                    </wsp:Policy>
-                </sp:SignedSupportingTokens>
-                <sp:Wss11 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportRefKeyIdentifier/>
-                        <sp:MustSupportRefIssuerSerial/>
-                        <sp:MustSupportRefThumbprint/>
-                        <sp:MustSupportRefEncryptedKey/>
-                    </wsp:Policy>
-                </sp:Wss11>
-                <sp:Trust13 xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportIssuedTokens/>
-                        <sp:RequireClientEntropy/>
-                        <sp:RequireServerEntropy/>
-                    </wsp:Policy>
-                </sp:Trust13>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="Input_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <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:SignedParts>
-                <sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <sp:Body/>
-                </sp:EncryptedParts>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="Output_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SignedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <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:SignedParts>
-                <sp:EncryptedParts xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <sp:Body/>
-                </sp:EncryptedParts>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bacef091/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4.wsdl b/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4.wsdl
deleted file mode 100644
index 8a17e51..0000000
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2006. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<wsdl:definitions xmlns:tns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-    <wsdl:types>
-        <xs:schema elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
-            <xs:element name="RequestSecurityToken" type="wst:AbstractRequestSecurityTokenType"/>
-            <xs:element name="RequestSecurityTokenResponse" type="wst:AbstractRequestSecurityTokenType"/>
-            <xs:complexType name="AbstractRequestSecurityTokenType">
-                <xs:sequence>
-                    <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-                <xs:attribute name="Context" type="xs:anyURI" use="optional"/>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:complexType>
-            <xs:element name="RequestSecurityTokenCollection" type="wst:RequestSecurityTokenCollectionType"/>
-            <xs:complexType name="RequestSecurityTokenCollectionType">
-                <xs:sequence>
-                    <xs:element name="RequestSecurityToken" type="wst:AbstractRequestSecurityTokenType" minOccurs="2" maxOccurs="unbounded"/>
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="RequestSecurityTokenResponseCollection" type="wst:RequestSecurityTokenResponseCollectionType"/>
-            <xs:complexType name="RequestSecurityTokenResponseCollectionType">
-                <xs:sequence>
-                    <xs:element ref="wst:RequestSecurityTokenResponse" minOccurs="1" maxOccurs="unbounded"/>
-                </xs:sequence>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:complexType>
-        </xs:schema>
-    </wsdl:types>
-    <!-- WS-Trust defines the following GEDs -->
-    <wsdl:message name="RequestSecurityTokenMsg">
-        <wsdl:part name="request" element="wst:RequestSecurityToken"/>
-    </wsdl:message>
-    <wsdl:message name="RequestSecurityTokenResponseMsg">
-        <wsdl:part name="response" element="wst:RequestSecurityTokenResponse"/>
-    </wsdl:message>
-    <wsdl:message name="RequestSecurityTokenCollectionMsg">
-        <wsdl:part name="requestCollection" element="wst:RequestSecurityTokenCollection"/>
-    </wsdl:message>
-    <wsdl:message name="RequestSecurityTokenResponseCollectionMsg">
-        <wsdl:part name="responseCollection" element="wst:RequestSecurityTokenResponseCollection"/>
-    </wsdl:message>
-    <!-- This portType an example of a Requestor (or other) endpoint that 
-         Accepts SOAP-based challenges from a Security Token Service -->
-    <wsdl:portType name="WSSecurityRequestor">
-        <wsdl:operation name="Challenge">
-            <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
-            <wsdl:output message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <!-- This portType is an example of an STS supporting full protocol -->
-    <wsdl:portType name="STS">
-        <wsdl:operation name="Cancel">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/CancelFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="Issue">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTRC/IssueFinal" message="tns:RequestSecurityTokenResponseCollectionMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="Renew">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/RenewFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="Validate">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/ValidateFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="KeyExchangeToken">
-            <wsdl:input wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KET" message="tns:RequestSecurityTokenMsg"/>
-            <wsdl:output wsam:Action="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/KETFinal" message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-        <wsdl:operation name="RequestCollection">
-            <wsdl:input message="tns:RequestSecurityTokenCollectionMsg"/>
-            <wsdl:output message="tns:RequestSecurityTokenResponseCollectionMsg"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <!-- This portType is an example of an endpoint that accepts 
-         Unsolicited RequestSecurityTokenResponse messages -->
-    <wsdl:portType name="SecurityTokenResponseService">
-        <wsdl:operation name="RequestSecurityTokenResponse">
-            <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
-        </wsdl:operation>
-    </wsdl:portType>
-</wsdl:definitions>


Mime
View raw message