6:30 p.m.
Author: bdaw
Date: 2007-12-16 12:30:58 -0500 (Sun, 16 Dec 2007)
New Revision: 9351
Modified:
modules/identity/trunk/build/pom.xml
modules/identity/trunk/identity/build.xml
modules/identity/trunk/identity/pom.xml
modules/identity/trunk/pom.xml
Log:
cleanups
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
+++ modules/identity/trunk/build/pom.xml 2007-12-16 17:30:58 UTC (rev 9351)
@@ -76,76 +76,78 @@
<version.opensso>20070905-nightly</version.opensso>
<version.spring>2.0.6</version.spring>
-
-
- <!--<version.jboss.remoting>2.2.1.GA</version.jboss.remoting>-->
-
<!--<version.apache.httpclient>3.0.1</version.apache.httpclient>-->
-
</properties>
- <build>
- <plugins>
- <plugin>
- <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.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>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
+ <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-assembly-plugin</artifactId>
- <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>
+ <plugin>
+ <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.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>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
- </pluginManagement>
- </build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <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>
+ <repositories>
+ <repository>
<id>repository.maven.org</id>
<name>Maven Repository</name>
<layout>default</layout>
@@ -175,7 +177,7 @@
<enabled>false</enabled>
</releases>
</repository>
- <repository>
+ <repository>
<id>repository.codehaus.org</id>
<name>Codehaus Repository</name>
<layout>default</layout>
@@ -184,7 +186,7 @@
<enabled>false</enabled>
</snapshots>
</repository>
- </repositories>
+ </repositories>
<pluginRepositories>
<pluginRepository>
<id>repository.maven.org</id>
@@ -296,56 +298,41 @@
<artifactId>junit</artifactId>
<version>${version.junit}</version>
</dependency>
-
-
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${version.jboss.microcontainer}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>cargo</groupId>-->
- <!--<artifactId>core</artifactId>-->
- <!--<version>${version.cargo}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>sun-opends</groupId>
<artifactId>opends-core</artifactId>
<version>${version.sun.opends}</version>
</dependency>
-
<dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
<version>${version.jboss.hibernate}</version>
</dependency>
-
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
-
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-jdk</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
-
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
-
<dependency>
<groupId>apache-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${version.apache.logging}</version>
</dependency>
-
-
-
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
@@ -371,15 +358,6 @@
<artifactId>antlr</artifactId>
<version>${version.antlr}</version>
</dependency>
-
- <!--<dependency>-->
- <!--<groupId>apache-httpclient</groupId>-->
- <!--<artifactId>commons-httpclient</artifactId>-->
- <!--<version>${version.apache.httpclient}</version>-->
- <!--</dependency>-->
-
-
-
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
@@ -435,12 +413,6 @@
<artifactId>asm</artifactId>
<version>${version.asm}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>jboss</groupId>-->
- <!--<artifactId>jboss-remoting</artifactId>-->
- <!--<version>${version.jboss.remoting}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>josso</groupId>
<artifactId>josso</artifactId>
@@ -481,7 +453,6 @@
<artifactId>opensso</artifactId>
<version>${version.opensso}</version>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
Modified: modules/identity/trunk/identity/build.xml
===================================================================
--- modules/identity/trunk/identity/build.xml 2007-12-16 17:16:30 UTC (rev 9350)
+++ modules/identity/trunk/identity/build.xml 2007-12-16 17:30:58 UTC (rev 9351)
@@ -12,10 +12,6 @@
<!--<echo message="plugin classpath:
${plugin_classpath}"/>-->
<mkdir dir="target/jboss-unit"/>
- <get
src="http://www.apache.org/dist/maven/binaries/maven-ant-tasks-2.0.7...
dest="./target/jboss-unit/maven-ant-tasks.jar"/>
- <path id="maven-ant-tasks.classpath"
path="target/jboss-unit/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant"
- classpathref="maven-ant-tasks.classpath" />
<ant>
<target name="deploy-opends"/>
@@ -41,26 +37,10 @@
<target name="deploy-opends">
- <artifact:dependencies pathId="opends.classpath"
filesetId="opends.fileset">
- <dependency groupId="org.jboss.unit" artifactId="opends"
- version="1.1.0-SNAPSHOT" type="sar"/>
- </artifact:dependencies>
-
- <echo>Preparing OpenDS files</echo>
-
- <!--Copy whole fileset with dependencies-->
- <copy todir="target/jboss-unit/tmp">
- <fileset refid="opends.fileset"/>
- <mapper type="flatten" />
- </copy>
-
<!--Filterout opends.sar-->
<echo>Copying OpenDS service archive to:
${jboss_home}/server/default/deploy</echo>
- <copy todir="${jboss_home}/server/default/deploy/">
- <fileset dir="target/jboss-unit/tmp">
- <include name="opends-*.sar"/>
- </fileset>
- <mapper type="flatten" />
+ <copy todir="${jboss_home}/server/default/deploy/"
file="${dependency.opends.sar}">
+
</copy>
<echo>Copying OpenDS configuration files to:
${jboss_home}/server/default/conf/</echo>
Modified: modules/identity/trunk/identity/pom.xml
===================================================================
--- modules/identity/trunk/identity/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
+++ modules/identity/trunk/identity/pom.xml 2007-12-16 17:30:58 UTC (rev 9351)
@@ -176,8 +176,9 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+ <artifactId>maven-antrun-extended-plugin</artifactId>
+ <version>1.9-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>cargo</groupId>
@@ -206,6 +207,8 @@
<property name="jboss_home"
value="${JBOSS_HOME}"/>
+ <property name="dependency.opends.sar"
value="${maven.dependency.org.jboss.unit.opends.sar.path}"/>
+
<ant antfile="${basedir}/build.xml">
<target name="test"/>
</ant>
Modified: modules/identity/trunk/pom.xml
===================================================================
--- modules/identity/trunk/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
+++ modules/identity/trunk/pom.xml 2007-12-16 17:30:58 UTC (rev 9351)
@@ -11,12 +11,12 @@
<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>-->
+ <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>