Index: phoenix-deployment/build.xml
===================================================================
--- phoenix-deployment/build.xml	(revision 726389)
+++ phoenix-deployment/build.xml	(working copy)
@@ -1109,6 +1109,17 @@
         </echoxml>
     </target>
  
+    <target name='vut-smoke' depends='dist-properties'>
+        <VUTSmoke 
+            build-dir='${build.dir}' 
+            zip='${dist.binary.file.zip}' 
+            package='${name}-${version}'
+            app-path='apps'
+            conf-path='apps/james/SAR-INF'
+            conf-file-name='config.xml'
+            cmd='phoenix'
+            log='temp/phoenix.console'/>   
+    </target>    
     
     <target name='sieve-smoke' depends='dist-properties'>
         <SieveSmoke 
Index: build-tools/vut.xsl
===================================================================
--- build-tools/vut.xsl	(revision 726389)
+++ build-tools/vut.xsl	(working copy)
@@ -15,6 +15,25 @@
 	But: 
 -->
 <!-- 
+Virtual hosting
+ -->
+    <!-- Enable -->
+ 	<xsl:template match="config/James/enableVirtualHosting">
+		<xsl:element name='enableVirtualHosting'>
+			<xsl:text>true</xsl:text>
+	    </xsl:element>
+	</xsl:template>
+	<xsl:template match="config/domainlist/domainnames">
+		<xsl:element name='domainnames'>
+			<xsl:element name='domainname'>
+				<xsl:text>localhost</xsl:text>
+		    </xsl:element>
+		    <xsl:element name='domainname'>
+				<xsl:text>example.org</xsl:text>
+		    </xsl:element>
+	    </xsl:element>
+	</xsl:template>
+<!-- 
 	Ignore comments 
 -->
 	<xsl:template match="comment()"/>

Property changes on: build-tools/vut.xsl
___________________________________________________________________
Added: svn:mergeinfo

Index: build-tools/vut-pop3.mpt
===================================================================
--- build-tools/vut-pop3.mpt	(revision 726389)
+++ build-tools/vut-pop3.mpt	(working copy)
@@ -22,7 +22,7 @@
 C: PASS passwd
 S: \+OK Welcome john.smith
 C: STAT
-S: \+OK 1 .*
+S: \+OK 2 .*
 C: RETR 1
 S: \+OK Message follows
 S: Message-ID: .*
@@ -43,6 +43,30 @@
 S: Simple plain mail content
 S:
 S: .
+C: RETR 1
+S: \+OK Message follows
+S: Message-ID: .*
+S: MIME-Version: 1.0
+S: Return-Path: <alex@example.org>
+S: Content-Type: text/plain; charset=us-ascii
+S: Content-Transfer-Encoding: 7bit
+S: Delivered-To: john.smith@localhost
+S: Received: from localhost.*
+S: .*by localhost.*
+S: .*for <john.smith@localhost>;
+S: .*
+S: Date: 13 Dec 2008 GMT
+S: From: <alex@example.org>
+S: To: <support@example.org>
+S: Subject: Virtual Host Test Message
+S:
+S: This message tests James virtual user mapping.
+S: support@example.org should be mapping to john.smith@localhost
+S: and delivered to that mailbox.
+S:
+S: .
+C: DELE 2
+S: \+OK Message deleted
 C: DELE 1
 S: \+OK Message deleted
 C: STAT
Index: build-tools/vut-smtp.mpt
===================================================================
--- build-tools/vut-smtp.mpt	(revision 726389)
+++ build-tools/vut-smtp.mpt	(working copy)
@@ -34,5 +34,22 @@
 C:
 C: .
 S: 250 2.6.0 Message received
+C: MAIL FROM:<alex@example.org>
+S: 250 2.1.0 Sender <alex@example.org> OK
+C: RCPT TO:<support@example.org>
+S: 250 2.1.5 Recipient <support@example.org> OK
+C: DATA
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: Date: 13 Dec 2008 GMT
+C: From: <alex@example.org>
+C: To: <support@example.org>
+C: Subject: Virtual Host Test Message
+C:
+C: This message tests James virtual user mapping.
+C: support@example.org should be mapping to john.smith@localhost
+C: and delivered to that mailbox.
+C:
+C: .
+S: 250 2.6.0 Message received
 C: QUIT
 S: 221 2.0.0 .* Service closing transmission channel
Index: build-tools/smoke.xml
===================================================================
--- build-tools/smoke.xml	(revision 726391)
+++ build-tools/smoke.xml	(working copy)
@@ -61,17 +61,17 @@
 S: User user a.*
 C: adduser john.smith passwd
 S: User john.smith a.*
-C: removemapping john.smith@localhost support@example.org
+C: removemapping support@example.org john.smith@localhost
 S: .*
-C: addmapping john.smith@localhost support@example.org
+C: addmapping support@example.org john.smith@localhost
 S: Adding mapping successful: true
 </addUser>
             </mpt:mpt>               
         </sequential>   
     </macrodef>   
     
-    <macrodef name='RunSmokeTests'>
-        <sequential>   
+    <macrodef name='InitMPT'>
+        <sequential>
             <taskdef 
                 uri="antlib:org.apache.james.mpt.ant" 
                 resource="org/apache/james/mpt/ant/antlib.xml">
@@ -79,7 +79,13 @@
                     <pathelement location="${lib.dir}/${mpt.jar}" />
                     <pathelement location='${lib.dir}/${mpt-antlib.jar}' />
                 </classpath>
-            </taskdef>  
+            </taskdef>     
+        </sequential>   
+    </macrodef>   
+    
+    <macrodef name='RunSmokeTests'>
+        <sequential>   
+            <InitMPT/>
             
             <TestProtocol port='${org.apache.james.smoke.port.POP3}' name='pop3'/>    
             <TestProtocol port='${org.apache.james.smoke.port.IMAP}' name='imap'/>
@@ -118,7 +124,38 @@
     
         </sequential>   
     </macrodef> 
- 
+    
+    <macrodef name='VUTSmoke'>
+        <attribute name='build-dir'/> 
+        <attribute name='zip'/>    
+        <attribute name='package'/>
+        <attribute name='app-path'/>
+        <attribute name='conf-path'/>
+        <attribute name='conf-file-name'/> 
+        <attribute name='cmd'/>
+        <attribute name='log'/>   
+        <sequential>
+    
+            <VerifySmokePrerequisites zip='@{zip}'/>
+        
+            <property name='smoke.sieve.dir' location='@{build-dir}/vut-smoke'/>
+            <UnpackDistribution zip='@{zip}' dir='${smoke.sieve.dir}'/>
+            
+            <property name='smoke.sieve.james.dir' location='${smoke.sieve.dir}/@{package}'/>               
+            <ConfigureJames 
+                dir='${smoke.sieve.james.dir}' 
+                app-path='@{app-path}' 
+                conf-path='@{conf-path}'
+                conf-file-name='@{conf-file-name}'
+                style='vut'/>   
+
+            <BootJames dir='${smoke.sieve.james.dir}' cmd='@{cmd}' log='@{log}'/>  
+            <InitMPT/>   
+            <TestDelivery pop3="vut-pop3" smtp="vut-smtp"/>
+            <StopJames dir='${smoke.sieve.james.dir}' cmd='@{cmd}'/>       
+        </sequential>   
+    </macrodef>    
+    
     <macrodef name='SieveSmoke'>
         <attribute name='build-dir'/> 
         <attribute name='zip'/>