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 2017/04/26 21:02:42 UTC
svn commit: r1792811 - in /axis/axis2/java/core/branches/1_7: ./
modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html
modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java
Author: veithen
Date: Wed Apr 26 21:02:42 2017
New Revision: 1792811
URL: http://svn.apache.org/viewvc?rev=1792811&view=rev
Log:
Merge r1792802 and r1792804 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html
axis/axis2/java/core/branches/1_7/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 26 21:02:42 2017
@@ -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,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650,1792655
+/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,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650,1792655,1792802,1792804
Modified: axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html?rev=1792811&r1=1792810&r2=1792811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html Wed Apr 26 21:02:42 2017
@@ -2,6 +2,8 @@
<title>JMS Transport Configuration</title>
<body>
+Transport implementation for JMS.
+
<h2>JMS Listener Configuration (axis2.xml)</h2>
e.g:
Modified: axis/axis2/java/core/branches/1_7/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java?rev=1792811&r1=1792810&r2=1792811&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java Wed Apr 26 21:02:42 2017
@@ -60,7 +60,9 @@ public class TestkitJavadocDoclet {
Resource resource = resourceInfo.getResource(qualifiedName);
List<Dependency> dependencies = resource == null ? null : resource.getDependencies();
if (dependencies != null || usedBy != null) {
- StringBuilder buffer = new StringBuilder(clazz.getRawCommentText());
+ String rawCommentText = clazz.getRawCommentText();
+ StringBuilder buffer = new StringBuilder(
+ rawCommentText.trim().length() == 0 ? "No documentation available." : rawCommentText);
buffer.append("<h2>Resource information</h2>");
if (usedBy != null) {
buffer.append("This resource is used by: ");