Author: veithen
Date: Sat Dec 26 20:08:50 2015
New Revision: 1721749
URL: http://svn.apache.org/viewvc?rev=1721749&view=rev
Log:
RAMPART-378: Dynamically replace port number in policies to make sample 06 work.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample05/policy.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml
axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml?rev=1721749&r1=1721748&r2=1721749&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
(original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml Sat
Dec 26 20:08:50 2015
@@ -173,7 +173,11 @@
<exclude name="**/Client.java"/>
</javac>
- <copy file="sample@{sample.number}/services.xml"
tofile="${temp.dir}/META-INF/services.xml" overwrite="true"/>
+ <copy file="sample@{sample.number}/services.xml"
tofile="${temp.dir}/META-INF/services.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${server.port}"/>
+ </filterset>
+ </copy>
<copy file="${keys.dir}/service.jks"
tofile="${temp.dir}/service.jks" overwrite="true"/>
<copy file="${keys.dir}/sts.jks"
tofile="${temp.dir}/sts.jks" overwrite="true"/>
<copy file="${keys.dir}/service.properties"
tofile="${temp.dir}/service.properties" overwrite="true"/>
@@ -228,8 +232,16 @@
<exclude name="**/Client.java"/>
</javac>
- <copy file="sample@{sample.number}/services.xml"
tofile="${temp.dir}/META-INF/services.xml" overwrite="true"/>
- <copy file="sample@{sample.number}/mex_policy.xml"
tofile="${temp.dir}/mex_policy.xml" overwrite="true"/>
+ <copy file="sample@{sample.number}/services.xml"
tofile="${temp.dir}/META-INF/services.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${server.port}"/>
+ </filterset>
+ </copy>
+ <copy file="sample@{sample.number}/mex_policy.xml"
tofile="${temp.dir}/mex_policy.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${server.port}"/>
+ </filterset>
+ </copy>
<copy file="${keys.dir}/service.jks"
tofile="${temp.dir}/service.jks" overwrite="true"/>
<copy file="${keys.dir}/sts.jks" tofile="${temp.dir}/sts.jks"
overwrite="true"/>
<copy file="${keys.dir}/service.properties"
tofile="${temp.dir}/service.properties" overwrite="true"/>
@@ -283,13 +295,18 @@
<copy file="${keys.dir}/client.jks"
tofile="${temp.client.dir}/client.jks" overwrite="true"/>
<copy file="${keys.dir}/client.properties"
tofile="${temp.client.dir}/client.properties" overwrite="true"/>
+ <copy file="sample@{sample.number}/policy.xml"
tofile="${temp.client.dir}/policy.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${client.port}"/>
+ </filterset>
+ </copy>
<!-- Run client -->
<java
classname="org.apache.rampart.samples.policy.sample@{sample.number}.Client"
fork="true" failonerror="true">
<arg
value="${sample.services.url}/sample@{sample.number}"/>
<arg value="${client.repos.dir}/sample@{sample.number}"/>
- <arg value="sample@{sample.number}/policy.xml"/>
+ <arg value="${temp.client.dir}/policy.xml"/>
<classpath>
<path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample05/policy.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample05/policy.xml?rev=1721749&r1=1721748&r2=1721749&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample05/policy.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample05/policy.xml
Sat Dec 26 20:08:50 2015
@@ -35,7 +35,7 @@
<wsp:Policy>
<sp:IssuedToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<Issuer
xmlns="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <Address
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:8080/axis2/services/STS</Address>
+ <Address
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:@port@/axis2/services/STS</Address>
</Issuer>
<sp:RequestSecurityTokenTemplate>
<t:TokenType
xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust";>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</t:TokenType>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml?rev=1721749&r1=1721748&r2=1721749&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
Sat Dec 26 20:08:50 2015
@@ -35,7 +35,7 @@
<wsp:Policy>
<sp:IssuedToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<Issuer
xmlns="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <Address
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:8080/axis2/services/STS</Address>
+ <Address
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:@port@/axis2/services/STS</Address>
<Metadata
xmlns="http://www.w3.org/2005/08/addressing";>
<mex:Metadata
xmlns:mex="http://schemas.xmlsoap.org/ws/2004/09/mex";
@@ -43,7 +43,7 @@
<mex:MetadataSection
Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex";>
<mex:MetadataReference>
<Address
-
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:8080/axis2/services/mex</Address>
+
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:@port@/axis2/services/mex</Address>
</mex:MetadataReference>
</mex:MetadataSection>
</mex:Metadata>
@@ -104,4 +104,4 @@
</ramp:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
+</wsp:Policy>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml?rev=1721749&r1=1721748&r2=1721749&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
Sat Dec 26 20:08:50 2015
@@ -183,7 +183,7 @@
<mex:MetadataSection
Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex";>
<mex:MetadataReference>
<Address
-
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:8080/axis2/services/mex</Address>
+
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:@port@/axis2/services/mex</Address>
</mex:MetadataReference>
</mex:MetadataSection>
</mex:Metadata>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml?rev=1721749&r1=1721748&r2=1721749&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml
Sat Dec 26 20:08:50 2015
@@ -35,7 +35,7 @@
<wsp:Policy>
<sp:IssuedToken
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<Issuer
xmlns="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
- <Address
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:8080/axis2/services/STS</Address>
+ <Address
xmlns="http://www.w3.org/2005/08/addressing";>http://localhost:@port@/axis2/services/STS</Address>
</Issuer>
<sp:RequestSecurityTokenTemplate>
<t:TokenType
xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust";>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1721749&r1=1721748&r2=1721749&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Sat Dec 26 20:08:50 2015
@@ -41,8 +41,8 @@ public class SampleTest extends TestCase
suite.addTest(new SampleTest("policy", "03"));
suite.addTest(new SampleTest("policy", "04"));
suite.addTest(new SampleTest("policy", "05"));
- // TODO: these are failing
-// suite.addTest(new SampleTest("policy", "06"));
+ suite.addTest(new SampleTest("policy", "06"));
+ // TODO: failing
// suite.addTest(new SampleTest("policy", "07"));
suite.addTest(new SampleTest("policy", "08"));
return suite;
