james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r167887 - in /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair: AbstractFileRepository.java File_Persistent_Object_Repository.java File_Persistent_Stream_Repository.java RepositoryManager.java ResettableFileInputStream.java
Date Tue, 03 May 2005 09:13:35 GMT
Author: noel
Date: Tue May  3 02:13:33 2005
New Revision: 167887

URL: http://svn.apache.org/viewcvs?rev=167887&view=rev
Log:
remove merger artifacts.  old license header and one re-introduced bug fixed in revision 109017.

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Stream_Repository.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/ResettableFileInputStream.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java?rev=167887&r1=167886&r2=167887&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
Tue May  3 02:13:33 2005
@@ -15,13 +15,6 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
 package org.apache.james.mailrepository.filepair;
 
 import java.io.File;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java?rev=167887&r1=167886&r2=167887&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Object_Repository.java
Tue May  3 02:13:33 2005
@@ -15,13 +15,6 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
 package org.apache.james.mailrepository.filepair;
 
 import java.io.InputStream;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Stream_Repository.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Stream_Repository.java?rev=167887&r1=167886&r2=167887&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Stream_Repository.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/File_Persistent_Stream_Repository.java
Tue May  3 02:13:33 2005
@@ -15,13 +15,6 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
 package org.apache.james.mailrepository.filepair;
 
 import java.io.BufferedOutputStream;
@@ -75,7 +68,7 @@
                 final ArrayList list = new ArrayList();
                 list.add( o );
                 list.add( stream );
-                m_inputs.put( key, stream );
+                m_inputs.put( key, list );
             }
 
             return stream;
@@ -112,7 +105,7 @@
                 final ArrayList list = new ArrayList();
                 list.add( o );
                 list.add( stream );
-                m_outputs.put( key, stream );
+                m_outputs.put( key, list );
             }
 
             return stream;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java?rev=167887&r1=167886&r2=167887&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/RepositoryManager.java
Tue May  3 02:13:33 2005
@@ -15,13 +15,6 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
 package org.apache.james.mailrepository.filepair;
 
 import java.net.MalformedURLException;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/ResettableFileInputStream.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/ResettableFileInputStream.java?rev=167887&r1=167886&r2=167887&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/ResettableFileInputStream.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/mailrepository/filepair/ResettableFileInputStream.java
Tue May  3 02:13:33 2005
@@ -15,13 +15,6 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
 package org.apache.james.mailrepository.filepair;
 
 import java.io.BufferedInputStream;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message