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 2008/10/26 08:18:30 UTC
svn commit: r707946 - in /james/jsieve/trunk: ./ main/ samples/
samples/src/main/java/org/ samples/src/samples/java/org/
stage/org.apache.jsieve/ stage/org.apache.jsieve/jars/
stage/org.apache.mailet/ stage/org.apache.mailet/jars/
Author: rdonkin
Date: Sun Oct 26 00:18:29 2008
New Revision: 707946
URL: http://svn.apache.org/viewvc?rev=707946&view=rev
Log:
Move samples into correct locations. Some require updates and have difficult dependencies. Commenting out build for now. JSIEVE-40
Added:
james/jsieve/trunk/samples/src/main/java/org/ (props changed)
- copied from r707941, james/jsieve/trunk/samples/src/samples/java/org/
james/jsieve/trunk/stage/org.apache.jsieve/
james/jsieve/trunk/stage/org.apache.jsieve/jars/ (with props)
james/jsieve/trunk/stage/org.apache.mailet/
james/jsieve/trunk/stage/org.apache.mailet/jars/
james/jsieve/trunk/stage/org.apache.mailet/jars/apache-mailet-2.4-SNAPSHOT.jar (with props)
Removed:
james/jsieve/trunk/samples/src/samples/java/org/
Modified:
james/jsieve/trunk/include.properties
james/jsieve/trunk/main/build.xml
james/jsieve/trunk/samples/build.xml
Modified: james/jsieve/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/include.properties?rev=707946&r1=707945&r2=707946&view=diff
==============================================================================
--- james/jsieve/trunk/include.properties (original)
+++ james/jsieve/trunk/include.properties Sun Oct 26 00:18:29 2008
@@ -33,6 +33,7 @@
#
lib.dir = ${jsieve.dir}/stage
+lib.jsieve.dir = ${lib.dir}/jsieve/jars
# --------------------------------------------------
# REQUIRED LIBRARIES
@@ -55,8 +56,13 @@
# ----- BND tool -----
bnd.jar.relative=${lib.dir}/biz.aQute/jars/bnd-0.0.249.jar
+# ----- Mailet API ---
+
+mailet.jar=${lib.dir}/org.apache.mailet/jars/apache-mailet-2.4-SNAPSHOT.jar
+
# --------------------------------------------------
# LIBRARIES REQUIRED FOR TESTING
# --------------------------------------------------
mail.jar=${lib.dir}/javax.mail/jars/mail-1.4.1.jar
activation.jar=${lib.dir}/javax.activation/jars/activation-1.1.1.jar
+
Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=707946&r1=707945&r2=707946&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Sun Oct 26 00:18:29 2008
@@ -315,7 +315,8 @@
<attribute name="X-Compile-Target-JDK" value='${jdk.target}'/>
</manifest>
</jar>
-
+ <copy todir='${lib.jsieve.dir}' file='${build.lib}/${name}-${version}.jar'/>
+
<taskdef
resource="aQute/bnd/ant/taskdef.properties"
classpath="${bnd.jar.relative}"/>
@@ -336,6 +337,8 @@
<attribute name="X-Compile-Target-JDK" value='${jdk.target}'/>
</manifest>
</jar>
+
+ <copy todir='${lib.jsieve.dir}' file='${build.lib}/${name}-unit-tests-${version}.jar'/>
</target>
<!--
Modified: james/jsieve/trunk/samples/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/samples/build.xml?rev=707946&r1=707945&r2=707946&view=diff
==============================================================================
--- james/jsieve/trunk/samples/build.xml (original)
+++ james/jsieve/trunk/samples/build.xml Sun Oct 26 00:18:29 2008
@@ -40,23 +40,25 @@
Set the classpath
===================================================================
-->
-
+
+ <path id="mail.class.path">
+ <pathelement location='${mail.jar}'/>
+ <pathelement location='${activation.jar}'/>
+ </path>
+
<path id="project.class.path">
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar'/>
+ <pathelement location="${mailet.jar}"/>
+ <path refid="mail.class.path"/>
<pathelement path="${java.class.path}" />
<pathelement path="${build.classes}" />
</path>
-
- <path id="mail.class.path">
- <pathelement location='${mail.jar}'/>
- <pathelement location='${activation.jar}'/>
- </path>
<path id="project.test.class.path">
- <path refid="project.class.path"/>
- <path refid="mail.class.path"/>
+ <path refid="project.class.path"/>
</path>
<!--
@@ -145,7 +147,8 @@
<classpath refid="project.class.path"/>
<src path="${build.src}"/>
<src path="${java.dir}"/>
- <include name="org/apache/jsieve/**"/>
+ <!--<include name="org/apache/jsieve/**"/>-->
+ <exclude name="**"/>
</javac>
<copy todir="${build.classes}">
<fileset dir="${conf.dir}">
Propchange: james/jsieve/trunk/samples/src/main/java/org/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/stage/org.apache.jsieve/jars/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 26 00:18:29 2008
@@ -0,0 +1 @@
+*
Added: james/jsieve/trunk/stage/org.apache.mailet/jars/apache-mailet-2.4-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/stage/org.apache.mailet/jars/apache-mailet-2.4-SNAPSHOT.jar?rev=707946&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/jsieve/trunk/stage/org.apache.mailet/jars/apache-mailet-2.4-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org