Author: bdaw Date: 2008-01-03 19:06:14 -0500 (Thu, 03 Jan 2008) New Revision: 9432 Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/test/pom.xml modules/portlet/trunk/test/src/test/build.xml Log: switch to use jboss-portal-parent pom and correct antrun issues Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-01-04 00:05:59 UTC (rev 9431) +++ modules/portlet/trunk/build/pom.xml 2008-01-04 00:06:14 UTC (rev 9432) @@ -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.portlet</groupId> @@ -23,32 +23,7 @@ <name>JBoss Portal Portlet Module</name> <url>http://www.jboss.com/products/jbossmc</url> <description>JBoss Portal Portlet 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.apache.portals.bridges>1.0.3</version.apache.portals.bridges> <version.activation>1.0.2</version.activation> @@ -79,41 +54,8 @@ <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> @@ -125,156 +67,28 @@ <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> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit-tooling-maven2</artifactId> <version>1.1.0-SNAPSHOT</version> </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> + <id>apache.org</id> + <name>Maven Plugin Snapshots</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> <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> - <pluginRepository> - <id>m2-snapshot-repository</id> - <name>Maven snapshot repository</name> - <layout>default</layout> - <url>http://people.apache.org/repo/m2-snapshot-repository/</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> - - <dependencyManagement> <!-- The parent pom manages the inter-dependencies of the modules. --> <dependencies> Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-01-04 00:05:59 UTC (rev 9431) +++ modules/portlet/trunk/test/pom.xml 2008-01-04 00:06:14 UTC (rev 9432) @@ -245,32 +245,16 @@ </dependency> </dependencies> - <properties> - <simple.property>simple_value</simple.property> - </properties> - <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> Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-01-04 00:05:59 UTC (rev 9431) +++ modules/portlet/trunk/test/src/test/build.xml 2008-01-04 00:06:14 UTC (rev 9432) @@ -32,7 +32,6 @@ <mkdir dir="${test.temp.lib}"/> <mkdir dir="${test.temp.portlet}"/> <mkdir dir="${target}/jboss-unit"/> - </target> <!--Lets make the check in one place so the build fail in the beggining instead of end--> @@ -400,7 +399,6 @@ </taskdef> </target> - <target name="cargo.jboss-4.2.start" depends="cargo.setup"> <!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration @@ -417,6 +415,7 @@ output="${cargo.log.dir}/cargo.${test.id}.server.log" action="start" wait="${cargo.wait}"> + <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>--> <sharedClasspath> <path location="${dependency.portal-common.jar}"/> <path location="${dependency.portal-common-portal.jar}"/> @@ -431,7 +430,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/> - </configuration> + </configuration> </cargo> </target> @@ -441,6 +440,7 @@ home="${test.jboss-4.2.home}" log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="stop"> + <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>--> <configuration> <property name="cargo.rmi.port" value="1099"/> </configuration>