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/08/27 21:03:23 UTC
svn commit: r689564 - in /james/jsieve/trunk: build.xml include.properties
stage/net.java/ stage/net.java/jars/ stage/net.java/jars/javacc-4.1.LICENSE
stage/net.java/jars/javacc-4.1.jar
Author: rdonkin
Date: Wed Aug 27 12:03:22 2008
New Revision: 689564
URL: http://svn.apache.org/viewvc?rev=689564&view=rev
Log:
Upgrade JavaCC. Now under BSD license :-)
Added:
james/jsieve/trunk/stage/net.java/
james/jsieve/trunk/stage/net.java/jars/
james/jsieve/trunk/stage/net.java/jars/javacc-4.1.LICENSE
james/jsieve/trunk/stage/net.java/jars/javacc-4.1.jar (with props)
Modified:
james/jsieve/trunk/build.xml
james/jsieve/trunk/include.properties
Modified: james/jsieve/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=689564&r1=689563&r2=689564&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Wed Aug 27 12:03:22 2008
@@ -136,10 +136,6 @@
Or zen for the more spiritual amongst you.
-->
<target name="preprocess" depends="prepare-common">
- <available property='present.javacc' file='${javacc.jar}'/>
- <fail unless='present.javacc'>JavaCC 4.0 is required to build JSieve.
-Please download from https://javacc.dev.java.net/ and edit include.properties.
- </fail>
<!--
Generate JavaCC source inserting parse tree building actions
and the Java source for the parse classes.
@@ -162,14 +158,14 @@
<!-- Generate Java source from the JavaCC source -->
<java classname="javacc" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="-output_directory=${build.src}/org/apache/jsieve/parser/generated ${build.src}/sieve.jj"/>
+ <arg line="-output_directory=${build.src}/org/apache/jsieve/parser/generated ${build.src}/org/apache/jsieve/parser/generated/sieve.jj"/>
<classpath>
<pathelement location="${javacc.jar}"/>
<pathelement path="${java.class.path}" />
</classpath>
</java>
<java classname="javacc" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="-output_directory=${build.src}/org/apache/jsieve/parser/generated/address ${build.src}/AddressListParser.jj"/>
+ <arg line="-output_directory=${build.src}/org/apache/jsieve/parser/generated/address ${build.src}/org/apache/jsieve/parser/generated/address/AddressListParser.jj"/>
<classpath>
<pathelement location="${javacc.jar}"/>
<pathelement path="${java.class.path}" />
Modified: james/jsieve/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/include.properties?rev=689564&r1=689563&r2=689564&view=diff
==============================================================================
--- james/jsieve/trunk/include.properties (original)
+++ james/jsieve/trunk/include.properties Wed Aug 27 12:03:22 2008
@@ -50,7 +50,7 @@
junit.jar=${lib.dir}/junit/jars/junit-3.8.1.jar
# ----- JavaCC ----
-javacc.jar=javacc-4.0.jar
+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
Added: james/jsieve/trunk/stage/net.java/jars/javacc-4.1.LICENSE
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/stage/net.java/jars/javacc-4.1.LICENSE?rev=689564&view=auto
==============================================================================
--- james/jsieve/trunk/stage/net.java/jars/javacc-4.1.LICENSE (added)
+++ james/jsieve/trunk/stage/net.java/jars/javacc-4.1.LICENSE Wed Aug 27 12:03:22 2008
@@ -0,0 +1,27 @@
+Copyright (c) 2006, Sun Microsystems, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the Sun Microsystems, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
Added: james/jsieve/trunk/stage/net.java/jars/javacc-4.1.jar
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/stage/net.java/jars/javacc-4.1.jar?rev=689564&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/jsieve/trunk/stage/net.java/jars/javacc-4.1.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