Author: norman
Date: Wed May 31 07:15:55 2006
New Revision: 410533
URL: http://svn.apache.org/viewvc?rev=410533&view=rev
Log:
Merge rename of AddHeader mailet and AddHeaderHandler. See JAMES-513
Added:
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/AddHeaderHandler.java
james/server/branches/v2.3/src/java/org/apache/james/transport/mailets/AddHeader.java
Modified:
james/server/branches/v2.3/src/conf/james-config.xml
Modified: james/server/branches/v2.3/src/conf/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/conf/james-config.xml?rev=410533&r1=410532&r2=410533&view=diff
==============================================================================
--- james/server/branches/v2.3/src/conf/james-config.xml (original)
+++ james/server/branches/v2.3/src/conf/james-config.xml Wed May 31 07:15:55
2006
@@ -248,7 +248,7 @@
<ignoreLocalSender>true</ignoreLocalSender>
</mailet>
- <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >
0.90" class="AddHeader" onMatchException="noMatch">
+ <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >
0.90" class="SetMimeHeader" onMatchException="noMatch">
<name>X-MessageIsSpam</name>
<value>true</value>
</mailet>
@@ -280,7 +280,7 @@
<onlyTrusted>false</onlyTrusted>
</mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature"
class="AddHeader">
+ <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature"
class="SetMimeHeader">
<name>X-WasSigned</name>
<value>true</value>
</mailet>
@@ -782,7 +782,7 @@
<!-- The message handler configuration -->
<!--
- <handler class="org.apache.james.smtpserver.AddHeaderHandler">
+ <handler class="org.apache.james.smtpserver.SetMimeHeaderHandler">
<headername>SPF-test</headername>
<headervalue>passed</headervalue>
</handler>
Added:
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/AddHeaderHandler.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/java/org/apache/james/smtpserver/AddHeaderHandler.java?rev=410533&view=auto
==============================================================================
---
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/AddHeaderHandler.java
(added)
+++
james/server/branches/v2.3/src/java/org/apache/james/smtpserver/AddHeaderHandler.java
Wed May 31 07:15:55 2006
@@ -0,0 +1,28 @@
+/***********************************************************************
+ * Copyright (c) 2006 The Apache Software Foundation. *
+ * All rights reserved. *
+ * ------------------------------------------------------------------- *
+ * Licensed 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.smtpserver;
+
+/**
+ *
+ * @see org.apache.james.smtpserver.SetMimeHeaderHandler
+ * @deprecated This class was replaced by SetMimeHeaderHandler and is only
here for
+ * backwards compatibly. It will be removed in next stable release
+ */
+public class AddHeaderHandler extends SetMimeHeaderHandler{
+
+}
Added:
james/server/branches/v2.3/src/java/org/apache/james/transport/mailets/AddHeader.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/java/org/apache/james/transport/mailets/AddHeader.java?rev=410533&view=auto
==============================================================================
---
james/server/branches/v2.3/src/java/org/apache/james/transport/mailets/AddHeader.java
(added)
+++
james/server/branches/v2.3/src/java/org/apache/james/transport/mailets/AddHeader.java
Wed May 31 07:15:55 2006
@@ -0,0 +1,37 @@
+/***********************************************************************
+ * Copyright (c) 2006 The Apache Software Foundation. *
+ * All rights reserved. *
+ * ------------------------------------------------------------------- *
+ * Licensed 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.transport.mailets;
+
+/**
+ *
+ * @see org.apache.james.transport.mailets.SetMimeHeader
+ * @deprecated This class was replaced by SetMimeHeader and is only here for
+ * backwards compatibly. It will be removed in next stable release
+ */
+public class AddHeader extends SetMimeHeader {
+
+ /**
+ * Return a string describing this mailet.
+ *
+ * @return a string describing this mailet
+ */
+ public String getMailetInfo() {
+ return "AddHeader Mailet" ;
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
