You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/02/13 15:46:43 UTC
svn commit: r1730223 - in /axis/axis2/java/core/branches/1_7: ./
src/site/xdoc/articles.xml src/site/xdoc/docs/userguide.xml
src/site/xdoc/index.xml
Author: veithen
Date: Sat Feb 13 14:46:43 2016
New Revision: 1730223
URL: http://svn.apache.org/viewvc?rev=1730223&view=rev
Log:
Merged r1730222 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/src/site/xdoc/articles.xml
axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/userguide.xml
axis/axis2/java/core/branches/1_7/src/site/xdoc/index.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 13 14:46:43 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730222
Modified: axis/axis2/java/core/branches/1_7/src/site/xdoc/articles.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/xdoc/articles.xml?rev=1730223&r1=1730222&r2=1730223&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/xdoc/articles.xml (original)
+++ axis/axis2/java/core/branches/1_7/src/site/xdoc/articles.xml Sat Feb 13 14:46:43 2016
@@ -178,12 +178,5 @@ with Axis2/Java ServiceClient?</a>- By E
based Web Service in your Webapp?</a>- By Davanum Sirinivas(17 May
2006)</li>
</ul>
-<h2>Other</h2>
-<ul>
-<li><a href=
-"http://pzf.fremantle.org/2007/05/getting-started-with-wsrm-and-axis2.html">
-Getting started with Axis2 and Sandesha2 to do
-WS-ReliableMessaging</a></li>
-</ul>
</body>
</html>
Modified: axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/userguide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/userguide.xml?rev=1730223&r1=1730222&r2=1730223&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/userguide.xml (original)
+++ axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/userguide.xml Sat Feb 13 14:46:43 2016
@@ -207,8 +207,7 @@ are executed within the phases. You can
and handlers.</p>
<p>Handlers come from "modules" that can be plugged into a running
Axis2 system. These modules, such as Rampart, which provides an
-implementation of WS-Security, and Sandesha, which provides an
-implementation of WS-ReliableMessaging, are the main extensibility
+implementation of WS-Security, are the main extensibility
mechanisms in Axis2.</p>
<a name="distributions" id="distributions"></a>
<h2>Axis2 Distributions</h2>
Modified: axis/axis2/java/core/branches/1_7/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/xdoc/index.xml?rev=1730223&r1=1730222&r2=1730223&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/xdoc/index.xml (original)
+++ axis/axis2/java/core/branches/1_7/src/site/xdoc/index.xml Sat Feb 13 14:46:43 2016
@@ -58,17 +58,6 @@ functionality for features such as secur
currently available or under development include:</p>
<ul>
<li><a href=
-"http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrm"
->WS-ReliableMessaging</a> - Supported by <a href=
-"http://axis.apache.org/axis2/java/sandesha/">Apache
-Sandesha2</a></li>
-<li><a href=
-"http://www-128.ibm.com/developerworks/library/specification/ws-tx/#coor"
->WS-Coordination</a> and <a href=
-"http://www-128.ibm.com/developerworks/library/specification/ws-tx/#atom"
->WS-AtomicTransaction</a> - Supported by <a href=
-"http://axis.apache.org/axis2/java/kandula/">Apache Kandula2</a></li>
-<li><a href=
"http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wss"
>WS-Security</a> - Supported by <a href=
"http://axis.apache.org/axis2/java/rampart/">
@@ -157,16 +146,6 @@ export machine-readable descriptions of
Axis2.</p>
</li>
<li>
-<p style="margin-bottom: 0in"><strong>Add-ons</strong> - Several
-Web services specifications have been incorporated including
-<a href="http://ws.apache.org/wss4j/">WSS4J</a> for
-security (Apache Rampart), <a href="http://axis.apache.org/axis2/java/sandesha/"
->Sandesha</a> for reliable messaging, <a href=
-"http://axis.apache.org/axis2/java/kandula/">Kandula</a> which
-is an encapsulation of WS-Coordination, WS-AtomicTransaction and
-WS-BusinessActivity.</p>
-</li>
-<li>
<p style="margin-bottom: 0in"><strong>Composition and
Extensibility</strong> - Modules and phases improve support for
composability and extensibility. Modules support composability and