Author: veithen Date: Sun Dec 5 10:12:19 2010 New Revision: 1042301 URL: http://svn.apache.org/viewvc?rev=1042301&view=rev Log: Fixed formatting of POM files (which had inconsistent indentation and a mix of tabs and spaces).
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 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/client/pom.xml Sun Dec 5 10:12:19 2010 @@ -21,8 +21,8 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> @@ -41,33 +41,33 @@ </resource> </resources> <plugins> -<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-core</artifactId> - <version>${pom.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes/</outputDirectory> - <includes>org/apache/sandesha2/client/SandeshaClientConstants.class,org/apache/sandesha2/client/SandeshaListener.class,org/apache/sandesha2/client/SequenceReport.class</includes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-core</artifactId> + <version>${pom.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes/</outputDirectory> + <includes>org/apache/sandesha2/client/SandeshaClientConstants.class,org/apache/sandesha2/client/SandeshaListener.class,org/apache/sandesha2/client/SequenceReport.class</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -75,13 +75,11 @@ <target>1.5</target> </configuration> </plugin> - - </plugins> - + </plugins> </build> <dependencies> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>SNAPSHOT</version> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/core/pom.xml Sun Dec 5 10:12:19 2010 @@ -21,11 +21,11 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> @@ -49,23 +49,23 @@ <target>1.5</target> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> - <dependency> + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> <version>${axis2.version}</version> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Sun Dec 5 10:12:19 2010 @@ -22,8 +22,8 @@ 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> - <artifactId>sandesha2-parent</artifactId> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> @@ -34,104 +34,103 @@ <packaging>pom</packaging> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-core</artifactId> - <version>${pom.version}</version> - <classifier>sources</classifier> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/sources/</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-interop</artifactId> - <version>${pom.version}</version> - <classifier>sources</classifier> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/sources/</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-rampart-integration</artifactId> - <version>${pom.version}</version> - <classifier>sources</classifier> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/sources/</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - <inherited>false</inherited> - <executions> - <execution> - <id>javadoc-generation</id> - <phase>package</phase> - <configuration> - <tasks> - <mkdir dir="${basedir}/target/docs/apidocs"/> - <javadoc packagenames="org.apache.sandesha2.*" - destdir="${basedir}/target/docs/apidocs" - classpathref="maven.runtime.classpath" - author="true" - version="true" - use="true" - windowtitle="Sandesha2 API" - doctitle="Sandesha2" - bottom="Copyright © 2007 Apache Web Services Project. All Rights Reserved." - > - <packageset dir="target/sources/" defaultexcludes="yes"> - <include name="org/apache/sandesha2/**"/> - </packageset> - </javadoc> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - <descriptor>src/main/assembly/doc.xml</descriptor> - </descriptors> - <finalName>sandesha2-${version}</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> -</build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-core</artifactId> + <version>${pom.version}</version> + <classifier>sources</classifier> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/sources/</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-interop</artifactId> + <version>${pom.version}</version> + <classifier>sources</classifier> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/sources/</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-rampart-integration</artifactId> + <version>${pom.version}</version> + <classifier>sources</classifier> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/sources/</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <inherited>false</inherited> + <executions> + <execution> + <id>javadoc-generation</id> + <phase>package</phase> + <configuration> + <tasks> + <mkdir dir="${basedir}/target/docs/apidocs"/> + <javadoc packagenames="org.apache.sandesha2.*" + destdir="${basedir}/target/docs/apidocs" + classpathref="maven.runtime.classpath" + author="true" + version="true" + use="true" + windowtitle="Sandesha2 API" + doctitle="Sandesha2" + bottom="Copyright © 2007 Apache Web Services Project. All Rights Reserved."> + <packageset dir="target/sources/" defaultexcludes="yes"> + <include name="org/apache/sandesha2/**"/> + </packageset> + </javadoc> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>distribution-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> + <descriptor>src/main/assembly/doc.xml</descriptor> + </descriptors> + <finalName>sandesha2-${version}</finalName> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/interop/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/interop/pom.xml Sun Dec 5 10:12:19 2010 @@ -21,8 +21,8 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> @@ -110,13 +110,13 @@ <dependencies> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>SNAPSHOT</version> </dependency> - - <dependency> + + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb</artifactId> <version>${axis2.version}</version> @@ -151,20 +151,20 @@ <version>${geronimo.spec.javamail.version}</version> </dependency> - <!-- Rampart --> + <!-- Rampart --> <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-core</artifactId> <version>${rampart.version}</version> </dependency> - + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-trust</artifactId> <version>${rampart.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-policy</artifactId> <version>${rampart.version}</version> @@ -173,8 +173,8 @@ </dependencies> <properties> - <rampart.version>SNAPSHOT</rampart.version> - <wsdl4j.version>1.6.2</wsdl4j.version> + <rampart.version>SNAPSHOT</rampart.version> + <wsdl4j.version>1.6.2</wsdl4j.version> </properties> - + </project> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/mar/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/mar/pom.xml Sun Dec 5 10:12:19 2010 @@ -21,8 +21,8 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> @@ -40,37 +40,35 @@ <directory>src/main/resources</directory> </resource> </resources> - + <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-core</artifactId> - <version>${pom.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/classes/</outputDirectory> - <includes>**/*.class,**/*.xml</includes> - <excludes>**/*test.class</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-core</artifactId> + <version>${pom.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/classes/</outputDirectory> + <includes>**/*.class,**/*.xml</includes> + <excludes>**/*test.class</excludes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -80,12 +78,12 @@ <target>1.4</target> </configuration> </plugin> - - <plugin> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-mar-maven-plugin</artifactId> - <version>${axis2.version}</version> - <extensions>true</extensions> + + <plugin> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-mar-maven-plugin</artifactId> + <version>${axis2.version}</version> + <extensions>true</extensions> <dependencies> <dependency> @@ -96,15 +94,15 @@ </dependencies> <configuration> - <includeDependencies>false</includeDependencies> - <moduleXmlFile>module.xml</moduleXmlFile> - </configuration> - </plugin> - </plugins> + <includeDependencies>false</includeDependencies> + <moduleXmlFile>module.xml</moduleXmlFile> + </configuration> + </plugin> + </plugins> </build> <dependencies> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>SNAPSHOT</version> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml Sun Dec 5 10:12:19 2010 @@ -3,11 +3,11 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-persistence</artifactId> @@ -39,7 +39,7 @@ <target>1.5</target> </configuration> </plugin> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> @@ -49,13 +49,13 @@ <phase>process-test-resources</phase> <configuration> <tasks> - <ant antfile="test.build.xml" inheritAll="true" target="prepare"> - <property name="sandesha2.version" value="${sandesha2.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> + <ant antfile="test.build.xml" inheritAll="true" target="prepare"> + <property name="sandesha2.version" value="${sandesha2.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> @@ -64,16 +64,16 @@ </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-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> </plugins> </build> @@ -89,17 +89,17 @@ <artifactId>axis2-transport-local</artifactId> <version>${axis2.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-policy</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-samples</artifactId> <version>${pom.version}</version> @@ -114,17 +114,17 @@ <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> + <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> + </dependencies> </project> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/policy/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/policy/pom.xml Sun Dec 5 10:12:19 2010 @@ -21,8 +21,8 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> @@ -42,33 +42,33 @@ </resources> <plugins> -<plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2-core</artifactId> - <version>${pom.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/classes/</outputDirectory> - <includes>**/policy/**/*.class,**/*.properties,org/apache/sandesha2/i18n/**,**/*Sandesha2Constants*.class,**/*SandeshaException*.class</includes> - <excludes>META-INF/maven/org.apache.sandesha2/sandesha2-core/**</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-core</artifactId> + <version>${pom.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/classes/</outputDirectory> + <includes>**/policy/**/*.class,**/*.properties,org/apache/sandesha2/i18n/**,**/*Sandesha2Constants*.class,**/*SandeshaException*.class</includes> + <excludes>META-INF/maven/org.apache.sandesha2/sandesha2-core/**</excludes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -77,18 +77,18 @@ <target>1.5</target> </configuration> </plugin> - </plugins> + </plugins> </build> <dependencies> - - <dependency> + + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>SNAPSHOT</version> </dependency> - + </dependencies> </project> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml Sun Dec 5 10:12:19 2010 @@ -21,11 +21,11 @@ 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> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> <version>SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-rampart-integration</artifactId> @@ -49,53 +49,53 @@ <target>1.5</target> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> - <dependencies> - - <dependency> + <dependencies> + + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>SNAPSHOT</version> </dependency> - - <!-- Rampart --> + + <!-- Rampart --> <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-core</artifactId> <version>${rampart.version}</version> </dependency> - + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-trust</artifactId> <version>${rampart.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-policy</artifactId> <version>${rampart.version}</version> </dependency> - + </dependencies> - + <properties> - <rampart.version>SNAPSHOT</rampart.version> + <rampart.version>SNAPSHOT</rampart.version> </properties> - + </project> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/samples/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/samples/pom.xml Sun Dec 5 10:12:19 2010 @@ -53,8 +53,7 @@ <target>1.5</target> </configuration> </plugin> - - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> @@ -64,7 +63,7 @@ <phase>package</phase> <configuration> <tasks> - <ant antfile="samples.build.xml" target="sample:userguide:create" /> + <ant antfile="samples.build.xml" target="sample:userguide:create" /> </tasks> </configuration> <goals> @@ -77,17 +76,17 @@ </plugins> </build> - <properties> - <test.property>2.8.1</test.property> + <properties> + <test.property>2.8.1</test.property> </properties> - + <dependencies> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-policy</artifactId> <version>${pom.version}</version> 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=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/tests/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/tests/pom.xml Sun Dec 5 10:12:19 2010 @@ -41,7 +41,7 @@ <include>**/*.properties</include> <include>**/*.xml</include> <include>**/*.xsl</include> - <include>**/*.dat</include> + <include>**/*.dat</include> </includes> </testResource> </testResources> @@ -55,68 +55,68 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-test-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.sandesha2</groupId> - <artifactId>sandesha2</artifactId> - <version>${pom.version}</version> - <type>mar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/copiedmars</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.axis2</groupId> - <artifactId>addressing</artifactId> - <version>${addressing.version}</version> - <type>mar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/copiedmars</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart</artifactId> - <version>${rampart.version}</version> - <type>mar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/copiedmars</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart-core</artifactId> - <version>${rampart.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/copiedjars</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart-policy</artifactId> - <version>${ramprt.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/copiedjars</outputDirectory> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/wars</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-test-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2</artifactId> + <version>${pom.version}</version> + <type>mar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/copiedmars</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.axis2</groupId> + <artifactId>addressing</artifactId> + <version>${addressing.version}</version> + <type>mar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/copiedmars</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart</artifactId> + <version>${rampart.version}</version> + <type>mar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/copiedmars</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-core</artifactId> + <version>${rampart.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/copiedjars</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-policy</artifactId> + <version>${ramprt.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/copiedjars</outputDirectory> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/wars</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> @@ -126,13 +126,13 @@ <phase>process-test-resources</phase> <configuration> <tasks> - <ant antfile="tests.build.xml" inheritAll="true" target="repo:create"> - <property name="sandesha2.version" value="${sandesha2.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> + <ant antfile="tests.build.xml" inheritAll="true" target="repo:create"> + <property name="sandesha2.version" value="${sandesha2.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> @@ -141,21 +141,21 @@ </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-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> </plugins> </build> <dependencies> - + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-http</artifactId> @@ -166,33 +166,33 @@ <artifactId>axis2-transport-local</artifactId> <version>${axis2.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-core</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-policy</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.sandesha2</groupId> <artifactId>sandesha2-samples</artifactId> <version>${pom.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart</artifactId> <version>${rampart.version}</version> - <type>mar</type> + <type>mar</type> </dependency> - <dependency> + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-core</artifactId> <version>${rampart.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-policy</artifactId> <version>${rampart.version}</version> @@ -208,28 +208,28 @@ <version>${log4j.version}</version> <exclusions> <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> </exclusion> <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> + <exclusion> + <groupId>oro</groupId> + <artifactId>oro</artifactId> </exclusion> <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </exclusion> </exclusions> </dependency> @@ -240,9 +240,9 @@ </dependency> </dependencies> - <properties> - <test.property>2.8.1</test.property> - <rampart.version>SNAPSHOT</rampart.version> + <properties> + <test.property>2.8.1</test.property> + <rampart.version>SNAPSHOT</rampart.version> </properties> - + </project> Modified: axis/axis2/java/sandesha/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1042301&r1=1042300&r2=1042301&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/pom.xml Sun Dec 5 10:12:19 2010 @@ -121,15 +121,15 @@ <version>2.2</version> </plugin> </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.0</version> + </plugin> + </plugins> + </pluginManagement> </build> <scm> @@ -164,7 +164,7 @@ </releases> </pluginRepository> - <pluginRepository> + <pluginRepository> <id>snapshot-apache-2</id> <name>2nd Apache Snapshot repository</name> <url>http://repository.apache.org/snapshots</url> @@ -227,7 +227,7 @@ <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> <version>4.0-beta1</version> @@ -271,7 +271,7 @@ <module>modules/tests</module> <module>modules/samples</module> <module>modules/interop</module> - <module>modules/persistence</module> + <module>modules/persistence</module> <module>modules/distribution</module> </modules>