Author: bdaw Date: 2008-01-08 05:10:28 -0500 (Tue, 08 Jan 2008) New Revision: 9455 Modified: modules/identity/trunk/build/pom.xml modules/identity/trunk/identity/build.xml modules/identity/trunk/identity/pom.xml Log: - update versions of common and test modules - fix ant usage Modified: modules/identity/trunk/build/pom.xml =================================================================== --- modules/identity/trunk/build/pom.xml 2008-01-08 09:57:40 UTC (rev 9454) +++ modules/identity/trunk/build/pom.xml 2008-01-08 10:10:28 UTC (rev 9455) @@ -9,27 +9,27 @@ the property --> <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.identity</groupId> - <artifactId>jboss-portal-modules-identity</artifactId> - <version>1.1.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>JBoss Portal Identity</name> - <url>http://www.jboss.com/products/jbossmc</url> - <description>JBoss Portal Identity Module</description> + 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.identity</groupId> + <artifactId>jboss-portal-modules-identity</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>JBoss Portal Identity</name> + <url>http://www.jboss.com/products/jbossmc</url> + <description>JBoss Portal Identity Module</description> <properties> <version.junit>3.8.1</version.junit> <version.cargo>0.9-portal</version.cargo> <version.ant>1.6.5</version.ant> - <version.jboss.portal.common>1.1.0-SNAPSHOT</version.jboss.portal.common> - <version.jboss.portal.test>1.1.0-SNAPSHOT</version.jboss.portal.test> + <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> + <version.jboss.portal.test>1.2.0-SNAPSHOT</version.jboss.portal.test> <version.jboss.microcontainer>2.0.0.Beta4</version.jboss.microcontainer> <version.sun.opends>1.0.0-BUILD04</version.sun.opends> <version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs> @@ -93,19 +93,6 @@ </plugins> </build> - - <repositories> - <!--<repository>--> - <!--<id>repository.codehaus.org</id>--> - <!--<name>Codehaus Repository</name>--> - <!--<layout>default</layout>--> - <!--<url>http://repository.codehaus.org</url>--> - <!--<snapshots>--> - <!--<enabled>false</enabled>--> - <!--</snapshots>--> - <!--</repository>--> - - </repositories> <pluginRepositories> <pluginRepository> <id>java.net maven repository</id> Modified: modules/identity/trunk/identity/build.xml =================================================================== --- modules/identity/trunk/identity/build.xml 2008-01-08 09:57:40 UTC (rev 9454) +++ modules/identity/trunk/identity/build.xml 2008-01-08 10:10:28 UTC (rev 9455) @@ -65,13 +65,13 @@ <target name="deploy-opends"> <!--Filterout opends.sar--> - <echo>Copying OpenDS service archive to: ${jboss_home}/server/default/deploy</echo> - <copy todir="${jboss_home}/server/default/deploy/" file="${dependency.opends.sar}"> + <echo>Copying OpenDS service archive to: ${JBOSS_HOME}/server/default/deploy</echo> + <copy todir="${JBOSS_HOME}/server/default/deploy/" file="${dependency.opends.sar}"> </copy> - <echo>Copying OpenDS configuration files to: ${jboss_home}/server/default/conf/</echo> - <copy todir="${jboss_home}/server/default/conf/opends"> + <echo>Copying OpenDS configuration files to: ${JBOSS_HOME}/server/default/conf/</echo> + <copy todir="${JBOSS_HOME}/server/default/conf/opends"> <fileset dir="./src/test/resources/opends"/> </copy> @@ -80,11 +80,11 @@ </target> <target name="undeploy-opends"> - <echo>Removing OpenDS configuration files from: ${jboss_home}/server/default/conf/opends</echo> - <delete dir="${jboss_home}/server/default/conf/opends" failonerror="false" deleteonexit="true" quiet="true"/> + <echo>Removing OpenDS configuration files from: ${JBOSS_HOME}/server/default/conf/opends</echo> + <delete dir="${JBOSS_HOME}/server/default/conf/opends" failonerror="false" deleteonexit="true" quiet="true"/> - <echo>Removing OpenDS service archive from: ${jboss_home}/server/default/deploy/opends.sar</echo> - <delete file="${jboss_home}/server/default/deploy/opends-*.sar" failonerror="false" deleteonexit="true" quiet="true"/> + <echo>Removing OpenDS service archive from: ${JBOSS_HOME}/server/default/deploy/opends.sar</echo> + <delete file="${JBOSS_HOME}/server/default/deploy/opends-*.sar" failonerror="false" deleteonexit="true" quiet="true"/> </target> Modified: modules/identity/trunk/identity/pom.xml =================================================================== --- modules/identity/trunk/identity/pom.xml 2008-01-08 09:57:40 UTC (rev 9454) +++ modules/identity/trunk/identity/pom.xml 2008-01-08 10:10:28 UTC (rev 9455) @@ -157,7 +157,7 @@ <plugin> <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> <artifactId>maven-antrun-extended-plugin</artifactId> - <version>1.9-SNAPSHOT</version> + <version>1.13</version> <dependencies> <dependency> <groupId>cargo</groupId>