Author: mpodolin Date: 2009-10-01 07:53:22 -0400 (Thu, 01 Oct 2009) New Revision: 225 Modified: components/wci/trunk/exo/pom.xml components/wci/trunk/jetty/pom.xml components/wci/trunk/pom.xml components/wci/trunk/test/pom.xml components/wci/trunk/tomcat/pom.xml components/wci/trunk/wci/pom.xml Log: Maven configurating refactored. Modified: components/wci/trunk/exo/pom.xml =================================================================== --- components/wci/trunk/exo/pom.xml 2009-10-01 07:40:27 UTC (rev 224) +++ components/wci/trunk/exo/pom.xml 2009-10-01 11:53:22 UTC (rev 225) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wci</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wci-parent</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-exo</artifactId> @@ -15,11 +14,7 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <version>${project.version}</version> </dependency> </dependencies> - <properties> - </properties> - </project> Modified: components/wci/trunk/jetty/pom.xml =================================================================== --- components/wci/trunk/jetty/pom.xml 2009-10-01 07:40:27 UTC (rev 224) +++ components/wci/trunk/jetty/pom.xml 2009-10-01 11:53:22 UTC (rev 225) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wci</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wci-parent</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jetty</artifactId> @@ -15,11 +14,7 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <version>${project.version}</version> </dependency> </dependencies> - <properties> - </properties> - </project> Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2009-10-01 07:40:27 UTC (rev 224) +++ components/wci/trunk/pom.xml 2009-10-01 11:53:22 UTC (rev 225) @@ -1,73 +1,200 @@ -<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.wci</groupId> - <artifactId>module-aggregator</artifactId> - <packaging>pom</packaging> - <name>GateIn - Web Container Integration component (aggregator)</name> - <version>2.0.0-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossportal</url> +<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> + + <name>GateIn - Web Container Integration component</name> + + <groupId>org.gatein.wci</groupId> + <artifactId>wci-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <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/wc... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... + <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</u... + </scm> + + <properties> + <version.gatein.common>2.0.0-Beta02</version.gatein.common> + + <version.junit>3.8.2-brew</version.junit> + <version.jaxb>2.1</version.jaxb> + <version.jetty>6.1.7</version.jetty> + <version.jaxen>1.0-FCS</version.jaxen> + <version.saxpath>1.0-FCS</version.saxpath> + + <version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging> + + <!-- used in test module by maven-antrun-extended-plugin --> + <version.jboss.unit>1.2.2</version.jboss.unit> + <version.cargo>1.0.1-SNAPSHOT</version.cargo> + </properties> + + <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.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.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + <version>${project.version}</version> + </dependency> - <dependencies /> - - <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>wci</module> - <module>exo</module> - <module>tomcat</module> - <module>jetty</module> - <module>test</module> - </modules> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - </plugins> - </reporting> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <configuration> - <!--<outputDirectory>/data/reports</outputDirectory>--> - <aggregate>true</aggregate> - </configuration> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - + <!-- External dependencies --> + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + <version>${version.junit}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${version.jetty}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.apache.commons-logging}</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>${version.jaxen}</version> + </dependency> + <dependency> + <groupId>saxpath</groupId> + <artifactId>saxpath</artifactId> + <version>${version.saxpath}</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${version.jaxb}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <modules> + <module>wci</module> + <module>exo</module> + <module>tomcat</module> + <module>jetty</module> + <module>test</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> + <repository> + <id>codehaus snapshot repository</id> + <url>http://snapshots.repository.codehaus.org/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>false</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <!-- directory src/main/java is missing so there are no sources--> + <inherited>false</inherited> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <configuration> + <!--<outputDirectory>/data/reports</outputDirectory>--> + <aggregate>true</aggregate> + </configuration> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </project> Modified: components/wci/trunk/test/pom.xml =================================================================== --- components/wci/trunk/test/pom.xml 2009-10-01 07:40:27 UTC (rev 224) +++ components/wci/trunk/test/pom.xml 2009-10-01 11:53:22 UTC (rev 225) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wci</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wci-parent</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test</artifactId> @@ -15,12 +14,10 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>${project.version}</version> </dependency> <dependency> @@ -174,12 +171,10 @@ <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> <exclusions> <exclusion> <groupId>ant</groupId> Modified: components/wci/trunk/tomcat/pom.xml =================================================================== --- components/wci/trunk/tomcat/pom.xml 2009-10-01 07:40:27 UTC (rev 224) +++ components/wci/trunk/tomcat/pom.xml 2009-10-01 11:53:22 UTC (rev 225) @@ -2,9 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wci</groupId> - <artifactId>module-parent</artifactId> + <artifactId>wci-parent</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat</artifactId> @@ -15,11 +14,7 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <version>${project.version}</version> </dependency> </dependencies> - <properties> - </properties> - </project> Modified: components/wci/trunk/wci/pom.xml =================================================================== --- components/wci/trunk/wci/pom.xml 2009-10-01 07:40:27 UTC (rev 224) +++ components/wci/trunk/wci/pom.xml 2009-10-01 11:53:22 UTC (rev 225) @@ -1,184 +1,178 @@ <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.gatein.wci</groupId> - <artifactId>module-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>wci-wci</artifactId> - <packaging>jar</packaging> - <name>GateIn - Web Container Integration component (wci)</name> - - <dependencies> - - <dependency> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <!-- SCOPE TEST --> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-mc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-remote</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-mc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test-generic</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-logging-jdk</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-logging-log4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-reflect</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-serialization</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - <dependency> - <groupId>saxpath</groupId> - <artifactId>saxpath</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-jetty-deployer</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <properties> - </properties> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-wci</artifactId> + <packaging>jar</packaging> + <name>GateIn - Web Container Integration component (wci)</name> + + <dependencies> + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <!-- SCOPE TEST --> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-remote</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-jdk</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-logging-log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </dependency> + <dependency> + <groupId>saxpath</groupId> + <artifactId>saxpath</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cargo</groupId> + <artifactId>cargo-manager</artifactId> + <type>war</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-ant</artifactId> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </project>