cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r736136 - in /cxf/sandbox/interopfest/wssec11: build.xml src/main/java/interop/client/Client.java src/style/makelocal.xsl
Date Tue, 20 Jan 2009 22:23:40 GMT
Author: dkulp
Date: Tue Jan 20 14:23:39 2009
New Revision: 736136

URL: http://svn.apache.org/viewvc?rev=736136&view=rev
Log:
Flip to the newer endpoints and stub in the Kerberos tests (not yet working)

Modified:
    cxf/sandbox/interopfest/wssec11/build.xml
    cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
    cxf/sandbox/interopfest/wssec11/src/style/makelocal.xsl

Modified: cxf/sandbox/interopfest/wssec11/build.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/build.xml?rev=736136&r1=736135&r2=736136&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/build.xml (original)
+++ cxf/sandbox/interopfest/wssec11/build.xml Tue Jan 20 14:23:39 2009
@@ -4,12 +4,12 @@
         <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_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl"
dest="${build.dir}/wsdl/WsSecurity11.wsdl"/>
-        <get src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl=wsdl0"
dest="${build.dir}/wsdl/WsSecurity11_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"/>
+        <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl"
dest="${build.dir}/wsdl/WsSecurity11.wsdl"/>
+        <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl=wsdl0"
dest="${build.dir}/wsdl/WsSecurity11_policy.wsdl"/>
+        <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd0"
dest="${build.dir}/wsdl/WsSecurity11_0.xsd"/>
+        <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd1"
dest="${build.dir}/wsdl/WsSecurity11_1.xsd"/>
+        <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd2"
dest="${build.dir}/wsdl/WsSecurity11_2.xsd"/>
+        <get src="http://131.107.153.205/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>

Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java?rev=736136&r1=736135&r2=736136&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java Tue Jan 20 14:23:39
2009
@@ -70,6 +70,10 @@
                                  "XD",
                                  "XD-ES",
                                  "XD-SEES",
+                                 //"K",   //NOT YET WORKING
+                                 //"K-NoTimestamp",     //NOT YET WORKING
+                                 //"KD",   //NOT YET WORKING
+                                 //"KD-ES"   //NOT YET WORKING
             };
         }
         //argv = new String[] {argv[10]};

Modified: cxf/sandbox/interopfest/wssec11/src/style/makelocal.xsl
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/style/makelocal.xsl?rev=736136&r1=736135&r2=736136&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/style/makelocal.xsl (original)
+++ cxf/sandbox/interopfest/wssec11/src/style/makelocal.xsl Tue Jan 20 14:23:39 2009
@@ -1,22 +1,24 @@
 <?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">
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
     <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:when test="@schemaLocation='http://ndgo-introp-s24/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:when test="@schemaLocation='http://ndgo-introp-s24/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:when test="@schemaLocation='http://ndgo-introp-s24/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:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd3'">
                     <xsl:attribute name="schemaLocation">WsSecurity11_3.xsd</xsl:attribute>
                 </xsl:when>
                 <xsl:otherwise>
@@ -30,7 +32,10 @@
     <xsl:template match="wsdl:import">
         <xsl:copy>
             <xsl:choose>
-                <xsl:when test="@location='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl'">
+                <xsl:when test="@location='http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl'">
+                    <xsl:attribute name="location">WsSecurity11.wsdl</xsl:attribute>
+                </xsl:when>
+                <xsl:when test="@location='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?wsdl'">
                     <xsl:attribute name="location">WsSecurity11.wsdl</xsl:attribute>
                 </xsl:when>
                 <xsl:otherwise>
@@ -41,6 +46,23 @@
             <xsl:apply-templates/>
         </xsl:copy>
     </xsl:template>
+    <xsl:template match="soap12:address|soap:address">
+        <xsl:copy>
+            <xsl:choose>
+                <xsl:when test="starts-with(@location,'http://ndgo-introp-s24/')">
+                    <xsl:attribute name="location">http://131.107.153.205/<xsl:value-of
select="substring(@location,24)"/></xsl:attribute>
+                </xsl:when>
+                <xsl:when test="starts-with(@location,'https://ndgo-introp-s24/')">
+                    <xsl:attribute name="location">https://131.107.153.205/<xsl:value-of
select="substring(@location,25)"/></xsl:attribute>
+                </xsl:when>
+                
+                <xsl:otherwise>
+                    <xsl:apply-templates select="@location"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
     <xsl:template match="xs:element[@ref='xs:schema']">
     </xsl:template>
     <xsl:template match="@*">



Mime
View raw message