[portal-commits] JBoss Portal SVN: r9431 - in modules/web/trunk: web and 1 other directories.

Author: bdaw Date: 2008-01-03 19:05:59 -0500 (Thu, 03 Jan 2008) New Revision: 9431 Modified: modules/web/trunk/build/pom.xml modules/web/trunk/web/pom.xml modules/web/trunk/web/src/test/build.xml Log: switch to use jboss-portal-parent pom and correct antrun issues Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-01-04 00:03:07 UTC (rev 9430) +++ modules/web/trunk/build/pom.xml 2008-01-04 00:05:59 UTC (rev 9431) @@ -11,9 +11,9 @@ <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</groupId> - <artifactId>jboss-parent</artifactId> - <version>3</version> + <groupId>org.jboss.portal</groupId> + <artifactId>jboss-portal-parent</artifactId> + <version>1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.web</groupId> @@ -23,32 +23,7 @@ <name>JBoss Portal Test Module</name> <url>http://www.jboss.com/products/jbossmc</url> <description>JBoss Portal Web Module</description> - <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> - <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> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.com/jira/browse/JBPORTAL</url> - </issueManagement> - <ciManagement> - <system>cruisecontrol</system> - </ciManagement> - - <properties> <version.activation>1.0.2</version.activation> <version.concurrent>1.3.4</version.concurrent> @@ -56,8 +31,8 @@ <version.apache.tomcat>5.5.12</version.apache.tomcat> <version.jboss-common-core>2.2.1.GA</version.jboss-common-core> <version.jboss-logging>2.0.3.GA</version.jboss-logging> - <version.jboss-vfs>2.0.4.snapshot</version.jboss-vfs> - <version.jboss.aop>2.0.0.alpha6</version.jboss.aop> + <version.jboss-vfs>2.0.0.Beta6</version.jboss-vfs> + <version.jboss.aop>2.0.0.CR1</version.jboss.aop> <version.jbossxb>2.0.0.CR3</version.jbossxb> <version.javassist>3.6-beta</version.javassist> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> @@ -75,193 +50,12 @@ </properties> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <optimize>true</optimize> - </configuration> - </plugin> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-1</version> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-idea-plugin</artifactId> - <configuration> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <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>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>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> - <pluginRepositories> - <pluginRepository> - <id>repository.maven.org</id> - <name>Maven Repository</name> - <layout>default</layout> - <url>http://repo1.maven.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <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> - </pluginRepository> - <pluginRepository> - <id>Codehaus Snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>java.net maven repository</id> - <url>http://download.java.net/maven/2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - - - <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> - - + <pluginRepositories/> + <dependencyManagement> <!-- The parent pom manages the inter-dependencies of the modules. --> <dependencies> - <dependency> <artifactId>junit</artifactId> <groupId>junit</groupId> @@ -359,7 +153,7 @@ <version>${version.jboss-remoting}</version> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> <version>${version.jboss-vfs}</version> </dependency> @@ -444,41 +238,46 @@ <version>${version.jboss.microcontainer}</version> </dependency> <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-as4-deployer</artifactId> + <groupId>org.jboss.aop</groupId> + <artifactId>jboss-aop</artifactId> <version>${version.jboss.aop}</version> </dependency> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-as4-deployer</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-jdk50</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-jdk50-client</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>pluggable-instrumentor</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> + <!--</dependency>--> <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-deployer-jdk50</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-jdk50</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-jdk50-client</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-standalone-aspect-library-jdk50</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jrockit-pluggable-instrumentor</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>pluggable-instrumentor</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${version.apache.commons-logging}</version> @@ -494,6 +293,11 @@ <type>war</type> <version>${version.cargo}</version> </dependency> + <dependency> + <groupId>cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + </dependency> </dependencies> </dependencyManagement> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-01-04 00:03:07 UTC (rev 9430) +++ modules/web/trunk/web/pom.xml 2008-01-04 00:05:59 UTC (rev 9431) @@ -108,7 +108,7 @@ <artifactId>jboss-remoting</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> <scope>test</scope> </dependency> @@ -193,41 +193,46 @@ <scope>test</scope> </dependency> <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-as4-deployer</artifactId> + <groupId>org.jboss.aop</groupId> + <artifactId>jboss-aop</artifactId> <scope>test</scope> </dependency> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-as4-deployer</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-jdk50</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-jdk50-client</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>pluggable-instrumentor</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-deployer-jdk50</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-jdk50</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-aop-jdk50-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jboss-standalone-aspect-library-jdk50</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>jrockit-pluggable-instrumentor</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss.aop</groupId> - <artifactId>pluggable-instrumentor</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>test</scope> @@ -243,35 +248,33 @@ <type>war</type> <scope>test</scope> </dependency> + <!--<dependency>--> + <!--<groupId>org.jboss.unit</groupId>--> + <!--<artifactId>jboss-unit-tooling-ant</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>cargo</groupId>--> + <!--<artifactId>cargo-core-uberjar</artifactId>--> + <!--<scope>test</scope>--> + <!--</dependency>--> </dependencies> <build> <plugins> <plugin> - <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> + <groupId>org.jboss.unit</groupId> <artifactId>maven-antrun-extended-plugin</artifactId> - <version>1.9-SNAPSHOT</version> + <version>1.10-SNAPSHOT</version> <dependencies> - - <!--Nessesary to force antrun plugin to support ant 1.7.0 features...--> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>${version.ant}</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${version.ant}</version> - </dependency> - <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-tooling-ant</artifactId> <version>${version.jboss.unit}</version> </dependency> - <!-- stuff to run servers for tests --> + <!--stuff to run servers for tests--> <dependency> <groupId>cargo</groupId> <artifactId>cargo-ant</artifactId> @@ -304,7 +307,7 @@ <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> - <property name="dependency.jboss-vfs.jar" value="${maven.dependency.jboss.jboss-vfs.jar.path}"/> + <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> @@ -321,13 +324,14 @@ <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> - <property name="dependency.jboss-aop-as4-deployer.jar" value="${maven.dependency.jboss.aop.jboss-aop-as4-deployer.jar.path}"/> - <property name="dependency.jboss-aop-deployer-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-deployer-jdk50.jar.path}"/> - <property name="dependency.jboss-aop-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50.jar.path}"/> - <property name="dependency.jboss-aop-jdk50-client.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50-client.jar.path}"/> - <property name="dependency.jboss-standalone-aspect-library-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-standalone-aspect-library-jdk50.jar.path}"/> - <property name="dependency.jrockit-pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.jrockit-pluggable-instrumentor.jar.path}"/> - <property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/> + <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> + <!--<property name="dependency.jboss-aop-as4-deployer.jar" value="${maven.dependency.jboss.aop.jboss-aop-as4-deployer.jar.path}"/>--> + <!--<property name="dependency.jboss-aop-deployer-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-deployer-jdk50.jar.path}"/>--> + <!--<property name="dependency.jboss-aop-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50.jar.path}"/>--> + <!--<property name="dependency.jboss-aop-jdk50-client.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50-client.jar.path}"/>--> + <!--<property name="dependency.jboss-standalone-aspect-library-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-standalone-aspect-library-jdk50.jar.path}"/>--> + <!--<property name="dependency.jrockit-pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.jrockit-pluggable-instrumentor.jar.path}"/>--> + <!--<property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/>--> <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-01-04 00:03:07 UTC (rev 9430) +++ modules/web/trunk/web/src/test/build.xml 2008-01-04 00:05:59 UTC (rev 9431) @@ -128,13 +128,14 @@ <pathelement path="${dependency.jbossxb.jar}"/> </path> <path id="mc.jboss_aop"> - <pathelement path="${dependency.jboss-aop-as4-deployer.jar}"/> - <pathelement path="${dependency.jboss-aop-deployer-jdk50.jar}"/> - <pathelement path="${dependency.jboss-aop-jdk50.jar}"/> - <pathelement path="${dependency.jboss-aop-jdk50-client.jar}"/> - <pathelement path="${dependency.jboss-standalone-aspect-library-jdk50.jar}"/> - <pathelement path="${dependency.jrockit-pluggable-instrumentor.jar}"/> - <pathelement path="${dependency.pluggable-instrumentor.jar}"/> + <pathelement path="${dependency.jboss-aop.jar}"/> + <!--<pathelement path="${dependency.jboss-aop-as4-deployer.jar}"/>--> + <!--<pathelement path="${dependency.jboss-aop-deployer-jdk50.jar}"/>--> + <!--<pathelement path="${dependency.jboss-aop-jdk50.jar}"/>--> + <!--<pathelement path="${dependency.jboss-aop-jdk50-client.jar}"/>--> + <!--<pathelement path="${dependency.jboss-standalone-aspect-library-jdk50.jar}"/>--> + <!--<pathelement path="${dependency.jrockit-pluggable-instrumentor.jar}"/>--> + <!--<pathelement path="${dependency.pluggable-instrumentor.jar}"/>--> </path> <path id="mc.jboss_microcontainer"> <pathelement path="${dependency.jboss-aop-mc-int.jar}"/> @@ -623,6 +624,7 @@ <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> + <jboss-unit> <tests config="${target}/test-classes/remote-jboss-unit.xml">