Author: rdonkin
Date: Sun Nov 30 07:04:32 2008
New Revision: 721826
URL: http://svn.apache.org/viewvc?rev=721826&view=rev
Log:
Add support for script shabang.
Modified:
james/protocol-tester/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
james/protocol-tester/trunk/antlib/src/site/xdoc/index.xml
james/protocol-tester/trunk/antlib/src/test/resources/build.xml
Modified:
james/protocol-tester/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
URL:
http://svn.apache.org/viewvc/james/protocol-tester/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java?rev=721826&r1=721825&r2=721826&view=diff
==============================================================================
---
james/protocol-tester/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
(original)
+++
james/protocol-tester/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
Sun Nov 30 07:04:32 2008
@@ -53,7 +53,7 @@
private int port = 0;
private String host = "127.0.0.1";
private boolean skip = false;
- private String shabang = "";
+ private String shabang = null;
private Collection users = new ArrayList();
/**
@@ -123,10 +123,26 @@
this.script = script;
}
- //TODO:
+ /**
+ * Gets script shabang.
+ * This will be substituted for the first server response.
+ * @return script shabang,
+ * or null for no shabang
+ */
public String getShabang() {
return shabang;
}
+
+ /**
+ * Sets the script shabang.
+ * When not null, this value will be used to be substituted for the
+ * first server response.
+ * @param shabang script shabang,
+ * or null for no shabang.
+ */
+ public void setShabang(String shabang) {
+ this.shabang = shabang;
+ }
//@Override
public void execute() throws BuildException {
Modified: james/protocol-tester/trunk/antlib/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/james/protocol-tester/trunk/antlib/src/site/xdoc/index.xml?rev=721826&r1=721825&r2=721826&view=diff
==============================================================================
--- james/protocol-tester/trunk/antlib/src/site/xdoc/index.xml (original)
+++ james/protocol-tester/trunk/antlib/src/site/xdoc/index.xml Sun Nov 30
07:04:32 2008
@@ -76,9 +76,14 @@
</tr>
<tr>
<td>skip</td>
- <td>Skips execution of scripts. For simple conditional execution</td>
+ <td>Skips execution of scripts. For simple conditional execution.</td>
<td>No</td>
</tr>
+<tr>
+ <td>shabang</td>
+ <td>Optional server shabang will be substituted for first server
response.</td>
+ <td>No</td>
+</tr>
</table>
</subsection>
</subsection>
Modified: james/protocol-tester/trunk/antlib/src/test/resources/build.xml
URL:
http://svn.apache.org/viewvc/james/protocol-tester/trunk/antlib/src/test/resources/build.xml?rev=721826&r1=721825&r2=721826&view=diff
==============================================================================
--- james/protocol-tester/trunk/antlib/src/test/resources/build.xml (original)
+++ james/protocol-tester/trunk/antlib/src/test/resources/build.xml Sun Nov 30
07:04:32 2008
@@ -65,6 +65,12 @@
<fileset dir='${basedir}' />
</mpt:mpt>
</target>
+
+ <target name='testMaySetShabang'>
+ <mpt:mpt port='10000' skip='true' shabang='Whatever'>
+ <fileset dir='${basedir}' />
+ </mpt:mpt>
+ </target>
<target name='testShouldAllowAddUserToBeSet'>
<mpt:mpt port='10000' skip='true' host='example.org'>
@@ -117,7 +123,7 @@
</au:expectfailure>
</target>
- <target name='testMptAttributes' depends='testMustSetPort,
testMaySetHost,testMustSetScriptsOrScript, testMustNotAllowScriptsAndScript'/>
+ <target name='testMptAttributes' depends='testMustSetPort,
testMaySetHost,testMustSetScriptsOrScript, testMustNotAllowScriptsAndScript,
testMaySetShabang'/>
<target name='testAddUser' depends='testShouldAllowAddUserToBeSet,
testAddUserMustSetPortNamePasswordScript, testAddUserMayIncludeScriptText,
testAddUserBothScriptTextAndScriptAttributeMayNotBeSet'/>
<target name='all' depends='testMptAttributes, testAddUser'/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
