Author: rdonkin
Date: Mon Oct 27 13:55:24 2008
New Revision: 708311
URL: http://svn.apache.org/viewvc?rev=708311&view=rev
Log:
Fixed up dependencies for check code. JSIEVE-44
Modified:
james/jsieve/trunk/build.xml
james/jsieve/trunk/samples/build.xml
james/jsieve/trunk/util/build.xml
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptChecker.java
Modified: james/jsieve/trunk/build.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=708311&r1=708310&r2=708311&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Mon Oct 27 13:55:24 2008
@@ -36,7 +36,8 @@
<subant target='@{do}'>
<fileset dir='@{dir}' includes='main/build.xml'/>
<fileset dir='@{dir}' includes='util/build.xml'/>
- <fileset dir='@{dir}' includes='samples/build.xml'/>
+<!-- TODO: Update samples and fix dependency problems
+ <fileset dir='@{dir}' includes='samples/build.xml'/> -->
</subant>
</sequential>
</macrodef>
Modified: james/jsieve/trunk/samples/build.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/samples/build.xml?rev=708311&r1=708310&r2=708311&view=diff
==============================================================================
--- james/jsieve/trunk/samples/build.xml (original)
+++ james/jsieve/trunk/samples/build.xml Mon Oct 27 13:55:24 2008
@@ -25,7 +25,7 @@
==============================================================================
-->
-<project name='Apache JAMES JSieve' default="main" basedir=".">
+<project name='Apache JAMES JSieve Samples' default="main" basedir=".">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
@@ -198,7 +198,6 @@
===================================================================
-->
<target name="javadocs" depends="compile">
-<!--
<echo message="Making jSieve Javadocs"/>
<delete dir="${build.javadocs}"/>
@@ -221,7 +220,6 @@
<param name="-bottom" value=""Copyright © ${year} Apache
Jakarta Project. All Rights Reserved.""/>
</doclet>
</javadoc>
- -->
</target>
<!--
Modified: james/jsieve/trunk/util/build.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/build.xml?rev=708311&r1=708310&r2=708311&view=diff
==============================================================================
--- james/jsieve/trunk/util/build.xml (original)
+++ james/jsieve/trunk/util/build.xml Mon Oct 27 13:55:24 2008
@@ -25,7 +25,7 @@
==============================================================================
-->
-<project name='Apache JAMES JSieve' default="main" basedir=".">
+<project name='Apache JAMES JSieve Utilities' default="main" basedir=".">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
@@ -147,8 +147,7 @@
<classpath refid="project.class.path"/>
<src path="${build.src}"/>
<src path="${java.dir}"/>
- <!--<include name="org/apache/jsieve/**"/>-->
- <exclude name="**"/>
+ <include name="org/apache/jsieve/**"/>
</javac>
<copy todir="${build.classes}">
<fileset dir="${conf.dir}">
@@ -252,9 +251,9 @@
<mkdir dir="${build.lib}"/>
<!-- Make jSieve jar-->
- <echo message="Making jSieve Jar (${name}-${version}.jar)"/>
+ <echo message="Making jSieve Jar (${name}-${version}-utils.jar)"/>
<jar
- jarfile="${build.lib}/${name}-${version}.jar"
+ jarfile="${build.lib}/${name}-${version}-utils.jar"
basedir="${build.classes}">
<include name="org/apache/jsieve/**"/>
<include name="META-INF/**"/>
@@ -276,22 +275,9 @@
resource="aQute/bnd/ant/taskdef.properties"
classpath="${bnd.jar.relative}"/>
<bndwrap
- jars='${build.lib}/${name}-${version}.jar'
- output='${build.lib}/${name}-${version}.jar'
+ jars='${build.lib}/${name}-${version}-utils.jar'
+ output='${build.lib}/${name}-${version}-utils.jar'
definitions="."/>
-
- <!-- Make jSieve jUnit jar-->
- <echo message="Making jSieve jUnit Jar (${name}-junit-${version}.jar)"/>
- <jar jarfile="${build.lib}/${name}-unit-tests-${version}.jar"
- basedir="${build.classes.test}">
- <include name="org/apache/jsieve/**"/>
- <include name="META-INF/**"/>
- <manifest>
- <attribute name="Created-By" value='${creator}'/>
- <attribute name="X-Compile-Source-JDK" value='${jdk.source}'/>
- <attribute name="X-Compile-Target-JDK" value='${jdk.target}'/>
- </manifest>
- </jar>
</target>
<!--
Modified:
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=708311&r1=708310&r2=708311&view=diff
==============================================================================
---
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
(original)
+++
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Mon Oct 27 13:55:24 2008
@@ -32,13 +32,13 @@
import javax.mail.Message;
import javax.mail.MessagingException;
-import org.apache.jsieve.parser.generated.ParseException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.Action;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.mail.MailUtils;
import org.apache.jsieve.mail.SieveMailException;
import org.apache.jsieve.parser.address.SieveAddressBuilder;
+import org.apache.jsieve.parser.generated.address.ParseException;
/**
* Checks script execution for an email. The wrapped email is set by called
Modified:
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptChecker.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptChecker.java?rev=708311&r1=708310&r2=708311&view=diff
==============================================================================
---
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptChecker.java
(original)
+++
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptChecker.java
Mon Oct 27 13:55:24 2008
@@ -28,7 +28,7 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.jsieve.SieveFactory;
+import org.apache.jsieve.ConfigurationManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.ActionFileInto;
import org.apache.jsieve.mail.ActionKeep;
@@ -85,7 +85,7 @@
adapter.setMail(mimeMessage);
Results results;
try {
- SieveFactory.getInstance().interpret(adapter, script);
+ new ConfigurationManager().build().interpret(adapter, script);
final List executedActions = adapter.getExecutedActions();
results = new Results(executedActions);
} catch (ParseException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
