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 2009/08/03 16:02:43 UTC
svn commit: r800389 - in /james/jsieve/trunk: ./ mailet/src/site/
main/src/main/java/org/apache/jsieve/
main/src/main/java/org/apache/jsieve/commands/
main/src/main/java/org/apache/jsieve/commands/extensions/
main/src/main/java/org/apache/jsieve/tests/...
Author: rdonkin
Date: Mon Aug 3 14:02:42 2009
New Revision: 800389
URL: http://svn.apache.org/viewvc?rev=800389&view=rev
Log:
Inherit common menus from james project
Modified:
james/jsieve/trunk/mailet/src/site/site.xml
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/ScriptCoordinate.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Not.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java
james/jsieve/trunk/main/src/site/site.xml
james/jsieve/trunk/pom.xml
james/jsieve/trunk/util/src/site/site.xml
Modified: james/jsieve/trunk/mailet/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/src/site/site.xml?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/src/site/site.xml (original)
+++ james/jsieve/trunk/mailet/src/site/site.xml Mon Aug 3 14:02:42 2009
@@ -47,21 +47,5 @@
<menu ref="reports" />
- <menu name="Useful Information">
- <item name="Get Involved"
- href="http://jakarta.apache.org/site/getinvolved.html" />
- <item name="Reference Library"
- href="http://jakarta.apache.org/site/library.html" />
- </menu>
-
- <menu name="The Apache Software Foundation">
- <item name="FAQ" href="http://apache.org/foundation/faq.html" />
- <item name="Sponsorship"
- href="http://apache.org/foundation/sponsorship.html" />
- <item name="Donations"
- href="http://apache.org/foundation/contributing.html" />
- <item name="Thanks"
- href="http://apache.org/foundation/thanks.html" />
- </menu>
</body>
</project>
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/ScriptCoordinate.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/ScriptCoordinate.java?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/ScriptCoordinate.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/ScriptCoordinate.java Mon Aug 3 14:02:42 2009
@@ -148,11 +148,11 @@
* positional phrase appended, not null
*/
public String addStartLineAndColumn(CharSequence message) {
- final StringBuffer buffer;
- if (message instanceof StringBuffer) {
- buffer = (StringBuffer) message;
+ final StringBuilder buffer;
+ if (message instanceof StringBuilder) {
+ buffer = (StringBuilder) message;
} else {
- buffer = new StringBuffer(message.toString());
+ buffer = new StringBuilder(message.toString());
}
buffer.append(" Line ");
buffer.append(startLineNumber);
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/Require.java Mon Aug 3 14:02:42 2009
@@ -125,7 +125,7 @@
List<Argument> args = arguments.getArgumentList();
if (args.size() != 1)
throw context.getCoordinate().syntaxException(
- "Exactly 1 argument permitted. Found " + args.size());
+ new StringBuilder("Exactly 1 argument permitted. Found ").append((int)args.size()));
Argument argument = args.get(0);
if (!(argument instanceof StringListArgument))
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/commands/extensions/Log.java Mon Aug 3 14:02:42 2009
@@ -141,7 +141,7 @@
logTrace(message, context);
else
throw context.getCoordinate().syntaxException(
- "Unsupported logging level: " + logLevel);
+ new StringBuilder("Unsupported logging level: ").append (logLevel));
}
/**
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Not.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Not.java?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Not.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Not.java Mon Aug 3 14:02:42 2009
@@ -49,7 +49,7 @@
List<Test> tests = arguments.getTestList().getTests();
if (tests.size() != 1)
throw context.getCoordinate().syntaxException(
- "Exactly 1 test permitted. Found " + tests.size());
+ new StringBuilder("Exactly 1 test permitted. Found ").append(tests.size()));
for (Test test: tests) {
result = result && test.isTestPassed(mail, context);
}
Modified: james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java (original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Size.java Mon Aug 3 14:02:42 2009
@@ -68,7 +68,7 @@
comparator = tag;
else
throw context.getCoordinate().syntaxException(
- "Found unexpected TagArgument: \"" + tag + "\"");
+ new StringBuilder("Found unexpected TagArgument: \"").append(tag).append("\""));
}
}
if (null == comparator)
Modified: james/jsieve/trunk/main/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/site/site.xml?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/site/site.xml (original)
+++ james/jsieve/trunk/main/src/site/site.xml Mon Aug 3 14:02:42 2009
@@ -48,21 +48,5 @@
<menu ref="reports" />
- <menu name="Useful Information">
- <item name="Get Involved"
- href="http://jakarta.apache.org/site/getinvolved.html" />
- <item name="Reference Library"
- href="http://jakarta.apache.org/site/library.html" />
- </menu>
-
- <menu name="The Apache Software Foundation">
- <item name="FAQ" href="http://apache.org/foundation/faq.html" />
- <item name="Sponsorship"
- href="http://apache.org/foundation/sponsorship.html" />
- <item name="Donations"
- href="http://apache.org/foundation/contributing.html" />
- <item name="Thanks"
- href="http://apache.org/foundation/thanks.html" />
- </menu>
</body>
</project>
Modified: james/jsieve/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Mon Aug 3 14:02:42 2009
@@ -29,8 +29,8 @@
</description>
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>james-parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <artifactId>james-project</artifactId>
+ <version>1.4-SNAPSHOT</version>
</parent>
<url>http://james.apache.org/jsieve/</url>
<inceptionYear>2008</inceptionYear>
Modified: james/jsieve/trunk/util/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/src/site/site.xml?rev=800389&r1=800388&r2=800389&view=diff
==============================================================================
--- james/jsieve/trunk/util/src/site/site.xml (original)
+++ james/jsieve/trunk/util/src/site/site.xml Mon Aug 3 14:02:42 2009
@@ -45,22 +45,5 @@
</menu>
<menu ref="reports" />
-
- <menu name="Useful Information">
- <item name="Get Involved"
- href="http://jakarta.apache.org/site/getinvolved.html" />
- <item name="Reference Library"
- href="http://jakarta.apache.org/site/library.html" />
- </menu>
-
- <menu name="The Apache Software Foundation">
- <item name="FAQ" href="http://apache.org/foundation/faq.html" />
- <item name="Sponsorship"
- href="http://apache.org/foundation/sponsorship.html" />
- <item name="Donations"
- href="http://apache.org/foundation/contributing.html" />
- <item name="Thanks"
- href="http://apache.org/foundation/thanks.html" />
- </menu>
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org