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 ba...@apache.org on 2008/05/12 20:56:26 UTC
svn commit: r655598 - in /james/jsieve/trunk: ./
src/main/appended-resources/ src/main/java/org/apache/jsieve/
src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/
src/main/resources/org/apache/jsieve/ src/site/xdoc/
Author: bago
Date: Mon May 12 11:56:25 2008
New Revision: 655598
URL: http://svn.apache.org/viewvc?rev=655598&view=rev
Log:
Removed commons-digester/commons-beanutils dependencies by moving from xml to properties for jsieve assemblage (JSIEVE-20)
Added:
james/jsieve/trunk/src/main/resources/
james/jsieve/trunk/src/main/resources/org/
james/jsieve/trunk/src/main/resources/org/apache/
james/jsieve/trunk/src/main/resources/org/apache/jsieve/
james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties (with props)
james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties (with props)
james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties (with props)
Modified:
james/jsieve/trunk/LICENSE.txt
james/jsieve/trunk/build.xml
james/jsieve/trunk/default.properties
james/jsieve/trunk/include.properties
james/jsieve/trunk/pom.xml
james/jsieve/trunk/src/main/appended-resources/supplemental-models.xml
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
james/jsieve/trunk/src/site/xdoc/start.xml
Modified: james/jsieve/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/LICENSE.txt?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/LICENSE.txt (original)
+++ james/jsieve/trunk/LICENSE.txt Mon May 12 11:56:25 2008
@@ -402,8 +402,6 @@
Apache Commons Logging,
The Apache Software License, Version 1.1 (commons-logging-1.0.3.jar)
- Apache Commons Collections,
- The Apache Software License, Version 1.1 (commons-collections-2.1.jar)
The Apache Software License, Version 1.1
Modified: james/jsieve/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Mon May 12 11:56:25 2008
@@ -42,9 +42,6 @@
-->
<path id="project.class.path">
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${junit.jar}"/>
@@ -98,7 +95,8 @@
<fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="${xdocs.dir}" includes="**/*.xml" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${conf.dir}" includes="**/*.xml" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
<fixcrlf srcdir="." includes="build.sh" eol="lf"/>
<fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
<fixcrlf srcdir="." includes="build.xml" eol="lf"/>
@@ -204,7 +202,7 @@
<include name="org/apache/jsieve/**"/>
</javac>
<copy todir="${build.classes}">
- <fileset dir="${java.dir}">
+ <fileset dir="${conf.dir}">
<include name="**/*.properties"/>
</fileset>
</copy>
@@ -352,17 +350,13 @@
</copy>
<!--Copies the required support jars -->
- <copy todir="${dist.dir}/lib" file="${commons-digester.jar}"/>
- <copy todir="${dist.dir}/lib" file="${commons-collections.jar}"/>
- <copy todir="${dist.dir}/lib" file="${commons-beanutils.jar}"/>
<copy todir="${dist.dir}/lib" file="${commons-logging.jar}"/>
<copy todir="${dist.dir}/lib" file="${log4j.jar}"/>
<copy todir="${dist.dir}/lib" file="${junit.jar}"/>
<!--Copies the configuration files -->
<mkdir dir="${dist.dir}/conf"/>
- <copy todir="${dist.dir}/conf" file="${conf.dir}/log4j.properties"/>
- <copy todir="${dist.dir}/conf" file="${conf.dir}/sieveConfig.xml"/>
+ <copy todir="${dist.dir}/conf" file="${testconf.dir}/log4j.properties"/>
</target>
<!--
Modified: james/jsieve/trunk/default.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/default.properties?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/default.properties (original)
+++ james/jsieve/trunk/default.properties Mon May 12 11:56:25 2008
@@ -84,7 +84,8 @@
java.dir=${src.dir}/main/java
test.dir=${src.dir}/test/java
javacc.dir=${src.dir}/main/jjtree
-conf.dir=${src.dir}/test/resources
+conf.dir=${src.dir}/main/resources
+testconf.dir=${src.dir}/test/resources
xdocs.dir=${src.dir}/site/xdoc
docs.src=${xdocs.dir}
Modified: james/jsieve/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/include.properties?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/include.properties (original)
+++ james/jsieve/trunk/include.properties Mon May 12 11:56:25 2008
@@ -41,9 +41,6 @@
# ----- From lib
# ----- Commons -----
-commons-digester.jar=${lib.dir}/commons-digester/jars/commons-digester-1.8.jar
-commons-collections.jar=${lib.dir}/commons-collections/jars/commons-collections-2.1.jar
-commons-beanutils.jar=${lib.dir}/commons-beanutils/jars/commons-beanutils-1.7.0.jar
commons-logging.jar=${lib.dir}/commons-logging/jars/commons-logging-1.0.3.jar
# ----- Log4J -----
Modified: james/jsieve/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Mon May 12 11:56:25 2008
@@ -87,12 +87,6 @@
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: james/jsieve/trunk/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/appended-resources/supplemental-models.xml?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ james/jsieve/trunk/src/main/appended-resources/supplemental-models.xml Mon May 12 11:56:25 2008
@@ -18,25 +18,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <supplement>
- <project>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <name>Apache Commons Beanutils</name>
- <url>http://commons.apache.org/beanutils/</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- </project>
- </supplement>
<!-- Also added manually in pom.xml appeneded text because test
dependencies are not automatically included by the NOTICE
generator -->
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java Mon May 12 11:56:25 2008
@@ -19,13 +19,15 @@
package org.apache.jsieve;
+import org.apache.commons.logging.Log;
+import org.xml.sax.SAXException;
+
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.xml.sax.SAXException;
+import java.util.Properties;
/**
* <p>
@@ -34,22 +36,27 @@
* </p>
*
* <p>
- * The Sieve configuration file is named <code>sieveConfig.xml</code>. It is
+ * The Sieve configuration is read from 3 properties file. They are
* located by searching the classpath of the current ClassLoader.
+ * org/apache/jsieve/commandsmap.properties
+ * org/apache/jsieve/testsmap.properties
+ * org/apache/jsieve/comparatorsmap.properties
* </p>
*/
public class ConfigurationManager {
+
+ private static final String COMMANDSMAP_PROPERTIES = "org/apache/jsieve/commandsmap.properties";
+
+ private static final String TESTSMAP_PROPERTIES = "org/apache/jsieve/testsmap.properties";
+
+ private static final String COMPARATORSMAP_PROPERTIES = "org/apache/jsieve/comparatorsmap.properties";
+
/**
* The sole instance of the receiver.
*/
static private ConfigurationManager fieldInstance;
/**
- * The Digester used to process the Sieve configuration XML.
- */
- private Digester fieldDigester;
-
- /**
* A Map of the Command names and their associated class names.
*/
private Map fieldCommandMap;
@@ -138,15 +145,6 @@
}
/**
- * Method getConfigName answers the name of the Sieve configuration file.
- *
- * @return String
- */
- static protected String getConfigName() {
- return "sieveConfig.xml";
- }
-
- /**
* <p>
* Method getConfigStream answers an InputStream over the Sieve
* configuration file. It is located by searching the classpath of the
@@ -161,9 +159,8 @@
* @return InputStream
* @throws IOException
*/
- static protected InputStream getConfigStream() throws IOException {
+ static protected InputStream getConfigStream(String configName) throws IOException {
InputStream stream = null;
- final String configName = getConfigName();
// Context classloader is usually right in a JEE evironment
final ClassLoader contextClassLoader = Thread.currentThread()
.getContextClassLoader();
@@ -190,12 +187,10 @@
* @return Map
*/
public synchronized Map getCommandMap() {
- Map commandMap = null;
- if (null == (commandMap = getCommandMapBasic())) {
- updateCommandMap();
- return getCommandMap();
+ if (null == fieldCommandMap) {
+ fieldCommandMap = new HashMap();
}
- return commandMap;
+ return Collections.synchronizedMap(fieldCommandMap);
}
/**
@@ -205,12 +200,10 @@
* @return Map
*/
public synchronized Map getTestMap() {
- Map testMap = null;
- if (null == (testMap = getTestMapBasic())) {
- updateTestMap();
- return getTestMap();
+ if (null == fieldTestMap) {
+ fieldTestMap = new HashMap();
}
- return testMap;
+ return Collections.synchronizedMap(fieldTestMap);
}
/**
@@ -220,171 +213,10 @@
* @return Map
*/
public synchronized Map getComparatorMap() {
- Map comparatorMap = null;
- if (null == (comparatorMap = getComparatorMapBasic())) {
- updateComparatorMap();
- return getComparatorMap();
+ if (null == fieldComparatorMap) {
+ fieldComparatorMap = new HashMap();
}
- return comparatorMap;
- }
-
- /**
- * Method getCommandMapBasic answers a Map of Command names and their
- * associated class names.
- *
- * @return Map
- */
- private Map getCommandMapBasic() {
- return fieldCommandMap;
- }
-
- /**
- * Method getTestMapBasic answers a Map of Test names and their associated
- * class names.
- *
- * @return Map
- */
- private Map getTestMapBasic() {
- return fieldTestMap;
- }
-
- /**
- * Method getComparatorMapBasic answers a Map of Comparator names and their
- * a ssociated class names.
- *
- * @return Map
- */
- private Map getComparatorMapBasic() {
- return fieldComparatorMap;
- }
-
- /**
- * Method computeCommandMap answers a new CommandMap.
- *
- * @return Map
- */
- protected Map computeCommandMap() {
- return new HashMap();
- }
-
- /**
- * Method computeTestMap answers a new TestMap.
- *
- * @return Map
- */
- protected Map computeTestMap() {
- return new HashMap();
- }
-
- /**
- * Method computeComparatorMap answers a new ComparatorMap.
- *
- * @return Map
- */
- protected Map computeComparatorMap() {
- return new HashMap();
- }
-
- /**
- * Method putCommandMapEntry adds an association between a Command name and
- * an implementation class to the Command Map.
- *
- * @param name
- * @param className
- */
- public void putCommandMapEntry(String name, String className) {
- getCommandMap().put(name, className);
- }
-
- /**
- * Method putTestMapEntry adds an association between a Test name and an
- * implementation class to the Test Map.
- *
- * @param name
- * @param className
- */
- public void putTestMapEntry(String name, String className) {
- getTestMap().put(name, className);
- }
-
- /**
- * Method putComparatorMapEntry adds an association between a Comparator
- * name and an implementation class to the Comparator Map.
- *
- * @param name
- * @param className
- */
- public void putComparatorMapEntry(String name, String className) {
- getComparatorMap().put(name, className);
- }
-
- /**
- * Returns the digester, lazily initialised if required.
- *
- * @return Digester
- */
- protected synchronized Digester getDigester() {
- Digester digester = null;
- if (null == (digester = getDigesterBasic())) {
- updateDigester();
- return getDigester();
- }
- return digester;
- }
-
- /**
- * Returns the digester.
- *
- * @return Digester
- */
- private Digester getDigesterBasic() {
- return fieldDigester;
- }
-
- /**
- * Method computeDigester answers a new digester intialised with the rules
- * to parse the Sieve configuration file.
- *
- * @return Digester
- */
- protected Digester computeDigester() {
- Digester digester = new Digester();
- digester.push(this);
- digester.setValidating(false);
- // CommandMap rules
- digester.addCallMethod("sieve/commandMap/entry", "putCommandMapEntry",
- 2, new Class[] { String.class, String.class });
- digester.addCallParam("sieve/commandMap/entry/name", 0);
- digester.addCallParam("sieve/commandMap/entry/class", 1);
- // TestMap rules
- digester.addCallMethod("sieve/testMap/entry", "putTestMapEntry", 2,
- new Class[] { String.class, String.class });
- digester.addCallParam("sieve/testMap/entry/name", 0);
- digester.addCallParam("sieve/testMap/entry/class", 1);
- // ComparatorMap rules
- digester.addCallMethod("sieve/comparatorMap/entry",
- "putComparatorMapEntry", 2, new Class[] { String.class,
- String.class });
- digester.addCallParam("sieve/comparatorMap/entry/name", 0);
- digester.addCallParam("sieve/comparatorMap/entry/class", 1);
- return digester;
- }
-
- /**
- * Sets the digester.
- *
- * @param digester
- * The digester to set
- */
- protected void setDigester(Digester digester) {
- fieldDigester = digester;
- }
-
- /**
- * Updates the digester.
- */
- protected void updateDigester() {
- setDigester(computeDigester());
+ return Collections.synchronizedMap(fieldComparatorMap);
}
/**
@@ -395,8 +227,21 @@
* @throws SAXException
* @throws IOException
*/
- protected Object parse() throws SAXException, IOException {
- return getDigester().parse(getConfigStream());
+ protected void parse() throws SAXException, IOException {
+ InputStream is;
+ Properties p;
+ is = getConfigStream(COMMANDSMAP_PROPERTIES);
+ p = new Properties();
+ p.load(is);
+ setCommandMap(p);
+ is = getConfigStream(TESTSMAP_PROPERTIES);
+ p = new Properties();
+ p.load(is);
+ setTestMap(p);
+ is = getConfigStream(COMPARATORSMAP_PROPERTIES);
+ p = new Properties();
+ p.load(is);
+ setComparatorMap(p);
}
/**
@@ -405,7 +250,7 @@
* @param commandMap
* The commandMap to set
*/
- protected void setCommandMap(Map commandMap) {
+ protected synchronized void setCommandMap(Map commandMap) {
fieldCommandMap = commandMap;
}
@@ -415,7 +260,7 @@
* @param testMap
* The testMap to set
*/
- protected void setTestMap(Map testMap) {
+ protected synchronized void setTestMap(Map testMap) {
fieldTestMap = testMap;
}
@@ -425,28 +270,8 @@
* @param comparatorMap
* The comparatorMap to set
*/
- protected void setComparatorMap(Map comparatorMap) {
+ protected synchronized void setComparatorMap(Map comparatorMap) {
fieldComparatorMap = comparatorMap;
}
- /**
- * Updates the commandMap.
- */
- protected void updateCommandMap() {
- setCommandMap(computeCommandMap());
- }
-
- /**
- * Updates the testMap.
- */
- protected void updateTestMap() {
- setTestMap(computeTestMap());
- }
-
- /**
- * Updates the comparatorMap.
- */
- protected void updateComparatorMap() {
- setComparatorMap(computeComparatorMap());
- }
}
Added: james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties?rev=655598&view=auto
==============================================================================
--- james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties (added)
+++ james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties Mon May 12 11:56:25 2008
@@ -0,0 +1,35 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+################################################################
+
+if=org.apache.jsieve.commands.If
+else=org.apache.jsieve.commands.Else
+elsif=org.apache.jsieve.commands.Elsif
+require=org.apache.jsieve.commands.Require
+stop=org.apache.jsieve.commands.Stop
+# RFC3082 - Implementations MUST support these
+keep=org.apache.jsieve.commands.Keep
+discard=org.apache.jsieve.commands.Discard
+redirect=org.apache.jsieve.commands.Redirect
+# RFC3082 - Implementations SHOULD support these
+reject=org.apache.jsieve.commands.optional.Reject
+fileinto=org.apache.jsieve.commands.optional.FileInto
+# JUnit Commands for Testing
+throwtestexception=org.apache.jsieve.junit.commands.ThrowTestException
+# Extension Commands
+log=org.apache.jsieve.commands.extensions.Log
Propchange: james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/jsieve/trunk/src/main/resources/org/apache/jsieve/commandsmap.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties?rev=655598&view=auto
==============================================================================
--- james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties (added)
+++ james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties Mon May 12 11:56:25 2008
@@ -0,0 +1,22 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+################################################################
+
+# RFC3082 - Implementations MUST support these
+i;octet=org.apache.jsieve.comparators.Octet
+i;ascii-casemap=org.apache.jsieve.comparators.AsciiCasemap
Propchange: james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/jsieve/trunk/src/main/resources/org/apache/jsieve/comparatorsmap.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties?rev=655598&view=auto
==============================================================================
--- james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties (added)
+++ james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties Mon May 12 11:56:25 2008
@@ -0,0 +1,33 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+################################################################
+
+# RFC3082 - Implementations MUST support these tests
+address=org.apache.jsieve.tests.Address
+allof=org.apache.jsieve.tests.AllOf
+anyof=org.apache.jsieve.tests.AnyOf
+exists=org.apache.jsieve.tests.Exists
+false=org.apache.jsieve.tests.False
+header=org.apache.jsieve.tests.Header
+not=org.apache.jsieve.tests.Not
+size=org.apache.jsieve.tests.Size
+true=org.apache.jsieve.tests.True
+# RFC3082 - Implementations SHOULD support these
+envelope=org.apache.jsieve.tests.optional.Envelope
+# Limited implementation
+body=org.apache.jsieve.tests.optional.Body
Propchange: james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/jsieve/trunk/src/main/resources/org/apache/jsieve/testsmap.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: james/jsieve/trunk/src/site/xdoc/start.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/site/xdoc/start.xml?rev=655598&r1=655597&r2=655598&view=diff
==============================================================================
--- james/jsieve/trunk/src/site/xdoc/start.xml (original)
+++ james/jsieve/trunk/src/site/xdoc/start.xml Mon May 12 11:56:25 2008
@@ -79,7 +79,8 @@
<a href='xref/org/apache/jsieve/ConfigurationManager.html'>
<code>ConfigurationManager</code></a> before they can be used. This
may be done programmatically but the recommended method is by altering
-the <code>sieveConfig.xml</code> configuration file.
+the <code>org/apache/jsieve/commandsmap.properties</code>, <code>org/apache/jsieve/testsmap.properties</code>
+and <code>org/apache/jsieve/comparatorsmap.properties</code> resource files.
</p>
</subsection>
<subsection name='Building jSieve'>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org