Author: veithen
Date: Sun Dec 27 09:01:29 2015
New Revision: 1721789
URL: http://svn.apache.org/viewvc?rev=1721789&view=rev
Log:
RAMPART-378: Merge r1721749 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/policy.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/policy.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/services.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/policy.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 27 09:01:29 2015
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514,1721640,1721694,1721717,1721719-1721721
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514,1721640,1721694,1721717,1721719-1721721,1721749
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1721789&r1=1721788&r2=1721789&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
Sun Dec 27 09:01:29 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/branches/1_6/modules/rampart-samples/policy/sample05/policy.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/policy.xml?rev=1721789&r1=1721788&r2=1721789&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/policy.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/policy.xml
Sun Dec 27 09:01:29 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/branches/1_6/modules/rampart-samples/policy/sample06/policy.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/policy.xml?rev=1721789&r1=1721788&r2=1721789&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/policy.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/policy.xml
Sun Dec 27 09:01:29 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/branches/1_6/modules/rampart-samples/policy/sample06/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/services.xml?rev=1721789&r1=1721788&r2=1721789&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/services.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/services.xml
Sun Dec 27 09:01:29 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/branches/1_6/modules/rampart-samples/policy/sample08/policy.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/policy.xml?rev=1721789&r1=1721788&r2=1721789&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/policy.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/policy.xml
Sun Dec 27 09:01:29 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/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java?rev=1721789&r1=1721788&r2=1721789&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/src/test/java/org/apache/rampart/samples/runner/SampleTest.java
Sun Dec 27 09:01:29 2015
@@ -53,8 +53,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;
