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/05/14 13:00:51 UTC

svn commit: r1743825 - in /axis/axis2/java/core/branches/1_7: ./ src/site/xdoc/docs/userguide.xml

Author: veithen
Date: Sat May 14 13:00:51 2016
New Revision: 1743825

URL: http://svn.apache.org/viewvc?rev=1743825&view=rev
Log:
Merge r1743824 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/docs/userguide.xml

Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 13:00:51 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,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826,1740693-1740694
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826,1740693-1740694,1743824

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=1743825&r1=1743824&r2=1743825&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 May 14 13:00:51 2016
@@ -127,18 +127,9 @@ using WSDL</li>
 <li>Easily retrieve the WSDL for a service</li>
 <li>Send and receive SOAP messages with attachments</li>
 <li>Create or utilize a REST-based Web service</li>
-<li>Create or utilize services that take advantage of the <a href=
+<li>Create or utilize services that take advantage of <a href=
 "http://www.oasis-open.org/committees/download.php/16790/wss-v1.1-spec-os-SOAPMessageSecurity.pdf">
-WS-Security</a>, <a href=
-"http://xml.coverpages.org/ws-reliablemessaging20030313.pdf">WS-ReliableMessaging</a>,
-<a href="http://www.w3.org/2002/ws/addr/">WS-Addressing</a>,
-<a href=
-"http://docs.oasis-open.org/ws-tx/wscoor/2006/06">WS-Coordination</a>,
-and <a href=
-"http://docs.oasis-open.org/ws-tx/wsat/2006/06">
-WS-Atomic Transaction</a> recommendations</li>
-<li>Use Axis2's modular structure to easily add support for new
-recommendations as they emerge</li>
+WS-Security</a> and <a href="http://www.w3.org/2002/ws/addr/">WS-Addressing</a></li>
 </ul>
 <p>Many more features exist as well, but this user guide
 concentrates on showing you how to accomplish the first five tasks