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 2015/12/19 18:35:59 UTC

svn commit: r1720953 - in /axis/axis2/java/core/branches/1_6: ./ src/site/ src/site/markdown/ src/site/markdown/release-notes/ src/site/resources/ src/site/xdoc/ src/site/xdoc/modules/ src/site/xdoc/tools/

Author: veithen
Date: Sat Dec 19 17:35:59 2015
New Revision: 1720953

URL: http://svn.apache.org/viewvc?rev=1720953&view=rev
Log:
Merge r1720650 (with changes) to the 1.6 branch.

Added:
    axis/axis2/java/core/branches/1_6/src/site/markdown/download.md.vm
      - copied unchanged from r1720650, axis/axis2/java/core/trunk/src/site/markdown/download.md.vm
    axis/axis2/java/core/branches/1_6/src/site/markdown/release-notes/
      - copied from r1720650, axis/axis2/java/core/trunk/src/site/markdown/release-notes/
    axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/index.xml
      - copied unchanged from r1720650, axis/axis2/java/core/trunk/src/site/xdoc/tools/index.xml
Removed:
    axis/axis2/java/core/branches/1_6/src/site/markdown/release-notes/1.7.0.md
    axis/axis2/java/core/branches/1_6/src/site/resources/download.cgi
    axis/axis2/java/core/branches/1_6/src/site/xdoc/download.xml
    axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/index.xml.vm
Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    axis/axis2/java/core/branches/1_6/pom.xml
    axis/axis2/java/core/branches/1_6/src/site/site.xml
    axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml
    axis/axis2/java/core/branches/1_6/src/site/xdoc/modules/index.xml

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 19 17:35:59 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
 205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,168382
 7,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
 205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,168382
 7,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650

Modified: axis/axis2/java/core/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1720953&r1=1720952&r2=1720953&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Sat Dec 19 17:35:59 2015
@@ -550,6 +550,18 @@
                     <artifactId>maven-site-plugin</artifactId>
                     <version>3.4</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
+                    <version>1.5</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codehaus.groovy</groupId>
+                            <artifactId>groovy-all</artifactId>
+                            <version>2.4.4</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -586,6 +598,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-site</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <scripts>
+                                <script>
+                                    import java.util.Date
+                                    import java.text.MessageFormat
+                                    project.properties['release_date'] = MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
+                                    project.properties['release_version'] = project.version.replaceAll("-SNAPSHOT", "")
+                                </script>
+                            </scripts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <reporting>

Modified: axis/axis2/java/core/branches/1_6/src/site/site.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/site.xml?rev=1720953&r1=1720952&r2=1720953&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/src/site/site.xml (original)
+++ axis/axis2/java/core/branches/1_6/src/site/site.xml Sat Dec 19 17:35:59 2015
@@ -43,9 +43,12 @@
 
         <menu name="Axis2/Java">
             <item name="Home" href="index.html" />
-        </menu>
-        <menu name="Downloads">
-            <item name="Releases" href="download.cgi" />
+            <item name="Downloads" href="download.html" />
+            <item name="Release Notes" href="javascript:void(0)">
+                <item name="1.6.1" href="release-notes/1.6.1.html"/>
+                <item name="1.6.2" href="release-notes/1.6.2.html"/>
+                <item name="1.6.3" href="release-notes/1.6.3.html"/>
+            </item>
             <item name="Modules" href="modules/index.html" />
             <item name="Tools" href="tools/index.html" />
         </menu>

Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml?rev=1720953&r1=1720952&r2=1720953&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml (original)
+++ axis/axis2/java/core/branches/1_6/src/site/xdoc/index.xml Sat Dec 19 17:35:59 2015
@@ -35,86 +35,6 @@ here, you can visit the <a href=
 "http://axis.apache.org/axis2/c/"><strong>Apache Axis2/C</strong></a>
 Web site for Axis2/C implementation information.</p>
 <p>Apache Axis2, Axis2, Apache, the Apache feather logo, and the Apache Axis2 project logo are trademarks of The Apache Software Foundation.</p>
