Author: dkulp
Date: Fri Mar 11 17:27:21 2011
New Revision: 1080686
URL: http://svn.apache.org/viewvc?rev=1080686&view=rev
Log:
Merged revisions 1080588 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1080588 | dkulp | 2011-03-11 09:56:25 -0500 (Fri, 11 Mar 2011) | 1 line
[CXF-3316] Get the interop samples building again
........
Added:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/Certs.zip
- copied unchanged from r1080588,
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/Certs.zip
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/download_wsdl.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/Server.java
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/style/makelocal.xsl
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/download_wsdl.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/download_wsdl.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/style/makelocal.xsl
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/download_wsdl.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/pom.xml Fri
Mar 11 17:27:21 2011
@@ -85,12 +85,13 @@
<!--
these are a bit fragile as they need to go off to external sites to
get stuff like
wsdl's and certs and such
- As the http://131.107.72.15/ilab/Certs/Certs.zip is not working, we
comment out these modules temperately -->
- <!--module>ws_security/interopfest/wssc</module>
+ -->
+
+ <module>ws_security/interopfest/wssc</module>
<module>ws_security/interopfest/wstrust10</module>
<module>ws_security/interopfest/wssec10</module>
<module>ws_security/interopfest/wssec11</module-->
- <!--module>ws_security/interopfest/wstrust13</module-->
+ <module>ws_security/interopfest/wstrust13</module>
</modules>
<dependencyManagement>
<dependencies>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/download_wsdl.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/download_wsdl.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/download_wsdl.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/download_wsdl.xml
Fri Mar 11 17:27:21 2011
@@ -24,7 +24,8 @@
<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/ilab/Certs/Certs.zip";
dest="${build.dir}/Certs.zip"/-->
+ <copy file="../Certs.zip" todir="${build.dir}"/>
<get src="${baseLocation}?wsdl"
dest="${build.dir}/wsdl/WSSecureConversation.wsdl"/>
<get src="${baseLocation}?wsdl=wsdl0"
dest="${build.dir}/wsdl/WSSecureConversation_policy.wsdl"/>
<get src="${baseLocation}?xsd=xsd0"
dest="${build.dir}/wsdl/WSSecureConversation_0.xsd"/>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/Server.java?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/Server.java
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/server/Server.java
Fri Mar 11 17:27:21 2011
@@ -30,7 +30,6 @@ import interop.client.KeystorePasswordCa
public class Server {
protected Server(String baseUrl) throws Exception {
- WSSConfig.getDefaultWSConfig();
new SpringBusFactory().createBus("etc/server.xml");
//"SecureConversation_UserNameOverTransport_IPingService",
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml
Fri Mar 11 17:27:21 2011
@@ -17,17 +17,21 @@
under the License.
-->
<project name="wssec11" default="download">
+ <property name="wsdl.host" value="131.107.153.205"/>
+ <property name="target.host" value="${wsdl.host}"/>
+
<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_WsSecurity_Service_Indigo/WsSecurity10.svc?wsdl";
dest="${build.dir}/wsdl/WsSecurity10.wsdl"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?wsdl=wsdl0";
dest="${build.dir}/wsdl/WsSecurity10_policy.wsdl"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd0";
dest="${build.dir}/wsdl/WsSecurity10_0.xsd"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd1";
dest="${build.dir}/wsdl/WsSecurity10_1.xsd"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd2";
dest="${build.dir}/wsdl/WsSecurity10_2.xsd"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd3";
dest="${build.dir}/wsdl/WsSecurity10_3.xsd"/>
+ <!--get src="http://131.107.72.15/ilab/Certs/Certs.zip";
dest="${build.dir}/Certs.zip"/-->
+ <copy file="../Certs.zip" todir="${build.dir}"/>
+ <get
src="http://${wsdl.host}/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?wsdl";
dest="${build.dir}/wsdl/WsSecurity10.wsdl"/>
+ <get
src="http://${wsdl.host}/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?wsdl=wsdl0";
dest="${build.dir}/wsdl/WsSecurity10_policy.wsdl"/>
+ <get
src="http://${wsdl.host}/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd0";
dest="${build.dir}/wsdl/WsSecurity10_0.xsd"/>
+ <get
src="http://${wsdl.host}/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd1";
dest="${build.dir}/wsdl/WsSecurity10_1.xsd"/>
+ <get
src="http://${wsdl.host}/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd2";
dest="${build.dir}/wsdl/WsSecurity10_2.xsd"/>
+ <get
src="http://${wsdl.host}/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd3";
dest="${build.dir}/wsdl/WsSecurity10_3.xsd"/>
<antcall target="transform"/>
<unzip src="${build.dir}/Certs.zip"
dest="${build.dir}/generated/src/main/resources/certs"/>
</target>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/style/makelocal.xsl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/style/makelocal.xsl?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/style/makelocal.xsl
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/style/makelocal.xsl
Fri Mar 11 17:27:21 2011
@@ -8,16 +8,16 @@
<xsl:template match="xs:import">
<xsl:copy>
<xsl:choose>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd0'">
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd0'">
<xsl:attribute
name="schemaLocation">WsSecurity10_0.xsd</xsl:attribute>
</xsl:when>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd1'">
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd1'">
<xsl:attribute
name="schemaLocation">WsSecurity10_1.xsd</xsl:attribute>
</xsl:when>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd2'">
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd2'">
<xsl:attribute
name="schemaLocation">WsSecurity10_2.xsd</xsl:attribute>
</xsl:when>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd3'">
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?xsd=xsd3'">
<xsl:attribute
name="schemaLocation">WsSecurity10_3.xsd</xsl:attribute>
</xsl:when>
<xsl:otherwise>
@@ -31,7 +31,7 @@
<xsl:template match="wsdl:import">
<xsl:copy>
<xsl:choose>
- <xsl:when
test="@location='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?wsdl'">
+ <xsl:when
test="@location='http://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity10.svc?wsdl'">
<xsl:attribute
name="location">WsSecurity10.wsdl</xsl:attribute>
</xsl:when>
<xsl:otherwise>
@@ -47,7 +47,7 @@
<xsl:copy>
<xsl:choose>
<xsl:when
test="@location='https://kirillgdev04/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport'">
- <xsl:attribute
name="location">https://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport</xsl:attribute>
+ <xsl:attribute
name="location">https://131.107.153.205/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/UserNameOverTransport</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="@*"/>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/download_wsdl.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/download_wsdl.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/download_wsdl.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/download_wsdl.xml
Fri Mar 11 17:27:21 2011
@@ -21,7 +21,8 @@
<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/ilab/Certs/Certs.zip";
dest="${build.dir}/Certs.zip"/-->
+ <copy file="../Certs.zip" todir="${build.dir}"/>
<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"/>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/download_wsdl.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/download_wsdl.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/download_wsdl.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/download_wsdl.xml
Fri Mar 11 17:27:21 2011
@@ -18,13 +18,11 @@
-->
<project name="wssec11" default="download">
<property name="build.dir" location="target"/>
- <property name="wsdl.host" value="131.107.72.15"/>
+ <property name="wsdl.host" value="131.107.153.205"/>
<property name="target.host" value="${wsdl.host}"/>
<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://${wsdl.host}/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl";
dest="${build.dir}/wsdl/WsTrustSym.wsdl"/>
<get
src="http://${wsdl.host}/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0";
dest="${build.dir}/wsdl/WsTrustSym_policy.wsdl"/>
@@ -36,6 +34,10 @@
<antcall target="transform"/>
+
+ <!--get src="http://131.107.72.15/ilab/Certs/Certs.zip";
dest="${build.dir}/Certs.zip"/-->
+ <copy file="../Certs.zip" todir="${build.dir}"/>
+ <mkdir dir="${build.dir}/generated/src/main/resources/certs"/>
<unzip src="${build.dir}/Certs.zip"
dest="${build.dir}/generated/src/main/resources/certs"/>
</target>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
Fri Mar 11 17:27:21 2011
@@ -34,8 +34,8 @@
<cxf.version>${project.version}</cxf.version>
<test.method>ALL</test.method>
- <wsdl.host>131.107.72.15</wsdl.host>
- <target.host>131.107.72.15</target.host>
+ <wsdl.host>131.107.153.205</wsdl.host>
+ <target.host>131.107.153.205</target.host>
</properties>
<build>
<resources>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/style/makelocal.xsl
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/style/makelocal.xsl?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/style/makelocal.xsl
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/src/style/makelocal.xsl
Fri Mar 11 17:27:21 2011
@@ -9,8 +9,8 @@
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
<xsl:output method="xml"/>
- <xsl:param name="target.host">131.107.72.15</xsl:param>
- <xsl:param name="wsdl.host">131.107.72.15</xsl:param>
+ <xsl:param name="target.host">131.107.153.205</xsl:param>
+ <xsl:param name="wsdl.host">131.107.153.205</xsl:param>
<xsl:template match="wsdl:import">
<xsl:copy>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/download_wsdl.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/download_wsdl.xml?rev=1080686&r1=1080685&r2=1080686&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/download_wsdl.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/download_wsdl.xml
Fri Mar 11 17:27:21 2011
@@ -24,7 +24,8 @@
<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/ilab/Certs/Certs.zip";
dest="${build.dir}/Certs.zip"/-->
+ <copy file="../Certs.zip" todir="${build.dir}"/>
<get src="http://${service.host}/PingService?wsdl";
dest="${build.dir}/wsdl/PingService.wsdl"/>
<get src="http://${trust.host}/trust?wsdl";
dest="${build.dir}/wsdl/trust.wsdl"/>
