Author: bdaw Date: 2008-01-03 19:42:37 -0500 (Thu, 03 Jan 2008) New Revision: 9433 Added: modules/common/trunk/build/pom.xml Removed: modules/common/trunk/build/build.bat Modified: modules/common/trunk/common/pom.xml modules/common/trunk/mc/pom.xml modules/common/trunk/pom.xml modules/common/trunk/portal/pom.xml Log: change module structure and use jboss-portal-parent pom Deleted: modules/common/trunk/build/build.bat =================================================================== --- modules/common/trunk/build/build.bat 2008-01-04 00:06:14 UTC (rev 9432) +++ modules/common/trunk/build/build.bat 2008-01-04 00:42:37 UTC (rev 9433) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com&gt; -rem - -rem $Id: build.bat 2 2005-01-14 23:01:32Z vietj $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Copied: modules/common/trunk/build/pom.xml (from rev 9420, modules/common/trunk/pom.xml) =================================================================== --- modules/common/trunk/build/pom.xml (rev 0) +++ modules/common/trunk/build/pom.xml 2008-01-04 00:42:37 UTC (rev 9433) @@ -0,0 +1,148 @@ +<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.jboss.portal</groupId> + <artifactId>jboss-portal-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.portal.common</groupId> + <artifactId>jboss-portal-modules-common-parent</artifactId> + <packaging>pom</packaging> + <name>JBoss Portal Modules Common</name> + <version>1.1.0-SNAPSHOT</version> + <url>http://labs.jboss.com/jbossportal</url> + + <properties> + <version.activation>1.1</version.activation> + <version.concurrent>1.3.4</version.concurrent> + <version.javax.servlet>2.4</version.javax.servlet> + <version.jboss-j2ee>4.2.0.GA</version.jboss-j2ee> + <version.jboss-jmx>4.2.0.GA</version.jboss-jmx> + <version.jboss-system>4.2.0.GA</version.jboss-system> + <version.jboss-backport-concurrent>2.1.0.GA</version.jboss-backport-concurrent> + <version.jboss-common-core>2.2.0.GA</version.jboss-common-core> + <version.log4j>1.2.14</version.log4j> + <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> + <version.jboss.microcontainer>2.0.0.Beta4</version.jboss.microcontainer> + <version.cargo>0.8</version.cargo> + <version.junit>3.8.1</version.junit> + <version.ant>1.6.5</version.ant> + </properties> + + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + </plugin> + </plugins> + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>${version.log4j}</version> + </dependency> + + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.concurrent}</version> + </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${version.activation}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + <version>${version.jboss-j2ee}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>${version.jboss-common-core}</version> + </dependency> + + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>${version.ant}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + <version>${version.jboss-jmx}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + <version>${version.jboss-system}</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${version.apache.commons-httpclient}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-backport-concurrent</artifactId> + <version>${version.jboss-backport-concurrent}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.javax.servlet}</version> + </dependency> + + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>${version.ant}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + </dependency> + + <dependency> + <groupId>ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>${version.ant}</version> + </dependency> + + <dependency> + <groupId>ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>${version.ant}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>${version.jboss.microcontainer}</version> + </dependency> + + </dependencies> + </dependencyManagement> + +</project> Modified: modules/common/trunk/common/pom.xml =================================================================== --- modules/common/trunk/common/pom.xml 2008-01-04 00:06:14 UTC (rev 9432) +++ modules/common/trunk/common/pom.xml 2008-01-04 00:42:37 UTC (rev 9433) @@ -2,8 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-root</artifactId> + <artifactId>jboss-portal-modules-common-parent</artifactId> <version>1.1.0-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jboss-portal-modules-common</artifactId> @@ -15,97 +16,81 @@ <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> </dependency> <dependency> <groupId>oswego-concurrent</groupId> <artifactId>concurrent</artifactId> - <version>1.3.4</version> </dependency> <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant</artifactId> - <version>1.6.5</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-backport-concurrent</artifactId> - <version>2.1.0.GA</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.6.5</version> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> </dependency> </dependencies> @@ -131,22 +116,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <!-- To use in conjonctin with @@ -175,37 +144,5 @@ </testResources> </build> - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - <properties/> </project> \ No newline at end of file Modified: modules/common/trunk/mc/pom.xml =================================================================== --- modules/common/trunk/mc/pom.xml 2008-01-04 00:06:14 UTC (rev 9432) +++ modules/common/trunk/mc/pom.xml 2008-01-04 00:42:37 UTC (rev 9433) @@ -2,8 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-root</artifactId> + <artifactId>jboss-portal-modules-common-parent</artifactId> <version>1.1.0-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jboss-portal-modules-common-mc</artifactId> @@ -15,29 +16,22 @@ <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> - <version>2.0.0.Beta4</version> </dependency> <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> </dependency> </dependencies> <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - </plugins> + </build> Modified: modules/common/trunk/pom.xml =================================================================== --- modules/common/trunk/pom.xml 2008-01-04 00:06:14 UTC (rev 9432) +++ modules/common/trunk/pom.xml 2008-01-04 00:42:37 UTC (rev 9433) @@ -2,125 +2,11 @@ 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.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-root</artifactId> + <artifactId>jboss-portal-modules-common-aggregator</artifactId> <packaging>pom</packaging> - <name>JBoss Portal Modules Common</name> + <name>JBoss Portal Modules Common (aggregator)</name> <version>1.1.0-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossportal</url> - <dependencies/> - - <repositories> - <repository> - <id>repository.maven.org</id> - <name>Maven Repository</name> - <layout>default</layout> - <url>http://repo1.maven.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <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> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jboss-deploy-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <goals> - <goal>jboss-deploy</goal> - </goals> - </execution> - </executions> - <configuration> - <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <inherited>true</inherited> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <optimize>true</optimize> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-packaging-maven-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - <extensions>true</extensions> - </plugin> - <plugin> - <artifactId>maven-idea-plugin</artifactId> - <configuration> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - <distributionManagement> <repository> <!--Copy the distribution jar file to a local checkout of the maven repository @@ -137,71 +23,13 @@ </distributionManagement> <modules> + <module>build</module> <module>common</module> <module>mc</module> <module>portal</module> </modules> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.com/jira/browse/JBPORTAL</url> - </issueManagement> - <ciManagement> - <system>cruisecontrol</system> - </ciManagement> - <licenses> - <license> - <name>LGPL 2.1</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments> - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - </comments> - </license> - </licenses> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</con... - <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk&l... - <url>https://svn.jboss.org/repos/portal/trunk</url> - </scm> - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> - </project> Modified: modules/common/trunk/portal/pom.xml =================================================================== --- modules/common/trunk/portal/pom.xml 2008-01-04 00:06:14 UTC (rev 9432) +++ modules/common/trunk/portal/pom.xml 2008-01-04 00:42:37 UTC (rev 9433) @@ -2,8 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.jboss.portal.common</groupId> - <artifactId>jboss-portal-modules-common-root</artifactId> + <artifactId>jboss-portal-modules-common-parent</artifactId> <version>1.1.0-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jboss-portal-modules-common-portal</artifactId> @@ -12,14 +13,6 @@ <dependencies/> - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - </plugins> - </build> - <properties> </properties>