From 2fe24b4357646cb5cc842ced90c8ad95eca399d8 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Thu, 23 Dec 2004 23:00:38 +0000
Subject: [PATCH] Make multiproject:artifact (when called from /docs) properly
 build the Contacts Sample WARs.

---
 doc/xdocs/building.html             | 2 +-
 samples/contacts/maven.xml          | 4 ++++
 samples/contacts/project.properties | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/xdocs/building.html b/doc/xdocs/building.html
index 3b21911b01..a2117b4ca6 100644
--- a/doc/xdocs/building.html
+++ b/doc/xdocs/building.html
@@ -52,7 +52,7 @@
 	<pre>cd $ACEGI_SECURITY/core</pre>
 	<pre>maven jar:install</pre>
 	<pre>cd $ACEGI_SECURITY/samples/contacts</pre>
-	<pre>maven war</pre>
+	<pre>maven multiwar:multiwar</pre>
 	<pre>copy $ACEGI_SECURITY/samples/contacts/target/acegi-security-sample-contacts-filter.war $YOUR_CONTAINER/webapps</pre>
   </ol>
   <p>Then load up your web container and visit
diff --git a/samples/contacts/maven.xml b/samples/contacts/maven.xml
index 24df54899a..8cbce63a86 100644
--- a/samples/contacts/maven.xml
+++ b/samples/contacts/maven.xml
@@ -4,6 +4,10 @@
    xmlns:maven="jelly:maven">
 
     <goal name="war">
+	    <echo>The "war" goal is deprecated. Use "multiwar:multiwar" instead.</echo>
+    </goal>
+    
+    <goal name="multiwar:multiwar">
         <!-- cas war -->
         <j:set var="webapp" value="cas"/>
         <attainGoal name="acegisecurity:war"/>
diff --git a/samples/contacts/project.properties b/samples/contacts/project.properties
index 07c5835c8f..e79320ca7e 100644
--- a/samples/contacts/project.properties
+++ b/samples/contacts/project.properties
@@ -19,7 +19,7 @@ client.dir=client
 
 maven.war.src=${maven.src.dir}/main/webapp/common
 
-maven.multiproject.type=war
+maven.multiproject.type=multiwar
 
 maven.xdoc.distributionType=war
 maven.xdoc.distributionUrl=http://acegisecurity.sourceforge.net/maven/acegisecurity/wars