Author: veithen
Date: Sun Dec 19 15:13:45 2010
New Revision: 1050876
URL: http://svn.apache.org/viewvc?rev=1050876&view=rev
Log:
Merged latest changes from trunk to the release branch.
Added:
axis/axis2/java/sandesha/branches/1_4/etc/
- copied from r1050875, axis/axis2/java/sandesha/trunk/etc/
axis/axis2/java/sandesha/branches/1_4/etc/sandesha2.rdf
- copied unchanged from r1050875,
axis/axis2/java/sandesha/trunk/etc/sandesha2.rdf
Modified:
axis/axis2/java/sandesha/branches/1_4/ (props changed)
axis/axis2/java/sandesha/branches/1_4/modules/distribution/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/bin.xml
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/doc.xml
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml
axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml
axis/axis2/java/sandesha/branches/1_4/src/site/site.xml
axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml
axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/index.xml
Propchange: axis/axis2/java/sandesha/branches/1_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 19 15:13:45 2010
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1050705
+/axis/axis2/java/sandesha/trunk:1050214-1050875
Modified: axis/axis2/java/sandesha/branches/1_4/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/distribution/pom.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/distribution/pom.xml Sun Dec
19 15:13:45 2010
@@ -165,6 +165,18 @@
<generateReports>false</generateReports>
</configuration>
</plugin>
+ <plugin>
+ <!-- We don't want to deploy the distributions to the Maven
repository.
+ Reasons:
+ * Deploying the distributions will increase the size of
+ each release on the Maven repos.
+ * There is also the risk that users may start
downloading the non-Maven
+ archives from Maven repos rather than the mirrors. -->
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/bin.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/bin.xml
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/bin.xml
Sun Dec 19 15:13:45 2010
@@ -30,6 +30,7 @@
<outputDirectory>sandesha2-${version}-bin</outputDirectory>
<includes>
<include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
</includes>
</fileSet>
<fileSet>
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/doc.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/doc.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/doc.xml
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/doc.xml
Sun Dec 19 15:13:45 2010
@@ -44,6 +44,7 @@
<outputDirectory></outputDirectory>
<includes>
<include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
</includes>
</fileSet>
<fileSet>
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/distribution/src/main/assembly/src.xml
Sun Dec 19 15:13:45 2010
@@ -36,6 +36,7 @@
<!--root level files-->
<include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
</includes>
<excludes>
<exclude>**/target</exclude>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/tests/pom.xml Sun Dec 19
15:13:45 2010
@@ -156,6 +156,12 @@
<generateReports>false</generateReports>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/sandesha/branches/1_4/src/site/site.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/src/site/site.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/src/site/site.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/src/site/site.xml Sun Dec 19 15:13:45
2010
@@ -20,7 +20,7 @@
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://apache.org/</href>
+ <href>http://www.apache.org/</href>
</bannerLeft>
<bannerRight>
<name>Sandesha</name>
@@ -28,6 +28,10 @@
<href>index.html</href>
</bannerRight>
<body>
+ <links>
+ <item name="Axis2" href="http://axis.apache.org/axis2/java/core/"/>
+ <item name="Apache" href="http://www.apache.org"/>
+ </links>
<menu name="Apache Sandesha2">
<item name="Home" href="index.html" />
<item name="Downloads">
@@ -45,6 +49,10 @@
<item name="Issue Tracking" href="issue-tracking.html"/>
<item name="Source Repository" href="source-repository.html"/>
</item>
+ <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="Sponsorship"
href="http://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks"
href="http://www.apache.org/foundation/thanks.html"/>
+ <item name="Security" href="http://www.apache.org/security/"/>
</menu>
</body>
</project>
Modified: axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml Sun Dec 19
15:13:45 2010
@@ -57,17 +57,17 @@ the binay distribution and the source di
</tr>
<tr class="c"><td align="center" valign="middle"><a
name="12"></a>1.2</td><td align="center">Release</td><td>
Source Distribution
- <a href="[preferred]/ws/sandesha2/1_2/sandesha2-1.2-src.zip"
title="[preferred]/ws/sandesha2/1_2/sandesha2-1.2-src.zip">zip</a>
- <a
href="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.md5";
class="externalLink"
title="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.md5";>MD5</a>
- <a
href="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.asc";
class="externalLink"
title="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.asc";>PGP</a>
+ <a
href="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip";
title="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip";>zip</a>
+ <a
href="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.md5";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.md5";>MD5</a>
+ <a
href="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.asc";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-src.zip.asc";>PGP</a>
<br></br>
Binary Distribution
- <a href="[preferred]/ws/sandesha2/1_2/sandesha2-1.2-bin.zip"
title="[preferred]/ws/sandesha2/1_2/sandesha2-1.2-bin.zip">zip</a>
- <a
href="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.md5";
class="externalLink"
title="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.md5";>MD5</a>
- <a
href="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.asc";
class="externalLink"
title="http://www.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.asc";>PGP</a>
+ <a
href="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip";
title="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip";>zip</a>
+ <a
href="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.md5";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.md5";>MD5</a>
+ <a
href="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.asc";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_2/sandesha2-1.2-bin.zip.asc";>PGP</a>
<br></br>
</td><td>10 - 06 - 2007</td>
- <td>1.2 Release (Mirrored)</td>
+ <td>1.2 Release (Archived)</td>
<td>1.2</td>
</tr>
<tr class="c"><td align="center" valign="middle"><a
name="11"></a>1.1</td><td align="center">Release</td><td>
@@ -82,7 +82,7 @@ the binay distribution and the source di
<a
href="http://archive.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.asc";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.asc";>PGP</a>
<br></br>
</td><td>12 - 10 - 2006</td>
- <td>1.1 Release (Mirrored)</td>
+ <td>1.1 Release (Archived)</td>
<td>1.1</td>
</tr>
<tr class="c"><td align="center" valign="middle"><a
name="10"></a>1.0</td><td align="center">Release</td><td>
@@ -97,7 +97,7 @@ the binay distribution and the source di
<a
href="http://archive.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.asc";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.asc";>PGP</a>
<br></br>
</td><td>05 - 08 - 2006</td>
- <td>1.0 Release (Mirrored)</td>
+ <td>1.0 Release (Archived)</td>
<td>1.0</td>
</tr>
<tr class="b"><td align="center" valign="middle"><a
name="09"></a>0.9</td><td align="center">Release</td><td>
@@ -112,7 +112,7 @@ the binay distribution and the source di
<a
href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.asc";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.asc";>PGP</a>
<br></br>
</td><td>12 - 05 - 2005</td>
- <td>0.9 Release</td>
+ <td>0.9 Release (Archived)</td>
<td>0.93</td>
</tr>
</tbody></table>
Modified: axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/index.xml?rev=1050876&r1=1050875&r2=1050876&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/index.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/index.xml Sun Dec 19
15:13:45 2010
@@ -17,28 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
- <title>Welcome to Sandesha2 home page</title>
- <meta name="generator" content="amaya 9.2.1, see http://www.w3.org/Amaya/";
- />
-</head>
-
-<body>
-<h1>Welcome to Apache Sandesha2</h1>
-
-<p>Sandesha2 is an implementation of <a
-href="http://www.ibm.com/developerworks/webservices/library/specification/ws-rm/";
target="_blank">WS-ReliableMessaging
-specification</a> published by IBM, Microsoft, BEA and TIBCO. Sandesha2 was
-built on top of Axis2. Therefore by using Sandesha2 you can add reliable
-messaging capability to the web services hosted using Axis2. Sandesha2 can
-also be used with Axis2 client to interact with already hosted web services
-in a reliable manner. Please see sandesha2 user guide for more information on
-using Sandesha2. Read Sandesha2 Architecture guide to see how Sandesha2 work
-internally.</p>
-
-</body>
-</html>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+ <properties>
+ <title>Welcome to Sandesha2 home page</title>
+ </properties>
+ <body>
+ <h1>Welcome to Apache Sandesha2</h1>
+ <p>Apache Sandesha2™ is an Axis2 module that implements the <a
+
href="http://www.ibm.com/developerworks/webservices/library/specification/ws-rm/";
target="_blank">WS-ReliableMessaging
+ specification</a> published by IBM, Microsoft, BEA and TIBCO.
+ By using Sandesha2 you can add reliable
+ messaging capability to the web services hosted using Axis2. Sandesha2
can
+ also be used with Axis2 client to interact with already hosted web
services
+ in a reliable manner. Please see sandesha2 user guide for more
information on
+ using Sandesha2. Read Sandesha2 Architecture guide to see how
Sandesha2 work
+ internally.</p>
+ <p>Apache Sandesha2, Sandesha2, Apache, the Apache feather logo, and
the Apache Sandesha2 project logo are trademarks of The Apache Software
Foundation.</p>
+ </body>
+</document>
