Author: rdonkin
Date: Mon Oct 6 13:21:44 2008
New Revision: 702251
URL: http://svn.apache.org/viewvc?rev=702251&view=rev
Log:
JSIEVE-37 Push main source down a level to allow space for other modules.
Added:
james/jsieve/trunk/main/ (with props)
james/jsieve/trunk/main/BUILDING.txt (props changed)
- copied unchanged from r701231, james/jsieve/trunk/BUILDING.txt
james/jsieve/trunk/main/LICENSE.apache (props changed)
- copied unchanged from r701231, james/jsieve/trunk/LICENSE.apache
james/jsieve/trunk/main/LICENSE.txt (props changed)
- copied unchanged from r701231, james/jsieve/trunk/LICENSE.txt
james/jsieve/trunk/main/NOTICE.base (props changed)
- copied unchanged from r701231, james/jsieve/trunk/NOTICE.base
james/jsieve/trunk/main/NOTICE.txt (props changed)
- copied unchanged from r701231, james/jsieve/trunk/NOTICE.txt
james/jsieve/trunk/main/README.txt (props changed)
- copied unchanged from r701231, james/jsieve/trunk/README.txt
james/jsieve/trunk/main/build.xml (contents, props changed)
- copied, changed from r701231, james/jsieve/trunk/build.xml
james/jsieve/trunk/main/pom.xml (props changed)
- copied unchanged from r701231, james/jsieve/trunk/pom.xml
james/jsieve/trunk/main/src/ (props changed)
- copied from r701231, james/jsieve/trunk/src/
Removed:
james/jsieve/trunk/BUILDING.txt
james/jsieve/trunk/LICENSE.apache
james/jsieve/trunk/LICENSE.txt
james/jsieve/trunk/NOTICE.base
james/jsieve/trunk/NOTICE.txt
james/jsieve/trunk/README.txt
james/jsieve/trunk/build.xml
james/jsieve/trunk/pom.xml
james/jsieve/trunk/src/
Modified:
james/jsieve/trunk/default.properties
james/jsieve/trunk/include.properties
Modified: james/jsieve/trunk/default.properties
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/default.properties?rev=702251&r1=702250&r2=702251&view=diff
==============================================================================
--- james/jsieve/trunk/default.properties (original)
+++ james/jsieve/trunk/default.properties Mon Oct 6 13:21:44 2008
@@ -66,7 +66,7 @@
# location of intermediate products
#
-build.dir = ${jsieve.dir}/target
+build.dir = ${basedir}/target
build.lib = ${build.dir}/lib
build.src = ${build.dir}/src
build.classes = ${build.dir}/classes
@@ -80,7 +80,7 @@
# source properties
#
-src.dir=${jsieve.dir}/src
+src.dir=${basedir}/src
java.dir=${src.dir}/main/java
test.dir=${src.dir}/test/java
javacc.dir=${src.dir}/main/jjtree
@@ -91,6 +91,6 @@
# distribution directories
#
-dist.base = ${jsieve.dir}/dist
+dist.base = ${build.dir}/dist
dist.name = ${name}-${version}
dist.dir = ${dist.base}/${dist.name}
Modified: james/jsieve/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/include.properties?rev=702251&r1=702250&r2=702251&view=diff
==============================================================================
--- james/jsieve/trunk/include.properties (original)
+++ james/jsieve/trunk/include.properties Mon Oct 6 13:21:44 2008
@@ -26,7 +26,7 @@
# the relative base directory
#
-jsieve.dir = ${basedir}
+jsieve.dir = ..
#
# third party binary directories
@@ -53,7 +53,7 @@
javacc.jar=${lib.dir}/net.java/jars/javacc-4.1.jar
# ----- BND tool -----
-bnd.jar.relative=stage/biz.aQute/jars/bnd-0.0.249.jar
+bnd.jar.relative=${lib.dir}/biz.aQute/jars/bnd-0.0.249.jar
# --------------------------------------------------
# LIBRARIES REQUIRED FOR TESTING
Propchange: james/jsieve/trunk/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 6 13:21:44 2008
@@ -0,0 +1,3 @@
+target
+.*
+*.log
Propchange: james/jsieve/trunk/main/BUILDING.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/jsieve/trunk/main/BUILDING.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/LICENSE.apache
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/LICENSE.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/NOTICE.base
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/NOTICE.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/README.txt
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/jsieve/trunk/main/build.xml (from r701231,
james/jsieve/trunk/build.xml)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?p2=james/jsieve/trunk/main/build.xml&p1=james/jsieve/trunk/build.xml&r1=701231&r2=702251&rev=702251&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Mon Oct 6 13:21:44 2008
@@ -32,8 +32,8 @@
-->
<property file=".ant.properties"/>
<property file="${user.home}/.ant.properties"/>
- <property file="include.properties"/>
- <property file="default.properties"/>
+ <property file="../include.properties"/>
+ <property file="../default.properties"/>
<!--
===================================================================
@@ -227,7 +227,12 @@
<fileset dir="${java.dir}">
<include name="**/*.properties"/>
</fileset>
- </copy>
+ </copy>
+ <copy todir="${build.classes.test}">
+ <fileset dir="${testconf.dir}">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
<copy file='LICENSE.apache'
tofile="${build.classes}/META-INF/LICENSE.txt"/>
<copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base'/>
</target>
@@ -374,6 +379,7 @@
<jvmarg line="-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/>
-->
<classpath id="junit.class.path">
+ <pathelement location="${testconf.dir}"/>
<fileset dir="${dist.dir}/lib">
<include name="**/*.jar"/>
</fileset>
Propchange: james/jsieve/trunk/main/build.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/jsieve/trunk/main/pom.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/jsieve/trunk/main/src/
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
