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 2010/12/16 21:10:03 UTC
svn commit: r1050138 - in /axis/axis2/java/sandesha/trunk: ./
modules/client/ modules/core/ modules/distribution/ modules/interop/
modules/mar/ modules/persistence/ modules/policy/
modules/rampart-integration/ modules/samples/ modules/tests/
Author: veithen
Date: Thu Dec 16 20:10:03 2010
New Revision: 1050138
URL: http://svn.apache.org/viewvc?rev=1050138&view=rev
Log:
Some formatting changes in POM files to avoid spurious changes introduced by the maven-release-plugin.
Modified:
axis/axis2/java/sandesha/trunk/modules/client/pom.xml
axis/axis2/java/sandesha/trunk/modules/core/pom.xml
axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
axis/axis2/java/sandesha/trunk/modules/mar/pom.xml
axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml (contents, props changed)
axis/axis2/java/sandesha/trunk/modules/policy/pom.xml
axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
axis/axis2/java/sandesha/trunk/pom.xml
Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/client/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/client/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/core/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/core/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,10 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/interop/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
@@ -88,12 +86,10 @@
<configuration>
<tasks>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <arg line="-uri src/resources/conf/RMInteropService.wsdl -ss -g
- -p org.apache.sandesha2.interop
- -o target/generated-code"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath refid="maven.compile.classpath"/>
- <classpath refid="maven.runtime.classpath"/>
+ <arg line="-uri src/resources/conf/RMInteropService.wsdl -ss -g -p org.apache.sandesha2.interop -o target/generated-code" />
+ <classpath refid="maven.dependency.classpath" />
+ <classpath refid="maven.compile.classpath" />
+ <classpath refid="maven.runtime.classpath" />
</java>
</tasks>
</configuration>
Modified: axis/axis2/java/sandesha/trunk/modules/mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/mar/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/mar/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/mar/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml Thu Dec 16 20:10:03 2010
@@ -1,85 +1,83 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-persistence</artifactId>
- <packaging>jar</packaging>
- <name>Sandesha2 - Persistent Storage</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/trunk/modules/persistence</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/persistence</developerConnection>
- <url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/persistence</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>
-
- <build>
- <testResources>
- <testResource>
- <directory>test-resources</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>create_test_repos</id>
- <phase>process-test-resources</phase>
- <configuration>
- <tasks>
- <ant antfile="test.build.xml" inheritAll="true" target="prepare">
- <property name="sandesha2.version" value="${project.version}"/>
- <property name="build.dir" value="${project.build.directory}"/>
- <property name="local.repo" value="${settings.localRepository}"/>
- <property name="addressing.version" value="${axis2.version}"/>
- <property name="rampart.version" value="${rampart.version}"/>
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <forkMode>pertest</forkMode>
- <!--<argLine>-Xnoagent -Djava.compiler=NONE -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>-->
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <generateReports>false</generateReports>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-persistence</artifactId>
+ <packaging>jar</packaging>
+ <name>Sandesha2 - Persistent Storage</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/trunk/modules/persistence</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/persistence</developerConnection>
+ <url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/persistence</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>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>create_test_repos</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="test.build.xml" inheritAll="true" target="prepare">
+ <property name="sandesha2.version" value="${project.version}" />
+ <property name="build.dir" value="${project.build.directory}" />
+ <property name="local.repo" value="${settings.localRepository}" />
+ <property name="addressing.version" value="${axis2.version}" />
+ <property name="rampart.version" value="${rampart.version}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <forkMode>pertest</forkMode>
+ <!--<argLine>-Xnoagent -Djava.compiler=NONE -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>-->
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
@@ -90,42 +88,42 @@
<artifactId>axis2-transport-local</artifactId>
<version>${axis2.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-policy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-samples</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.3.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>10.3.2.1</version>
- </dependency>
-
- </dependencies>
-
-</project>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-policy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-samples</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>10.3.2.1</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/sandesha/trunk/modules/policy/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/policy/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/policy/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/policy/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/samples/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/samples/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/tests/pom.xml Thu Dec 16 20:10:03 2010
@@ -16,9 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.sandesha2</groupId>
@@ -128,11 +126,11 @@
<configuration>
<tasks>
<ant antfile="tests.build.xml" inheritAll="true" target="repo:create">
- <property name="sandesha2.version" value="${project.version}"/>
- <property name="build.dir" value="${project.build.directory}"/>
- <property name="local.repo" value="${settings.localRepository}"/>
- <property name="addressing.version" value="${axis2.version}"/>
- <property name="rampart.version" value="${rampart.version}"/>
+ <property name="sandesha2.version" value="${project.version}" />
+ <property name="build.dir" value="${project.build.directory}" />
+ <property name="local.repo" value="${settings.localRepository}" />
+ <property name="addressing.version" value="${axis2.version}" />
+ <property name="rampart.version" value="${rampart.version}" />
</ant>
</tasks>
</configuration>
Modified: axis/axis2/java/sandesha/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1050138&r1=1050137&r2=1050138&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/pom.xml Thu Dec 16 20:10:03 2010
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache</groupId>