Author: veithen
Date: Sun Dec 19 15:48:36 2010
New Revision: 1050880
URL: http://svn.apache.org/viewvc?rev=1050880&view=rev
Log:
Merged r1050879 (which changes) to the release branch.
Added:
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/
- copied from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/pom.xml
- copied, changed from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/src/
- copied from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/src/main/
- copied from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/src/main/resources/
- copied from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/src/main/resources/META-INF/
- copied from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/META-INF/
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/src/main/resources/META-INF/LICENSE.vm
- copied unchanged from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/META-INF/LICENSE.vm
axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/src/main/resources/META-INF/NOTICE.vm
- copied unchanged from r1050879,
axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/META-INF/NOTICE.vm
Modified:
axis/axis2/java/sandesha/branches/1_4/ (props changed)
axis/axis2/java/sandesha/branches/1_4/modules/client/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/mar/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/policy/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/rampart-integration/pom.xml
axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml
axis/axis2/java/sandesha/branches/1_4/pom.xml
Propchange: axis/axis2/java/sandesha/branches/1_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 19 15:48:36 2010
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1050214-1050875
+/axis/axis2/java/sandesha/trunk:1050214-1050875,1050879
Modified: axis/axis2/java/sandesha/branches/1_4/modules/client/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/client/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/client/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/client/pom.xml Sun Dec 19
15:48:36 2010
@@ -43,6 +43,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/core/pom.xml Sun Dec 19
15:48:36 2010
@@ -43,6 +43,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/interop/pom.xml Sun Dec 19
15:48:36 2010
@@ -42,6 +42,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/mar/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/mar/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/mar/pom.xml Sun Dec 19
15:48:36 2010
@@ -43,6 +43,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/persistence/pom.xml Sun Dec
19 15:48:36 2010
@@ -52,6 +52,21 @@
</testResources>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/policy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/policy/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/policy/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/policy/pom.xml Sun Dec 19
15:48:36 2010
@@ -43,6 +43,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
Modified:
axis/axis2/java/sandesha/branches/1_4/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/rampart-integration/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/rampart-integration/pom.xml
Sun Dec 19 15:48:36 2010
@@ -43,6 +43,21 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Copied: axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/pom.xml
(from r1050879, axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/pom.xml?p2=axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/pom.xml&p1=axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml&r1=1050879&r2=1050880&rev=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle/pom.xml Sun
Dec 19 15:48:36 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,9 +32,9 @@
<!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/resource-bundle</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/resource-bundle</developerConnection>
-
<url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/resource-bundle</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle</developerConnection>
+
<url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/resource-bundle</url>
</scm>
<!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
<url>http://axis.apache.org/axis2/java/sandesha/</url>
Modified: axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/samples/pom.xml Sun Dec 19
15:48:36 2010
@@ -52,6 +52,21 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/pom.xml?rev=1050880&r1=1050879&r2=1050880&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_4/pom.xml Sun Dec 19 15:48:36 2010
@@ -352,6 +352,7 @@
</dependencyManagement>
<modules>
+ <module>modules/resource-bundle</module> <!-- Must be first in the
list! -->
<module>modules/core</module>
<module>modules/mar</module>
<module>modules/client</module>
