Author: bago Date: Sat Mar 24 10:23:19 2007 New Revision: 522056 URL: http://svn.apache.org/viewvc?view=rev&rev=522056 Log: Moved around 3 Stream handling classes in order to remove fetchmail and imapserver packages from the core-library (avoid splitting packages in multiple modules)
Added: james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java - copied, changed from r521430, james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/CopyInputStream.java james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java - copied, changed from r521430, james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/SplitOutputStream.java james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java (contents, props changed) - copied, changed from r521430, james/server/trunk/core-library/src/main/java/org/apache/james/fetchmail/ReaderInputStream.java Removed: james/server/trunk/core-library/src/main/java/org/apache/james/fetchmail/ReaderInputStream.java james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/CopyInputStream.java james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/SplitOutputStream.java Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java?view=diff&rev=522056&r1=522055&r2=522056 ============================================================================== --- james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java (original) +++ james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java Sat Mar 24 10:23:19 2007 @@ -28,8 +28,6 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.james.imapserver.debug.CopyInputStream; -import org.apache.james.imapserver.debug.SplitOutputStream; import org.apache.james.services.DNSServer; import org.apache.james.util.CRLFTerminatedReader; import org.apache.james.util.InternetPrintWriter; Copied: james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java (from r521430, james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/CopyInputStream.java) URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java?view=diff&rev=522056&p1=james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/CopyInputStream.java&r1=521430&p2=james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java&r2=522056 ============================================================================== --- james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/CopyInputStream.java (original) +++ james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java Sat Mar 24 10:23:19 2007 @@ -1,4 +1,24 @@ -package org.apache.james.imapserver.debug; +/**************************************************************** + * 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.core; import java.io.IOException; import java.io.InputStream; Copied: james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java (from r521430, james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/SplitOutputStream.java) URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java?view=diff&rev=522056&p1=james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/SplitOutputStream.java&r1=521430&p2=james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java&r2=522056 ============================================================================== --- james/server/trunk/core-library/src/main/java/org/apache/james/imapserver/debug/SplitOutputStream.java (original) +++ james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java Sat Mar 24 10:23:19 2007 @@ -1,4 +1,24 @@ -package org.apache.james.imapserver.debug; +/**************************************************************** + * 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.core; import java.io.FilterOutputStream; import java.io.IOException; Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java (from r521430, james/server/trunk/core-library/src/main/java/org/apache/james/fetchmail/ReaderInputStream.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java?view=diff&rev=522056&p1=james/server/trunk/core-library/src/main/java/org/apache/james/fetchmail/ReaderInputStream.java&r1=521430&p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java&r2=522056 ============================================================================== --- james/server/trunk/core-library/src/main/java/org/apache/james/fetchmail/ReaderInputStream.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java Sat Mar 24 10:23:19 2007 @@ -19,7 +19,7 @@ -package org.apache.james.fetchmail; +package org.apache.james.smtpserver; import java.io.IOException; import java.io.InputStream; import java.io.Reader; Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java ------------------------------------------------------------------------------ cvs2svn:cvs-rev = 1.4.2.3 Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/ReaderInputStream.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java?view=diff&rev=522056&r1=522055&r2=522056 ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java Sat Mar 24 10:23:19 2007 @@ -25,7 +25,7 @@ import org.apache.james.Constants; import org.apache.james.core.MailHeaders; import org.apache.james.core.MailImpl; -import org.apache.james.fetchmail.ReaderInputStream; +import org.apache.james.smtpserver.ReaderInputStream; import org.apache.james.smtpserver.CommandHandler; import org.apache.james.smtpserver.MessageSizeException; import org.apache.james.smtpserver.SMTPSession; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]