Author: veithen
Date: Sun Dec 19 19:01:01 2010
New Revision: 1050932
URL: http://svn.apache.org/viewvc?rev=1050932&view=rev
Log:
Bulk merged latest changes from trunk to the release branch.
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/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
axis/axis2/java/sandesha/branches/1_4/src/site/xdoc/download.xml
Propchange: axis/axis2/java/sandesha/branches/1_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 19 19:01:01 2010
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1050214-1050875,1050879
+/axis/axis2/java/sandesha/trunk:1050214-1050926
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=1050932&r1=1050931&r2=1050932&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 19:01:01 2010
@@ -179,4 +179,21 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Generating checksums will make it easier to
prepare distributions for upload -->
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?rev=1050932&r1=1050931&r2=1050932&view=diff
==============================================================================
---
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
(original)
+++
axis/axis2/java/sandesha/branches/1_4/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
Sun Dec 19 19:01:01 2010
@@ -81,17 +81,20 @@ public class SandeshaTestCase extends Te
String testRource = "target" + File.separator + "test-classes";
resourceDir = new File(testRource).getPath();
- String propFileStr = resourceDir + File.separator + PROPERTY_FILE_NAME;
- properties = new Properties ();
-
- try {
- FileInputStream propertyFile = new FileInputStream (new
File(propFileStr));
- properties.load(propertyFile);
- } catch (FileNotFoundException e) {
- log.error(e);
- } catch (IOException e) {
- log.error(e);
- }
+ // TODO: This doesn't work as expected when the sandesha2-test module
is executed in a multi-module build.
+ // Anyway, sandesha2-test.properties only contains a value for
the test server port. This value is
+ // the same as the default, so we may as well skip the code.
+// String propFileStr = resourceDir + File.separator +
PROPERTY_FILE_NAME;
+// properties = new Properties ();
+//
+// try {
+// FileInputStream propertyFile = new FileInputStream (new
File(propFileStr));
+// properties.load(propertyFile);
+// } catch (FileNotFoundException e) {
+// log.error(e);
+// } catch (IOException e) {
+// log.error(e);
+// }
}
public void setUp () throws Exception {
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=1050932&r1=1050931&r2=1050932&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
19:01:01 2010
@@ -40,6 +40,21 @@ the binay distribution and the source di
<td width="200" align="center">Description</td>
<td width="200" align="center">Compatible Axis2 version</td>
</tr>
+ <tr class="c"><td align="center" valign="middle"><a
name="14"></a>1.4</td><td align="center">Release</td><td>
+ Source Distribution
+ <a
href="[preferred]/axis/axis2/java/sandesha/1.4/sandesha2-1.4-src.zip"
title="[preferred]/axis/axis2/java/sandesha/1.4/sandesha2-1.4-src.zip">zip</a>
+ <a
href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-src.zip.md5";
class="externalLink"
title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-src.zip.md5";>MD5</a>
+ <a
href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-src.zip.asc";
class="externalLink"
title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-src.zip.asc";>PGP</a>
+ <br></br>
+ Binary Distribution
+ <a
href="[preferred]/axis/axis2/java/sandesha/1.4/sandesha2-1.4-bin.zip"
title="[preferred]/axis/axis2/java/sandesha/1.4/sandesha2-1.4-bin.zip">zip</a>
+ <a
href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-bin.zip.md5";
class="externalLink"
title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-bin.zip.md5";>MD5</a>
+ <a
href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-bin.zip.asc";
class="externalLink"
title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.4/sandesha2-1.4-bin.zip.asc";>PGP</a>
+ <br></br>
+ </td><td>19 - Dec - 2010</td>
+ <td>1.4 Release (Mirrored)</td>
+ <td>1.5.4</td>
+ </tr>
<tr class="c"><td align="center" valign="middle"><a
name="13"></a>1.3</td><td align="center">Release</td><td>
Source Distribution
<a href="[preferred]/ws/sandesha2/1_3/sandesha2-1.3-src.zip"
title="[preferred]/ws/sandesha2/1_3/sandesha2-1.3-src.zip">zip</a>
@@ -51,7 +66,7 @@ the binay distribution and the source di
<a
href="http://www.apache.org/dist/ws/sandesha2/1_3/sandesha2-1.3-bin.zip.md5";
class="externalLink"
title="http://www.apache.org/dist/ws/sandesha2/1_3/sandesha2-1.3-bin.zip.md5";>MD5</a>
<a
href="http://www.apache.org/dist/ws/sandesha2/1_3/sandesha2-1.3-bin.zip.asc";
class="externalLink"
title="http://www.apache.org/dist/ws/sandesha2/1_3/sandesha2-1.3-bin.zip.asc";>PGP</a>
<br></br>
- </td><td>08 - 10 - 2007</td>
+ </td><td>08 - Oct - 2007</td>
<td>1.3 Release (Mirrored)</td>
<td>1.3</td>
</tr>
@@ -66,7 +81,7 @@ the binay distribution and the source di
<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><td>10 - Jun - 2007</td>
<td>1.2 Release (Archived)</td>
<td>1.2</td>
</tr>
@@ -81,7 +96,7 @@ the binay distribution and the source di
<a
href="http://archive.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.md5";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_1/sandesha2-1.1-bin.zip.md5";>MD5</a>
<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><td>12 - Oct - 2006</td>
<td>1.1 Release (Archived)</td>
<td>1.1</td>
</tr>
@@ -96,7 +111,7 @@ the binay distribution and the source di
<a
href="http://archive.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.md5";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/1_0/sandesha2-1.0-bin.zip.md5";>MD5</a>
<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><td>05 - Aug - 2006</td>
<td>1.0 Release (Archived)</td>
<td>1.0</td>
</tr>
@@ -111,7 +126,7 @@ the binay distribution and the source di
<a
href="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.md5";
class="externalLink"
title="http://archive.apache.org/dist/ws/sandesha2/0_9/Sandesha2-0.9-bin.zip.md5";>MD5</a>
<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><td>12 - May - 2005</td>
<td>0.9 Release (Archived)</td>
<td>0.93</td>
</tr>
