Author: rdonkin
Date: Tue Dec 9 14:37:20 2008
New Revision: 724920
URL: http://svn.apache.org/viewvc?rev=724920&view=rev
Log:
Improve error reporting for spring deployment test
Modified:
james/server/trunk/build-tools/smoke.xml
james/server/trunk/phoenix-deployment/build.xml
james/server/trunk/spring-deployment/build.xml
Modified: james/server/trunk/build-tools/smoke.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/build-tools/smoke.xml?rev=724920&r1=724919&r2=724920&view=diff
==============================================================================
--- james/server/trunk/build-tools/smoke.xml (original)
+++ james/server/trunk/build-tools/smoke.xml Tue Dec 9 14:37:20 2008
@@ -75,6 +75,7 @@
<attribute name='conf-path'/>
<attribute name='conf-file-name'/>
<attribute name='cmd'/>
+ <attribute name='log'/>
<sequential>
<VerifySmokePrerequisites zip='@{zip}'/>
@@ -88,7 +89,7 @@
app-path='@{app-path}'
conf-path='@{conf-path}'
conf-file-name='@{conf-file-name}'/>
- <BootJames dir='${smoke.james.dir}' cmd='@{cmd}'/>
+ <BootJames dir='${smoke.james.dir}' cmd='@{cmd}' log='@{log}'/>
<RunSmokeTests/>
<StopJames dir='${smoke.james.dir}' cmd='@{cmd}'/>
@@ -103,6 +104,7 @@
<attribute name='conf-path'/>
<attribute name='conf-file-name'/>
<attribute name='cmd'/>
+ <attribute name='log'/>
<sequential>
<VerifySmokePrerequisites zip='@{zip}'/>
@@ -118,7 +120,7 @@
conf-file-name='@{conf-file-name}'
style='sieve'/>
- <BootJames dir='${smoke.sieve.james.dir}' cmd='@{cmd}'/>
+ <BootJames dir='${smoke.sieve.james.dir}' cmd='@{cmd}'
log='@{log}'/>
<RunSmokeTests/>
<StopJames dir='${smoke.sieve.james.dir}' cmd='@{cmd}'/>
</sequential>
@@ -160,6 +162,7 @@
<macrodef name='BootJames'>
<attribute name='dir'/>
<attribute name='cmd'/>
+ <attribute name='log'/>
<sequential>
<StopJames dir='@{dir}' cmd='@{cmd}'/>
<StartJames dir='@{dir}' cmd='@{cmd}'/>
@@ -174,7 +177,7 @@
</and>
</waitfor>
<fail if='smoke.boot.failed'>
-Failed to boot James server. See @{dir}/temp/phoenix.console for details.
+Failed to boot James server. See @{dir}/@{log} for details.
</fail>
<echo>James booted.</echo>
</sequential>
Modified: james/server/trunk/phoenix-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=724920&r1=724919&r2=724920&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Tue Dec 9 14:37:20 2008
@@ -1111,7 +1111,8 @@
app-path='apps'
conf-path='apps/james/SAR-INF'
conf-file-name='config.xml'
- cmd='phoenix'/>
+ cmd='phoenix'
+ log='temp/phoenix.console'/>
</target>
<target name='smoke' depends='dist-properties'>
@@ -1122,7 +1123,8 @@
app-path='apps'
conf-path='apps/james/SAR-INF'
conf-file-name='config.xml'
- cmd='phoenix'/>
+ cmd='phoenix'
+ log='temp/phoenix.console'/>
</target>
<!--
Modified: james/server/trunk/spring-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=724920&r1=724919&r2=724920&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/build.xml (original)
+++ james/server/trunk/spring-deployment/build.xml Tue Dec 9 14:37:20 2008
@@ -529,6 +529,17 @@
</GenerateEclipseProject>
</target>
+ <target name='sieve-smoke'>
+ <SieveSmoke
+ build-dir='${build.dir}'
+ zip='${spring-deployment.dist.bin.zip}'
+ package='${spring-deployment.artefact.name}'
+ app-path='conf'
+ conf-path='conf'
+ conf-file-name='james-config.xml'
+ cmd='run'
+ log='bin/james.console'/>
+ </target>
<target name='smoke'>
<Smoke
@@ -538,6 +549,7 @@
app-path='conf'
conf-path='conf'
conf-file-name='james-config.xml'
- cmd='run'/>
+ cmd='run'
+ log='bin/james.console'/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
