Author: veithen
Date: Sun Dec 20 20:15:00 2015
New Revision: 1721060
URL: http://svn.apache.org/viewvc?rev=1721060&view=rev
Log:
RAMPART-405: Merge r1721059 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/src/site/xdoc/quick-start.xml
axis/axis2/java/rampart/branches/1_6/src/site/xdoc/samples.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 20 20:15:00 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
+/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
Modified: axis/axis2/java/rampart/branches/1_6/src/site/xdoc/quick-start.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/src/site/xdoc/quick-start.xml?rev=1721060&r1=1721059&r2=1721060&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/src/site/xdoc/quick-start.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/src/site/xdoc/quick-start.xml Sun Dec
20 20:15:00 2015
@@ -11,7 +11,7 @@
<p>Steps to install</p>
<ol>
<li>If you haven't installed Axis2, then download and
extract the standard binary distribution. Make sure you have set the AXIS2_HOME
environment variable</li>
- <li>Run ant from the "samples" directory to copy the
required libraries and modules to relevant directories in AXIS2_HOME.</li>
+ <li>Run ant from the top level directory of the Rampart
distribution to copy the required libraries and modules to relevant directories
in AXIS2_HOME.</li>
</ol>
<p></p>
Modified: axis/axis2/java/rampart/branches/1_6/src/site/xdoc/samples.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/src/site/xdoc/samples.xml?rev=1721060&r1=1721059&r2=1721060&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/src/site/xdoc/samples.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/src/site/xdoc/samples.xml Sun Dec 20
20:15:00 2015
@@ -29,6 +29,7 @@
<h2> Policy samples </h2>
<p>These samples use WS Security Policy Language for configuration. It
is recommended to use policy based configuration model for all production
scenarios </p>
<h3>Running Samples</h3>
+ <p>Before beginning, please install Rampart as described <a
href="quick-start.html">here</a>.</p>
<p>Now we'll look at how to run the first sample inside samples/policy
folder.</p>
<ol>
<li>Open a console and change the directory to sample/policy and
give the following command. This will start the server at port 8080</li>