-<h3>June 27, 2015 - Apache Axis2/Java 1.6.3 released!</h3>
-<p>Apache Axis2/Java 1.6.3 is a maintenance release that fixes over
-<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&amp;version=12320771">50 issues</a>.
-It is also the first release to package all the transport implementations from the formerly separate Axis2
-Transports project. This release upgrades Axiom to version 1.2.14.</p>
-<h3>April 17, 2012 - Apache Axis2/Java 1.6.2 released!</h3>
-<p>Apache Axis2/Java 1.6.2 is a maintenance release containing fixes for several issues discovered over the past six months.
-This version upgrade Axiom to 1.2.13 and Neethi to version 3.0.2. The complete list of fixes can be found <a href="http://s.apache.org/7lT">here</a>.</p>
-<h3>Aug 30, 2011 - Apache Axis2/Java 1.5.6 and 1.6.1 released!</h3>
-<p>1.5.6 and 1.6.1 are maintenance releases containing fixes for several issues discovered over the last months.
-Both versions upgrade Axiom to 1.2.12. Axis2 1.6.1 also upgrades Neethi to version 3.0.1 and contains changes required
-for Geronimo 3.0. The complete list of fixes can be found here:</p>
-<ul>
-<li><a href="http://s.apache.org/axis2-1.5.6">Fix list for 1.5.6</a></li>
-<li><a href="http://s.apache.org/axis2-1.6.1">Fix list for 1.6.1</a></li>
-</ul>
-<p>If possible users should upgrade to Axis2 1.6.1. The Axis2 1.5.6 maintenance release is intended for use in situations where
-upgrading to 1.6.1 is not possible immediately.</p>
-<h3>May 29, 2011 - Apache Axis2/Java Version 1.5.5 Released!</h3>
-<p>1.5.5 is a maintenance release that contains fixes for several issues in the sample projects included with the binary distribution
-as well as a couple of <a href="http://s.apache.org/Q9q">other issues</a>.</p>
-<p>If possible users should upgrade to Axis2 1.6.0 (see below). The Axis2 1.5.5 maintenance release is intended for use in situations where
-upgrading to 1.6.0 is not possible immediately.</p>
-<h3>May 17, 2011 - Apache Axis2/Java Version 1.6.0 Released!</h3>
-<p>1.6.0 is a major release of axis2 with many fixes and improvements to the core and all it's modules</p>
-<p>Refer to the following filter <a href="http://bit.ly/issues-fixed-for-1_6">Issues fixed for the 1.6.0 release</a> to find all the issues fixed for the 1.6.0 release</p>
-<h3>December 19, 2010 - Apache Axis2/Java Version 1.5.4 Released!</h3>
-<p>1.5.4 is a maintenance release that contains fixes for the following issues:</p>
-<ul>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-3784">AXIS2-3784</a>: WSDL port address is not correctly generated for machines having multiple network interfaces</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-3793">AXIS2-3793</a>: move image to the correct place</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-3851">AXIS2-3851</a>: adb-codegen no longer accepts schemas without targetNamespace</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4261">AXIS2-4261</a>: Enable axis2server.sh to start SimpleAxis2Server in remote debug mode</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4586">AXIS2-4586</a>: JiBX Client Stub not cleaning up HTTP connections after each operation</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4642">AXIS2-4642</a>: ?wsdl query calls out.close() twice, confusing at least some Tomcat connectors</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4674">AXIS2-4674</a>: Unable to get WSDL2 doc for services on WebSphere 7.0 and Axis2 1.5.1</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4819">AXIS2-4819</a>: Race condition in WSDLDataLocator</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4827">AXIS2-4827</a>: ADB class org.apache.axis2.databinding.types.Union does not implement java.io.Serializable</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4842">AXIS2-4842</a>: NPE in TempFileManager</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4871">AXIS2-4871</a>: Null Pointer Exception in AxisService.printXSD</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4883">AXIS2-4883</a>: Javadoc link broken on site and in documents distribution</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4885">AXIS2-4885</a>: Unsubstituted variable ${axis2_version} in 1.5.3 site and documents distribution</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4887">AXIS2-4887</a>: TargetNameSpace required for XSD2Java</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4888">AXIS2-4888</a>: The org.apache.axis2:axis2 Maven artifact should not have a classifier</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4889">AXIS2-4889</a>: SOAPConnectionTest#testGet slows down the build</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4896">AXIS2-4896</a>: Unable to install axis2.eclipse.codegen.plugin into eclipse</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4901">AXIS2-4901</a>: LinkageError related to DOM classes when using the codegen plugin for Eclipse</li>
-<li><a href="https://issues.apache.org:443/jira/browse/AXIS2-4909">AXIS2-4909</a>: Simple MTOM web service no longer works due to missing closing MIME boundary.</li>
-</ul>
-<p>In addition, this release contains changes required for the Sandesha2 1.4 release.</p>
-<h3>November 12, 2010 - Apache Axis2/Java Version 1.5.3 Released!</h3>
-<p>1.5.3 is a maintenance release that contains the following improvements:</p>
-<ul>
-<li>Improved support for SSL when using the servlet transport: Axis2 can now be configured
-so that generated WSDLs contain https endpoints (<a href="https://issues.apache.org/jira/browse/AXIS2-4465">AXIS2-4465</a>).</li>
-<li>Improved compatibility with Rampart (<a href="https://issues.apache.org/jira/browse/AXIS2-3213">AXIS2-3213</a>
-and <a href="https://issues.apache.org/jira/browse/AXIS2-4870">AXIS2-4870</a>) and Sandesha2 (potential HTTP connection pool starvation).</li>
-<li>Axiom has been upgraded to 1.2.10. This version contains performance improvements relevant for Rampart.</li>
-<li>Application (business) faults are no longer logged at level ERROR (<a href="https://issues.apache.org/jira/browse/AXIS2-4280">AXIS2-4280</a>).</li>
-<li>Improved conformance to the SAAJ specifications. The 1.5.3 release contains a set of fixes and improvements for the SAAJ
-implementation developed on the trunk and not included in previous releases from the 1.5 branch.</li>
-<li>Axis2 now relies exclusively on dependencies available from the Maven central repository, and no other Maven
-repositories are required. This in particular fixes a build problem that appeared after the 1.5.2 release.</li>
-<li>The Eclipse and IntelliJ IDEA plugins are again available for <a href="tools/index.html">download</a> via the Axis2 Web site
-(previous 1.5.x versions could only be downloaded from the Maven repository).</li>
-</ul>
-<p>[ <a href="download.cgi#1_5_3"><strong>Download</strong> ]</a></p>
-<h3>September 6, 2010 - Apache Axis2/Java Version 1.5.2 Released!</h3>
-<p>1.5.2 is a maintenance release to fix the security issue described in
-<a href="http://svn.apache.org/repos/asf/axis/axis2/java/core/security/CVE-2010-1632.pdf">CVE-2010-1632</a>
-as well as an XSS vulnerability in the admin console and some other minor issues. It also
-upgrades Axiom to version 1.2.9.</p>
-<p>[ <a href="download.cgi#1_5_2"><strong>Download</strong></a> ]</p>
-<h3>October 23, 2009 - Apache Axis2/Java Version 1.5.1 Released!</h3>
-<p>The 1.5.1 version fixes some <a href="http://issues.apache.org/jira/browse/AXIS2">bugs</a>, including most notably a connection starvation issue that would cause a large number of sockets stuck in CLOSE_WAIT or TIME_WAIT.</p>
-<p><b>PLEASE NOTE:</b> As of Axis2 1.5, we now <i>require</i> JDK 1.5 or above.  JDKs 1.4 or previous are no longer supported.</p>
-<p>[ <a href="download.cgi#1_5_1"><strong>Download</strong></a> ]</p>
-<p>Please see the <a href="refLib.html">Axis
-Reference Library</a> for a list of technical resources that should
-prove useful on this project.</p>
 <h3><em>Why Apache Axis2:</em></h3>
 <p>A new architecture for Axis2 was introduced during the August
 2004 Summit in Colombo, Sri Lanka. The new architecture on which

Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/modules/index.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/modules/index.xml?rev=1720953&r1=1720952&r2=1720953&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/src/site/xdoc/modules/index.xml (original)
+++ axis/axis2/java/core/branches/1_6/src/site/xdoc/modules/index.xml Sat Dec 19 17:35:59 2015
@@ -40,20 +40,14 @@ Axis2.</p>
 <td><a href="addressing/index.html">Addressing</a></td>
 <td>This is an implementation of WS-Addressing submission version
 (2004-08) and WS-Addressing 2005-08 versions.</td>
-<td>Bundled with the <a href="../download.cgi#std-bin">Standard Binary Distribution</a>.</td>
+<td>Bundled with the <a href="../download.html">Standard Binary Distribution</a>.</td>
 </tr>
 <tr>
 <td><a href="../docs/soapmonitor-module.html">SOAP Monitor</a></td>
 <td>SOAP Monitor utility provides a way for Web services developers
 to monitor the SOAP messages being sent/received without requiring
 any special configuration or restarting of the server</td>
-<td>Bundled with the <a href="../download.cgi#std-bin">Standard Binary Distribution</a>.</td>
-</tr>
-<tr>
-<td><a href=
-"http://ws.apache.org/sandesha/sandesha2/index.html">Sandesha2</a></td>
-<td>An implementation of WS-RM specification February 2005</td>
-<td><a href="http://axis.apache.org/axis2/java/sandesha/">http://axis.apache.org/axis2/java/sandesha/</a></td>
+<td>Bundled with the <a href="../download.html">Standard Binary Distribution</a>.</td>
 </tr>
 <tr>
 <td><a href="http://ws.apache.org/rampart/">Rampart</a></td>