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 no...@apache.org on 2006/09/27 20:15:01 UTC
svn commit: r450533 -
/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java
Author: norman
Date: Wed Sep 27 11:15:01 2006
New Revision: 450533
URL: http://svn.apache.org/viewvc?view=rev&rev=450533
Log:
Add correct svn style.
Modified:
james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java (contents, props changed)
Modified: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java?view=diff&rev=450533&r1=450532&r2=450533
==============================================================================
--- james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java (original)
+++ james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java Wed Sep 27 11:15:01 2006
@@ -1,160 +1,160 @@
-/****************************************************************
- * 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. *
- ****************************************************************/
-
-package org.apache.james.jspf.core;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.james.jspf.exceptions.NeutralException;
-import org.apache.james.jspf.exceptions.NoneException;
-import org.apache.james.jspf.exceptions.PermErrorException;
-import org.apache.james.jspf.parser.SPF1Parser;
-
-/**
- * Class to support Fallback feature
- */
-public class FallBack {
-
- private Map fallBackMap;
-
- private SPF1Parser parser;
-
- private Logger log;
-
- public FallBack(Logger log) {
- this.log = log;
- fallBackMap = Collections.synchronizedMap(new HashMap());
- parser = new SPF1Parser(log);
- }
-
- /**
- * Add a fallback entry.
- *
- * @param rawHost
- * the host or ipaddress for which the entry should be added.
- * @param rawSpfRecord
- * the spfRecord to add
- * @throws IllegalArgumentException
- * get thrown on invalid spfRecord
- */
- public void addFallBackEntry(String rawHost, String rawSpfRecord)
- throws IllegalArgumentException {
- String host;
- try {
- log.debug("Start parsing SPF-Record: " + rawSpfRecord);
- SPF1Record spfRecord = parser.parse(rawSpfRecord);
- if (rawHost.startsWith("*")) {
- host = rawHost.substring(1);
- log.debug("Convert host " + rawHost + " to " + host);
- } else if (rawHost.endsWith("*")) {
- int length = rawHost.length();
- host = rawHost.substring(length - 1, length);
- log.debug("Convert host " + rawHost + " to " + host);
- } else {
- host = rawHost;
- }
-
- synchronized (fallBackMap) {
- fallBackMap.put(host, spfRecord);
- }
- } catch (PermErrorException e) {
- throw new IllegalArgumentException("Invalid SPF-Record: "
- + rawSpfRecord);
- } catch (NoneException e) {
- throw new IllegalArgumentException("Invalid SPF-Record: "
- + rawSpfRecord);
- } catch (NeutralException e) {
- throw new IllegalArgumentException("Invalid SPF-Record: "
- + rawSpfRecord);
- }
-
- }
-
- /**
- * Clear all fallBack entries
- *
- */
- public void clearFallBackEntrys() {
- log.debug("Clear all fallback entries");
- synchronized (fallBackMap) {
- fallBackMap.clear();
- }
- }
-
- /**
- * Remove fallBack entry
- *
- * @param host
- * The host
- */
- public void removeFallBackEntrys(String host) {
- log.debug("Remove fallback entry for host: " + host);
- synchronized (fallBackMap) {
- fallBackMap.remove(getRawFallBackEntry(host));
- }
- }
-
- /**
- * Return the SPF1Record for the given host
- *
- * @param host
- * the hostname or ipaddress
- * @return the SPF1Record of null if no SPF1Record was found in fallback for
- * the given host
- */
- public SPF1Record getFallBackEntry(String host) {
- Object fallBack = null;
-
- synchronized (fallBackMap) {
- fallBack = getRawFallBackEntry(host);
- }
-
- if (fallBack != null) {
- return (SPF1Record) fallBack;
- } else {
- return null;
- }
- }
-
- /**
- * Return the Object stored in the map which match the given host. Keep in
- * mind that this method should only called in a synchronized method or
- * block
- *
- * @param host
- * the host
- * @return the stored object for the given host or null
- */
- private Object getRawFallBackEntry(String host) {
- Iterator fallBackIt = fallBackMap.keySet().iterator();
-
- while (fallBackIt.hasNext()) {
- String rawHost = fallBackIt.next().toString();
-
- if ((rawHost.startsWith(".") && host.startsWith(rawHost))
- || rawHost.endsWith(".") && host.endsWith(rawHost)) {
- return fallBackMap.get(rawHost);
- }
- }
- return null;
- }
-}
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+
+package org.apache.james.jspf.core;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.james.jspf.exceptions.NeutralException;
+import org.apache.james.jspf.exceptions.NoneException;
+import org.apache.james.jspf.exceptions.PermErrorException;
+import org.apache.james.jspf.parser.SPF1Parser;
+
+/**
+ * Class to support Fallback feature
+ */
+public class FallBack {
+
+ private Map fallBackMap;
+
+ private SPF1Parser parser;
+
+ private Logger log;
+
+ public FallBack(Logger log) {
+ this.log = log;
+ fallBackMap = Collections.synchronizedMap(new HashMap());
+ parser = new SPF1Parser(log);
+ }
+
+ /**
+ * Add a fallback entry.
+ *
+ * @param rawHost
+ * the host or ipaddress for which the entry should be added.
+ * @param rawSpfRecord
+ * the spfRecord to add
+ * @throws IllegalArgumentException
+ * get thrown on invalid spfRecord
+ */
+ public void addFallBackEntry(String rawHost, String rawSpfRecord)
+ throws IllegalArgumentException {
+ String host;
+ try {
+ log.debug("Start parsing SPF-Record: " + rawSpfRecord);
+ SPF1Record spfRecord = parser.parse(rawSpfRecord);
+ if (rawHost.startsWith("*")) {
+ host = rawHost.substring(1);
+ log.debug("Convert host " + rawHost + " to " + host);
+ } else if (rawHost.endsWith("*")) {
+ int length = rawHost.length();
+ host = rawHost.substring(length - 1, length);
+ log.debug("Convert host " + rawHost + " to " + host);
+ } else {
+ host = rawHost;
+ }
+
+ synchronized (fallBackMap) {
+ fallBackMap.put(host, spfRecord);
+ }
+ } catch (PermErrorException e) {
+ throw new IllegalArgumentException("Invalid SPF-Record: "
+ + rawSpfRecord);
+ } catch (NoneException e) {
+ throw new IllegalArgumentException("Invalid SPF-Record: "
+ + rawSpfRecord);
+ } catch (NeutralException e) {
+ throw new IllegalArgumentException("Invalid SPF-Record: "
+ + rawSpfRecord);
+ }
+
+ }
+
+ /**
+ * Clear all fallBack entries
+ *
+ */
+ public void clearFallBackEntrys() {
+ log.debug("Clear all fallback entries");
+ synchronized (fallBackMap) {
+ fallBackMap.clear();
+ }
+ }
+
+ /**
+ * Remove fallBack entry
+ *
+ * @param host
+ * The host
+ */
+ public void removeFallBackEntrys(String host) {
+ log.debug("Remove fallback entry for host: " + host);
+ synchronized (fallBackMap) {
+ fallBackMap.remove(getRawFallBackEntry(host));
+ }
+ }
+
+ /**
+ * Return the SPF1Record for the given host
+ *
+ * @param host
+ * the hostname or ipaddress
+ * @return the SPF1Record of null if no SPF1Record was found in fallback for
+ * the given host
+ */
+ public SPF1Record getFallBackEntry(String host) {
+ Object fallBack = null;
+
+ synchronized (fallBackMap) {
+ fallBack = getRawFallBackEntry(host);
+ }
+
+ if (fallBack != null) {
+ return (SPF1Record) fallBack;
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Return the Object stored in the map which match the given host. Keep in
+ * mind that this method should only called in a synchronized method or
+ * block
+ *
+ * @param host
+ * the host
+ * @return the stored object for the given host or null
+ */
+ private Object getRawFallBackEntry(String host) {
+ Iterator fallBackIt = fallBackMap.keySet().iterator();
+
+ while (fallBackIt.hasNext()) {
+ String rawHost = fallBackIt.next().toString();
+
+ if ((rawHost.startsWith(".") && host.startsWith(rawHost))
+ || rawHost.endsWith(".") && host.endsWith(rawHost)) {
+ return fallBackMap.get(rawHost);
+ }
+ }
+ return null;
+ }
+}
Propchange: james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r450533 - /james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java
Posted by Guillermo Grandes <gu...@gmail.com>.
mmmm, I like it :-)''
only cut&paste a mini-Override and... you have JSPF-32 resolved :-)
:-D
----- Original Message -----
From: <no...@apache.org>
To: <se...@james.apache.org>
Sent: Wednesday, September 27, 2006 8:15 PM
Subject: svn commit: r450533 -
/james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java
> Author: norman
> Date: Wed Sep 27 11:15:01 2006
> New Revision: 450533
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=450533
> Log:
> Add correct svn style.
>
> Modified:
> james/jspf/trunk/src/main/java/org/apache/james/jspf/core/FallBack.java
> (contents, props changed)
>
[...cut...]
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org