This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_4 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-sandesha.git
commit 98c79376a1ef9307c0c90aa2db6a64762f748ab3 Merge: 90d2433 dbcacb8 Author: Andreas Veithen <veit...@apache.org> AuthorDate: Sun Dec 19 15:48:36 2010 +0000 Merged r1050879 (which changes) to the release branch. modules/client/pom.xml | 15 ++ modules/core/pom.xml | 15 ++ modules/interop/pom.xml | 15 ++ modules/mar/pom.xml | 15 ++ modules/persistence/pom.xml | 15 ++ modules/policy/pom.xml | 15 ++ modules/rampart-integration/pom.xml | 15 ++ modules/{core => resource-bundle}/pom.xml | 47 +++-- .../src/main/resources/META-INF/LICENSE.vm | 203 +++++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.vm | 11 ++ modules/samples/pom.xml | 15 ++ pom.xml | 1 + 12 files changed, 358 insertions(+), 24 deletions(-) diff --cc modules/resource-bundle/pom.xml index d98203c,4aaa5a0..8389aba --- a/modules/resource-bundle/pom.xml +++ b/modules/resource-bundle/pom.xml @@@ -20,22 -21,20 +21,20 @@@ <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> <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-core</artifactId> + <artifactId>sandesha2-resource-bundle</artifactId> <packaging>jar</packaging> - <name>Sandesha2 - Core</name> + <name>Sandesha2 - Resource bundle</name> <!-- 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/branches/1_4/modules/core</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/branches/1_4/modules/core</developerConnection> - <url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/core</url> - <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>