You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/02/12 18:53:39 UTC

svn commit: r743818 - in /james/jsieve/trunk: build.xml mailet/build.xml main/build.xml util/build.xml

Author: rdonkin
Date: Thu Feb 12 17:53:39 2009
New Revision: 743818

URL: http://svn.apache.org/viewvc?rev=743818&view=rev
Log:
Consolidate duplicate check. JSIEVE-45

Modified:
    james/jsieve/trunk/build.xml
    james/jsieve/trunk/mailet/build.xml
    james/jsieve/trunk/main/build.xml
    james/jsieve/trunk/util/build.xml

Modified: james/jsieve/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=743818&r1=743817&r2=743818&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Thu Feb 12 17:53:39 2009
@@ -27,6 +27,19 @@
 
 <project name='jsieve-master' default="main" basedir=".">
     
+    <macrodef name='CheckMailConditions'>
+        <sequential>
+            <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
+            <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
+            <condition property="is.available.libs.test">
+                <and>
+                    <isset property='is.available.javamail' />
+                    <isset property='is.available.activation' />
+                </and>
+            </condition>
+        </sequential>
+    </macrodef>
+    
     <macrodef name='RunTests'>
         <sequential>
             <echo message="Running tests" />

Modified: james/jsieve/trunk/mailet/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/build.xml?rev=743818&r1=743817&r2=743818&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Thu Feb 12 17:53:39 2009
@@ -78,14 +78,7 @@
     ===================================================================
     -->
     <target name="prepare">
-        <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
-        <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
-        <condition property="is.available.libs.test">
-            <and>
-                <isset property='is.available.javamail' />
-                <isset property='is.available.activation' />
-            </and>
-        </condition>
+        <CheckMailConditions/>
     </target>
 
     <!--

Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=743818&r1=743817&r2=743818&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Thu Feb 12 17:53:39 2009
@@ -73,14 +73,7 @@
     ===================================================================
     -->
     <target name="prepare" depends="preprocess">
-        <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
-        <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
-        <condition property="is.available.libs.test">
-            <and>
-                <isset property='is.available.javamail' />
-                <isset property='is.available.activation' />
-            </and>
-        </condition>
+        <CheckMailConditions/>
     </target>
 
     <!--

Modified: james/jsieve/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/build.xml?rev=743818&r1=743817&r2=743818&view=diff
==============================================================================
--- james/jsieve/trunk/util/build.xml (original)
+++ james/jsieve/trunk/util/build.xml Thu Feb 12 17:53:39 2009
@@ -77,14 +77,7 @@
     ===================================================================
     -->
     <target name="prepare">
-        <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
-        <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
-        <condition property="is.available.libs.test">
-            <and>
-                <isset property='is.available.javamail' />
-                <isset property='is.available.activation' />
-            </and>
-        </condition>
+        <CheckMailConditions/>
     </target>
 
     <!--



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org