You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/12/09 19:07:02 UTC

svn commit: r724801 - in /cxf/sandbox/interopfest/wstrust10: ./ src/ src/main/ src/main/java/ src/main/java/interop/ src/main/java/interop/client/ src/main/java/interop/server/ src/main/resources/ src/main/resources/etc/ src/style/

Author: dkulp
Date: Tue Dec  9 10:07:01 2008
New Revision: 724801

URL: http://svn.apache.org/viewvc?rev=724801&view=rev
Log:
Start adding wstrust10 stuff

Added:
    cxf/sandbox/interopfest/wstrust10/
    cxf/sandbox/interopfest/wstrust10/build.xml   (with props)
    cxf/sandbox/interopfest/wstrust10/pom.xml   (with props)
    cxf/sandbox/interopfest/wstrust10/src/
    cxf/sandbox/interopfest/wstrust10/src/main/
    cxf/sandbox/interopfest/wstrust10/src/main/java/
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/resources/
    cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/
    cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml   (with props)
    cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml   (with props)
    cxf/sandbox/interopfest/wstrust10/src/style/
    cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl   (with props)

Added: cxf/sandbox/interopfest/wstrust10/build.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/build.xml?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/build.xml (added)
+++ cxf/sandbox/interopfest/wstrust10/build.xml Tue Dec  9 10:07:01 2008
@@ -0,0 +1,39 @@
+<project name="wssec11" default="download">
+    <property name="build.dir" location="target"/>
+    <target name="download.internal" if="needsToDownload">
+        <mkdir dir="${build.dir}/generated/src/main/resources/certs"/>
+        <mkdir dir="${build.dir}/wsdl"/>
+        <get src="http://131.107.72.15/ilab/Certs/Certs.zip" dest="${build.dir}/Certs.zip"/>
+        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl" dest="${build.dir}/wsdl/WsTrustSym.wsdl"/>
+        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0" dest="${build.dir}/wsdl/WsTrustSym_policy.wsdl"/>
+
+        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl" dest="${build.dir}/wsdl/WsTrustAsym.wsdl"/>
+        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl=wsdl0" dest="${build.dir}/wsdl/WsTrustAsym_policy.wsdl"/>
+
+        <!--get src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd0" dest="${build.dir}/wsdl/WsSecurity11_0.xsd"/>
+        <get src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd1" dest="${build.dir}/wsdl/WsSecurity11_1.xsd"/>
+        <get src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd2" dest="${build.dir}/wsdl/WsSecurity11_2.xsd"/>
+        <get src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd3" dest="${build.dir}/wsdl/WsSecurity11_3.xsd"/-->
+        <antcall target="transform"/>
+        <unzip src="${build.dir}/Certs.zip" dest="${build.dir}/generated/src/main/resources/certs"/>
+    </target>
+
+    <target name="transform">
+        <mkdir dir="${build.dir}/wsdl2"/>
+        <xslt basedir="${build.dir}/wsdl" destdir="${build.dir}/wsdl2"
+            style="src/style/makelocal.xsl" extension=".xml">
+            <mapper type="identity"/>
+        </xslt>
+    </target>
+
+
+    <target name="download">
+        <mkdir dir="${build.dir}"/>
+        <condition property="needsToDownload">
+          <not>
+            <available file="${build.dir}/Certs.zip"/>
+          </not>
+        </condition>
+        <antcall target="download.internal"/>
+    </target>
+</project>

