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 2007/03/31 15:01:43 UTC
svn commit: r524419 - in /james/jspf/trunk: ./
repos/third-party-m1/commons-cli/ repos/third-party-m1/commons-cli/jars/
repos/third-party-m1/junit/ repos/third-party-m1/junit/jars/
src/main/java/org/apache/james/jspf/terms/
Author: bago
Date: Sat Mar 31 06:01:42 2007
New Revision: 524419
URL: http://svn.apache.org/viewvc?view=rev&rev=524419
Log:
Fix so that exp=something and redirect=something are not valid UnknownModifiers (rfc interpretation)
Fixed pom to not use the apache m1 repository and added commons-cli and junit.jar into the local repository.
Added:
james/jspf/trunk/repos/third-party-m1/commons-cli/
james/jspf/trunk/repos/third-party-m1/commons-cli/jars/
james/jspf/trunk/repos/third-party-m1/commons-cli/jars/commons-cli-1.0.jar (with props)
james/jspf/trunk/repos/third-party-m1/junit/
james/jspf/trunk/repos/third-party-m1/junit/jars/
james/jspf/trunk/repos/third-party-m1/junit/jars/junit-3.8.1.jar (with props)
Modified:
james/jspf/trunk/pom.xml
james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
Modified: james/jspf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?view=diff&rev=524419&r1=524418&r2=524419
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Sat Mar 31 06:01:42 2007
@@ -68,6 +68,16 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -93,6 +103,20 @@
<url>http://svn.apache.org/viewvc/james/jspf/trunk/</url>
</scm>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>maven-central</id>
+ <name>maven-central</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<!-- temporary to support simpler deploy -->
<repositories>
<repository>
Added: james/jspf/trunk/repos/third-party-m1/commons-cli/jars/commons-cli-1.0.jar
URL: http://svn.apache.org/viewvc/james/jspf/trunk/repos/third-party-m1/commons-cli/jars/commons-cli-1.0.jar?view=auto&rev=524419
==============================================================================
Binary file - no diff available.
Propchange: james/jspf/trunk/repos/third-party-m1/commons-cli/jars/commons-cli-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/jspf/trunk/repos/third-party-m1/junit/jars/junit-3.8.1.jar
URL: http://svn.apache.org/viewvc/james/jspf/trunk/repos/third-party-m1/junit/jars/junit-3.8.1.jar?view=auto&rev=524419
==============================================================================
Binary file - no diff available.
Propchange: james/jspf/trunk/repos/third-party-m1/junit/jars/junit-3.8.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java?view=diff&rev=524419&r1=524418&r2=524419
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/terms/UnknownModifier.java Sat Mar 31 06:01:42 2007
@@ -59,7 +59,12 @@
* @see org.apache.james.jspf.core.Configurable#config(Configuration)
*/
public synchronized void config(Configuration params) throws PermErrorException {
- // Nothing to do
+ if (params.groupCount() >= 2 && params.group(1) != null) {
+ String name = params.group(1).toLowerCase();
+ if ("exp".equals(name) || "redirect".equals(name)) {
+ throw new PermErrorException("exp and redirect are not valid names for unknown modifier: this probably means an invalid syntax for exp or redirect fallback to the unkown modifier.");
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org