[gatein-commits] gatein SVN: r227 - in components/wsrp/trunk: admin-gui and 6 other directories.

Author: mpodolin Date: 2009-10-01 10:21:05 -0400 (Thu, 01 Oct 2009) New Revision: 227 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp1-ws/pom.xml Log: Maven configurating refactored. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/admin-gui/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -25,9 +25,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> @@ -35,55 +34,31 @@ <name>GateIn WSRP Admin GUI</name> <dependencies> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <version>${version.gatein.common}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/api/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -25,9 +25,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> @@ -38,21 +37,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/common/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -25,9 +25,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> @@ -38,51 +37,26 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> - <version>${version.gatein.common}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${version.slf4j}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>${version.jbossxb}</version> - <scope>provided</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/consumer/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -25,9 +25,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> @@ -38,84 +37,56 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${project.version}</version> </dependency> + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> - <version>${version.gatein.common}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-federation</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <!-- JBoss dependencies --> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>${version.jbossxb}</version> - <scope>provided</scope> </dependency> <!-- other dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>${version.slf4j}</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.1</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -23,38 +23,173 @@ <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> - <groupId>org.gatein.wsrp</groupId> - <artifactId>module-aggregator</artifactId> - <packaging>pom</packaging> - <name>JBoss Portal WSRP</name> - <version>1.0.0-SNAPSHOT</version> - <url>http://www.jboss.org/jbossportal</url> + + <modelVersion>4.0.0</modelVersion> + + <name>JBoss Portal WSRP</name> + + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <url>http://www.gatein.org</url> + + <packaging>pom</packaging> + + <parent> + <groupId>org.gatein</groupId> + <artifactId>gatein-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/ws... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... + <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</... + </scm> + + <properties> + <version.gatein.pc>2.1.0-SNAPSHOT</version.gatein.pc> + <version.gatein.common>2.0.0-Beta02</version.gatein.common> + <version.gatein.wci>2.0.0-Beta01</version.gatein.wci> + + <version.jsf>1.2_12</version.jsf> + <version.apache.commons-fileupload>1.2.1</version.apache.commons-fileupload> + <version.javax.mail>1.4.1</version.javax.mail> + <version.javax.xml.ws>2.1</version.javax.xml.ws> + <version.hibernate>3.3.1.GA</version.hibernate> + </properties> - <!--Repository definition needed to deploy artifacts into JBoss maven repositories--> - <distributionManagement> - <repository> - <!--Copy the distribution jar file to a local checkout of the maven repository - - This variable can be set in $MAVEN_HOME/conf/settings.xml--> - <id>repository.jboss.org</id> - <url>file://${jboss.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - <uniqueVersion>true</uniqueVersion> - </snapshotRepository> - </distributionManagement> - - <modules> - <module>build</module> - <module>api</module> - <module>wsrp1-ws</module> - <module>common</module> - <module>producer</module> - <module>consumer</module> - <module>admin-gui</module> - <module>wsrp-producer-war</module> - </modules> + <dependencyManagement> + <dependencies> + <!-- Import dependency management configuration --> + <dependency> + <groupId>org.gatein</groupId> + <artifactId>gatein-dep</artifactId> + <version>1.0.0-SNAPSHOT</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- internal dependencies --> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <version>${version.gatein.common}</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-mc</artifactId> + <version>${version.gatein.common}</version> + </dependency> + + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <version>${version.gatein.pc}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <version>${version.gatein.pc}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + <version>${version.gatein.pc}</version> + </dependency> + + <!-- external dependencies --> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${version.jsf}</version> + </dependency> + + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${version.apache.commons-fileupload}</version> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${version.javax.mail}</version> + </dependency> + + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${version.javax.xml.ws}</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version.hibernate}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <modules> + <module>api</module> + <module>wsrp1-ws</module> + <module>common</module> + <module>producer</module> + <module>consumer</module> + <module>admin-gui</module> + <module>wsrp-producer-war</module> + </modules> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + </project> \ No newline at end of file Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/producer/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -25,9 +25,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> @@ -38,73 +37,45 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-common</artifactId> - <version>${project.version}</version> - <scope>provided</scope> </dependency> + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> - <version>${version.gatein.common}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-federation</artifactId> - <version>${version.gatein.pc}</version> - <scope>provided</scope> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${version.slf4j}</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.1</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>${version.jbossxb}</version> - <scope>provided</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -27,9 +27,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -41,40 +40,25 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> - <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-common</artifactId> - <version>${project.version}</version> - <scope>provided</scope> </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> </dependency> </dependencies> <build> - <plugins> + <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2009-10-01 14:18:27 UTC (rev 226) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2009-10-01 14:21:05 UTC (rev 227) @@ -25,9 +25,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wsrp-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> @@ -38,21 +37,6 @@ <dependency> <groupId>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <scope>provided</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> \ No newline at end of file