Propchange: cxf/sandbox/interopfest/wstrust10/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/sandbox/interopfest/wstrust10/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/pom.xml?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/pom.xml (added)
+++ cxf/sandbox/interopfest/wstrust10/pom.xml Tue Dec  9 10:07:01 2008
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.interopfest</groupId>
+    <artifactId>ws-trust10</artifactId>
+    <version>1.0</version>
+    <properties>
+        <cxf.version>2.2-SNAPSHOT</cxf.version>
+        <test.method>A</test.method>
+    </properties>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>target/generated/src/main/resources</directory>
+                <includes>
+                    <include>**</include>
+                </includes>
+            </resource>
+        </resources>
+
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <id>download-certs-wsdl</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant inheritRefs="true" antfile="${basedir}/build.xml">
+                                    <property value="${basedir}/target" name="build.dir" />
+                                    <target name="download" />
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.7.1</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${cxf.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/target/wsdl2/WsTrustSym.wsdl</wsdl>
+                                </wsdlOption>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/target/wsdl2/WsTrustAsym.wsdl</wsdl>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>server</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>demo.hw.server.Server</mainClass>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>client</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <classpathScope>test</classpathScope>
+                                    <mainClass>interop.client.Client</mainClass>
+                                    <arguments>
+                                        <argument>${test.method}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+
+
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <!-- Jetty is needed if you're using the CXFServlet -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: cxf/sandbox/interopfest/wstrust10/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java Tue Dec  9 10:07:01 2008
@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 1993-2007 IONA Technologies PLC.
+ *            All Rights Reserved.
+ */
+/**
+ * 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 interop.client;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+
+import org.tempuri.SymmetricFederatedService;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ws.security.tokenstore.SecurityToken;
+
+import interopbaseaddress.interop.IPingService;
+
+public final class Client {
+    
+    private static final String INPUT = "foo";
+    
+    /**
+     * This class is not instantiated
+     */
+    private Client() {
+    }
+
+    /**
+
+    /**
+     * The main entrypoint into the application
+     */
+    public static void main(String argv[])
+        throws Exception {
+        if (argv.length < 1) {
+            System.err.println(
+                "SYNTAX: java Client <port-prefix>"
+            );
+            //argv = new String[] {"A"};
+        }
+
+        Bus b = new SpringBusFactory().createBus("etc/client.xml");
+        
+        
+        final String portPrefix = argv[0];
+
+        final SymmetricFederatedService svc = new SymmetricFederatedService();
+        final IPingService port = 
+            svc.getPort(
+                new QName(
+                    "http://InteropBaseAddress/interop",
+                    portPrefix + "_IPingService"
+                ),
+                IPingService.class
+            );
+        
+        //STSClient stsClient = new STSClient(b);
+        /*
+        Policy stsPolicy = loadPolicy(args[2]);
+        Policy servicePolicy = loadPolicy(args[4]);
+        
+        
+        //stsClient.setAddressingNs("http://www.w3.org/2005/08/addressing");
+        
+        stsClient.setAddressingNs(org.apache.axis2.addressing.AddressingConstants.Final.WSA_NAMESPACE);
+        stsClient.setRstTemplate(getRSTTemplate());
+        stsClient.setAction(RahasConstants.WST_NS_05_02 + RahasConstants.RST_ACTION_ISSUE);
+        stsClient.setSoapVersion(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+        */
+        //SecurityToken responseToken = stsClient.requestSecurityToken();//servicePolicy, args[3], stsPolicy, null);
+        
+        
+        /*
+        ((BindingProvider)port)
+            .getRequestContext()
+                .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+                     "http://localhost:9001/" + portPrefix + "PingService");
+        */
+        
+        final String output = port.echo(INPUT);
+        if (!INPUT.equals(output)) {
+            System.err.println(
+                "Expected " + INPUT + " but got " + output
+            );
+        } else {
+            System.out.println("OK!");
+        }
+    }
+
+}

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java Tue Dec  9 10:07:01 2008
@@ -0,0 +1,54 @@
+/**
+ *        Copyright (c) 1993-2006 IONA Technologies PLC.
+ *                       All Rights Reserved.
+ */
+package interop.client;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class KeystorePasswordCallback implements CallbackHandler {
+    
+    private Map<String, String> passwords = 
+        new HashMap<String, String>();
+    
+    public KeystorePasswordCallback() {
+        passwords.put("Alice", "abcd!1234");
+        passwords.put("alice", "abcd!1234");
+        passwords.put("Bob", "abcd!1234");
+        passwords.put("bob", "abcd!1234");
+    }
+
+    /**
+     * It attempts to get the password from the private 
+     * alias/passwords map.
+     */
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+            WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+            String pass = passwords.get(pc.getIdentifer());
+            if (pass != null) {
+                pc.setPassword(pass);
+                return;
+            }
+        }
+    }
+    
+    /**
+     * Add an alias/password pair to the callback mechanism.
+     */
+    public void setAliasPassword(String alias, String password) {
+        passwords.put(alias, password);
+    }
+}

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/KeystorePasswordCallback.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java Tue Dec  9 10:07:01 2008
@@ -0,0 +1,58 @@
+/**
+ *        Copyright (c) 1993-2007 IONA Technologies PLC.
+ *                       All Rights Reserved.
+ */
+
+package interop.client;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class UTPasswordCallback implements CallbackHandler {
+    
+    private Map<String, String> passwords = 
+        new HashMap<String, String>();
+    
+    public UTPasswordCallback() {
+        passwords.put("Alice", "ecilA");
+        passwords.put("Frank", "invalid-password");
+    }
+
+    /**
+     * Here, we attempt to get the password from the private 
+     * alias/passwords map.
+     */
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+            WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+            String pass = passwords.get(pc.getIdentifer());
+            if (pass != null) {
+                pc.setPassword(pass);
+                return;
+            }
+        }
+        
+        //
+        // Password not found
+        //
+        throw new IOException();
+    }
+    
+    /**
+     * Add an alias/password pair to the callback mechanism.
+     */
+    public void setAliasPassword(String alias, String password) {
+        passwords.put(alias, password);
+    }
+}

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/UTPasswordCallback.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java Tue Dec  9 10:07:01 2008
@@ -0,0 +1,54 @@
+/**
+ *        Copyright (c) 1993-2006 IONA Technologies PLC.
+ *                       All Rights Reserved.
+ */
+package interop.server;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class KeystorePasswordCallback implements CallbackHandler {
+    
+    private Map<String, String> passwords = 
+        new HashMap<String, String>();
+    
+    public KeystorePasswordCallback() {
+        passwords.put("Alice", "abcd!1234");
+        passwords.put("alice", "abcd!1234");
+        passwords.put("Bob", "abcd!1234");
+        passwords.put("bob", "abcd!1234");
+    }
+
+    /**
+     * It attempts to get the password from the private 
+     * alias/passwords map.
+     */
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+            WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+            String pass = passwords.get(pc.getIdentifer());
+            if (pass != null) {
+                pc.setPassword(pass);
+                return;
+            }
+        }
+    }
+    
+    /**
+     * Add an alias/password pair to the callback mechanism.
+     */
+    public void setAliasPassword(String alias, String password) {
+        passwords.put(alias, password);
+    }
+}

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/KeystorePasswordCallback.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java Tue Dec  9 10:07:01 2008
@@ -0,0 +1,55 @@
+/**
+ * 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 interop.server;
+
+import javax.xml.ws.Holder;
+
+import interopbaseaddress.interop.IPingService;
+
+/**
+ * 
+ */
+public class PingService implements IPingService {
+
+    /** {@inheritDoc}*/
+    public String echo(String request) {
+        System.out.println("echo: " + request);
+        return request;
+    }
+
+
+    /** {@inheritDoc}*/
+    public String fault(String request) {
+        return request;
+    }
+
+    /** {@inheritDoc}*/
+    public String header(String request) {
+        return request;
+    }
+
+
+    public void ping(Holder<String> scenario, Holder<String> origin, Holder<String> text) {
+        // TODO Auto-generated method stub
+        
+    }
+
+
+}

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/PingService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java Tue Dec  9 10:07:01 2008
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 1993-2007 IONA Technologies PLC.
+ *            All Rights Reserved.
+ */
+/**
+ * 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 interop.server;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ws.security.SecurityConstants;
+
+public class Server {
+
+    
+    protected Server() throws Exception {
+        new SpringBusFactory().createBus("etc/server.xml");
+
+        // Scenario 4.1
+        /*
+        addProperties(Endpoint.publish("http://localhost:9001/APingService", 
+                             new APingService()));
+        addProperties(Endpoint.publish("http://localhost:9001/A-NoTimestampPingService", 
+                             new ANoTimestampPingService()));
+        addProperties(Endpoint.publish("http://localhost:9001/ADPingService", 
+                             new ADPingService()));
+         */
+        
+        // Scenario 4.2
+        addProperties(Endpoint.publish("http://localhost:9001/UXPingService", 
+                                       new UXPingService()));
+        
+        //argv = new String[] {"A-ES"}; //NOT WORKING YET
+        //argv = new String[] {"AD-ES"}; //NOT WORKING YET
+        //argv = new String[] {"UX"}; //NOT WORKING YET
+        /*
+        argv = new String[] {"UX-NoTimestamp"}; //NOT WORKING YET
+        argv = new String[] {"UXD"};
+        argv = new String[] {"UXD_IPingService1"};
+        argv = new String[] {"UX-SEES"};
+        argv = new String[] {"UXD-SEES"};
+        argv = new String[] {"X"};
+        argv = new String[] {"X_IPingService1"};
+        argv = new String[] {"X-NoTimestamp"};
+        argv = new String[] {"X-AES128"};
+        argv = new String[] {"X-AES192"};
+        argv = new String[] {"X-TripleDES"};
+        argv = new String[] {"XD"};
+        argv = new String[] {"XD_IPingService1"};
+        argv = new String[] {"XD-ES"};
+        argv = new String[] {"XD-SEES"};
+        */
+    }
+    private final void addProperties(Endpoint ep) {
+        ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+        ep.getProperties().put(SecurityConstants.ENCRYPT_USERNAME, "Bob");
+        ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, "etc/bob.properties");
+    }
+    
+    public static void main(String args[]) throws Exception {
+        new Server();
+        System.out.println("Server ready...");
+
+        Thread.sleep(60 * 60 * 1000);
+        System.out.println("Server exiting");
+        System.exit(0);
+    }
+    
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService11", 
+                          portName = "A_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "wsdl/WsSecurity11.wsdl")        
+    public static class APingService extends PingService {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService11", 
+                          portName = "A-NoTimestamp_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "wsdl/WsSecurity11.wsdl")        
+    public static class ANoTimestampPingService extends PingService {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService11", 
+                          portName = "AD_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "wsdl/WsSecurity11.wsdl")        
+    public static class ADPingService extends PingService {
+    }
+    @javax.jws.WebService(targetNamespace = "http://InteropBaseAddress/interop", 
+                          serviceName = "PingService11", 
+                          portName = "UX_IPingService", 
+                          endpointInterface = "interopbaseaddress.interop.IPingService",
+                          wsdlLocation = "wsdl/WsSecurity11.wsdl")        
+    public static class UXPingService extends PingService {
+    }
+}

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/server/Server.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties Tue Dec  9 10:07:01 2008
@@ -0,0 +1,5 @@
+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=password
+org.apache.ws.security.crypto.merlin.keystore.alias=Alice
+org.apache.ws.security.crypto.merlin.file=keys/alice.jks

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/alice.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties Tue Dec  9 10:07:01 2008
@@ -0,0 +1,5 @@
+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=password
+org.apache.ws.security.crypto.merlin.keystore.alias=Bob
+org.apache.ws.security.crypto.merlin.file=keys/bob.jks

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/bob.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml Tue Dec  9 10:07:01 2008
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -->
+<!-- Copyright (c) 1993-2007 IONA Technologies PLC. -->
+<!--            All Rights Reserved. -->
+<!-- -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:cxf="http://cxf.apache.org/core"
+       xmlns:p="http://cxf.apache.org/policy"
+       xmlns:sec="http://cxf.apache.org/configuration/security"
+       xsi:schemaLocation="
+          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
+          http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd
+          http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd
+          http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd
+          http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+          http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+    <cxf:bus>
+        <cxf:features>
+            <p:policies/>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+    <!-- -->
+    <!-- Scenario 4.1 -->
+    <!-- -->
+    <jaxws:client name="{http://InteropBaseAddress/interop}A_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}A-NoTimestamp_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}AD_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}A-ES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}AD-ES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+
+    <jaxws:client name="{http://InteropBaseAddress/interop}UX_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}UX-NoTimestamp_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}UXD_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>    
+    <jaxws:client name="{http://InteropBaseAddress/interop}UX-SEES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>    
+    <jaxws:client name="{http://InteropBaseAddress/interop}UXD-SEES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>    
+    
+    <jaxws:client name="{http://InteropBaseAddress/interop}X_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}X-NoTimestamp_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}X-AES128_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}X-AES192_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}X-TripleDES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}XD_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+        <jaxws:client name="{http://InteropBaseAddress/interop}XD-ES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>
+    <jaxws:client name="{http://InteropBaseAddress/interop}XD-SEES_IPingService" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="Alice"/>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+            <entry key="ws-security.encryption.username" value="Bob"/>
+            <entry key="ws-security.encryption.properties" value="etc/bob.properties"/> 
+        </jaxws:properties>
+    </jaxws:client>        
+</beans>

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml (added)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml Tue Dec  9 10:07:01 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -->
+<!-- Copyright (c) 1993-2007 IONA Technologies PLC. -->
+<!--            All Rights Reserved. -->
+<!-- -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xmlns:cxf="http://cxf.apache.org/core"
+       xmlns:p="http://cxf.apache.org/policy"
+       xmlns:sec="http://cxf.apache.org/configuration/security"
+       xsi:schemaLocation="
+          http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd
+          http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd
+          http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd
+          http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd
+          http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+          http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
+>
+    <cxf:bus>
+        <cxf:features>
+            <p:policies/>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+
+</beans>

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/server.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl?rev=724801&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl (added)
+++ cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl Tue Dec  9 10:07:01 2008
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xsl:output method="xml"/>
+
+    <!--xsl:template match="xs:import">
+        <xsl:copy>
+            <xsl:choose>
+                <xsl:when test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd0'">
+                    <xsl:attribute name="schemaLocation">WsSecurity11_0.xsd</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd1'">
+                    <xsl:attribute name="schemaLocation">WsSecurity11_1.xsd</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd2'">
+                    <xsl:attribute name="schemaLocation">WsSecurity11_2.xsd</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd3'">
+                    <xsl:attribute name="schemaLocation">WsSecurity11_3.xsd</xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="schemaLocation"><xsl:value-of select="@schemaLocation"/></xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:apply-templates select="@namespace"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template-->
+    <xsl:template match="wsdl:import">
+        <xsl:copy>
+            <xsl:choose>
+                <xsl:when test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl'">
+                    <xsl:attribute name="location">WsTrustSym.wsdl</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0'">
+                    <xsl:attribute name="location">WsTrustSym_policy.wsdl</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl'">
+                    <xsl:attribute name="location">WsTrustAsym.wsdl</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl=wsdl0'">
+                    <xsl:attribute name="location">WsTrustAsym_policy.wsdl</xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="location">WsTrustSym_policy.wsdl</xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:apply-templates select="@namespace"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="xs:element[@ref='xs:schema']">
+    </xsl:template>
+    <xsl:template match="@*">
+        <xsl:copy/>
+    </xsl:template>
+    <xsl:template match="*">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>

Propchange: cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml