james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1049812 - in /james/server/trunk: ./ container-spring/src/main/config/james/ core-library/src/main/java/org/apache/james/filepair/ mail-file/ mail-file/src/main/java/org/apache/james/mailrepository/file/ mail-file/src/test/java/org/apache/...
Date Thu, 16 Dec 2010 08:20:26 GMT
Author: norman
Date: Thu Dec 16 08:20:25 2010
New Revision: 1049812

URL: http://svn.apache.org/viewvc?rev=1049812&view=rev
Log:
add a new maven module called repository-file and move the implementations from core-library
to it.

Added:
    james/server/trunk/repository-file/
    james/server/trunk/repository-file/LICENSE.txt
    james/server/trunk/repository-file/NOTICE.txt
    james/server/trunk/repository-file/pom.xml
    james/server/trunk/repository-file/src/
    james/server/trunk/repository-file/src/main/
    james/server/trunk/repository-file/src/main/java/
    james/server/trunk/repository-file/src/main/java/org/
    james/server/trunk/repository-file/src/main/java/org/apache/
    james/server/trunk/repository-file/src/main/java/org/apache/james/
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
      - copied, changed from r1049799, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
      - copied, changed from r1049797, james/server/trunk/util/src/main/java/org/apache/james/util/io/ClassLoaderObjectInputStream.java
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/DirectoryFileFilter.java
      - copied, changed from r1049797, james/server/trunk/util/src/main/java/org/apache/james/util/io/DirectoryFileFilter.java
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
      - copied, changed from r1049797, james/server/trunk/util/src/main/java/org/apache/james/util/io/ExtensionFileFilter.java
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
      - copied, changed from r1049799, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
      - copied, changed from r1049799, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java
    james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
      - copied, changed from r1049797, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java
Removed:
    james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
    james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java
    james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java
    james/server/trunk/core-library/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java
    james/server/trunk/util/src/main/java/org/apache/james/util/io/ClassLoaderObjectInputStream.java
    james/server/trunk/util/src/main/java/org/apache/james/util/io/DirectoryFileFilter.java
    james/server/trunk/util/src/main/java/org/apache/james/util/io/ExtensionFileFilter.java
Modified:
    james/server/trunk/container-spring/src/main/config/james/mailstore.xml
    james/server/trunk/mail-file/pom.xml
    james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
    james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
    james/server/trunk/mail-jdbc/pom.xml
    james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
    james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
    james/server/trunk/pom.xml
    james/server/trunk/repository-api/   (props changed)
    james/server/trunk/user-file/pom.xml
    james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java

Modified: james/server/trunk/container-spring/src/main/config/james/mailstore.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/mailstore.xml?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/mailstore.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/mailstore.xml Thu Dec 16 08:20:25
2010
@@ -63,7 +63,7 @@
           </types>
           <config FIFO="false"/> 
       </repository>
-      <repository class="org.apache.james.filepair.FilePersistentObjectRepository">
+      <repository class="org.apache.james.repository.file.FilePersistentObjectRepository">
           <protocols>
               <protocol>file</protocol>
           </protocols>
@@ -76,7 +76,7 @@
               <model>CACHE</model>
           </models>
       </repository>
-      <repository class="org.apache.james.filepair.FilePersistentStreamRepository">
+      <repository class="org.apache.james.repository.file.FilePersistentStreamRepository">
           <protocols>
               <protocol>file</protocol>
           </protocols>

Modified: james/server/trunk/mail-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/pom.xml?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/mail-file/pom.xml (original)
+++ james/server/trunk/mail-file/pom.xml Thu Dec 16 08:20:25 2010
@@ -38,6 +38,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-repository-file</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
(original)
+++ james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
Thu Dec 16 08:20:25 2010
@@ -94,8 +94,8 @@ public class MimeMessageStreamRepository
      */
     public long getMessageSize() throws IOException {
         if (size == -1) {
-            if (sr instanceof org.apache.james.filepair.FilePersistentStreamRepository) {
-                size = ((org.apache.james.filepair.FilePersistentStreamRepository) sr).getSize(key);
+            if (sr instanceof org.apache.james.repository.file.FilePersistentStreamRepository)
{
+                size = ((org.apache.james.repository.file.FilePersistentStreamRepository)
sr).getSize(key);
             } else size = super.getMessageSize();
         }
         return size;

Modified: james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
(original)
+++ james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
Thu Dec 16 08:20:25 2010
@@ -22,11 +22,11 @@ package org.apache.james.mailrepository;
 
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.filepair.FilePersistentObjectRepository;
-import org.apache.james.filepair.FilePersistentStreamRepository;
 import org.apache.james.mailrepository.api.MailRepository;
 import org.apache.james.mailrepository.file.FileMailRepository;
 import org.apache.james.mailstore.MockMailStore;
+import org.apache.james.repository.file.FilePersistentObjectRepository;
+import org.apache.james.repository.file.FilePersistentStreamRepository;
 import org.apache.james.services.MockFileSystem;
 
 public class FileMailRepositoryTest extends AbstractMailRepositoryTest {

Modified: james/server/trunk/mail-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/pom.xml?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/pom.xml (original)
+++ james/server/trunk/mail-jdbc/pom.xml Thu Dec 16 08:20:25 2010
@@ -30,11 +30,15 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mail-api</artifactId>
+      <artifactId>james-server-repository-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-repository-api</artifactId>
+      <artifactId>james-server-repository-file</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-mail-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
(original)
+++ james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
Thu Dec 16 08:20:25 2010
@@ -214,8 +214,8 @@ public class MimeMessageJDBCSource exten
             InputStream in = null;
             try {
                 if (sr != null) {
-                    if (sr instanceof org.apache.james.filepair.FilePersistentStreamRepository)
{
-                        size += ((org.apache.james.filepair.FilePersistentStreamRepository)
sr).getSize(key);
+                    if (sr instanceof org.apache.james.repository.file.FilePersistentStreamRepository)
{
+                        size += ((org.apache.james.repository.file.FilePersistentStreamRepository)
sr).getSize(key);
                     } else {
                         in = sr.get(key);
                         int len = 0;

Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
(original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
Thu Dec 16 08:20:25 2010
@@ -24,11 +24,11 @@ import javax.sql.DataSource;
 
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.filepair.FilePersistentStreamRepository;
 import org.apache.james.mailrepository.AbstractMailRepositoryTest;
 import org.apache.james.mailrepository.api.MailRepository;
 import org.apache.james.mailrepository.jdbc.JDBCMailRepository;
 import org.apache.james.mailstore.MockMailStore;
+import org.apache.james.repository.file.FilePersistentStreamRepository;
 import org.apache.james.services.MockFileSystem;
 import org.apache.james.util.TestUtil;
 

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Dec 16 08:20:25 2010
@@ -61,6 +61,7 @@
     <module>pop3server</module>
     <module>remotemanager</module>
     <module>repository-api</module>
+    <module>repository-file</module>
     <module>smtpserver</module>
     <module>queue-api</module>
     <module>queue-jms</module>
@@ -280,6 +281,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-repository-file</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-queue-api</artifactId>
       <version>${project.version}</version>
     </dependency>

Propchange: james/server/trunk/repository-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 16 08:20:25 2010
@@ -0,0 +1 @@
+target

Added: james/server/trunk/repository-file/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/LICENSE.txt?rev=1049812&view=auto
==============================================================================
--- james/server/trunk/repository-file/LICENSE.txt (added)
+++ james/server/trunk/repository-file/LICENSE.txt Thu Dec 16 08:20:25 2010
@@ -0,0 +1,232 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+   
+   
+   
+
+   THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+   FOLLOWING LICENSES:
+   
+   
+   
+   Concurrent, Public Domain 
+     (see stage/concurrent/jars/concurrent.LICENSE)
+   
+   BouncyCastle, MIT License 
+     (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
+     http://www.bouncycastle.org/licence.html
+     
+   DnsJava, BSD License 
+     (see stage/dnsjava/jars/dnsjava.LICENSE)
+     http://www.dnsjava.org/README 
+     
+   JavaBeans Activation Framework, CDDL License
+     http://glassfish.dev.java.net/public/CDDLv1.0.html
+     
+   JavaMail, CDDL License
+     http://glassfish.dev.java.net/public/CDDLv1.0.html
+   
+   QDox, ASL 1.1 License
+     (see phoenix-deployment/tools/lib/qdox.LICENSE)
+     http://qdox.codehaus.org/license.html
+     
+   MX4J, ASL 1.1 License
+     (see phoenix-deployment/phoenix-bin/bin/lib/mx4j.LICENSE)
+   
+   Spice, ASL 1.1 License
+     (see phoenix-deployment/phoenix-bin/bin/lib/spice.LICENSE)
+     http://spice.codehaus.org/license.html
+     
+   Wrapper, MIT License
+     (see phoenix-deployment/phoenix-bin/bin/Wrapper.LICENSE)
+     http://wrapper.tanukisoftware.org/doc/english/license.html
+     
+   ISO-Relax, MIT License
+     (see phoenix-deployment/phoenix-bin/tools/lib/isorelax.LICENSE)
+
+   MSV, BSD License
+     (see phoenix-deployment/phoenix-bin/tools/lib/msv.LICENSE)
+
+   RelaxNG-Datatype, BSD License
+     (see phoenix-deployment/phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
+   
+   XSDLib, BSD License
+     (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
+     
+   XStream, BSD License
+     (see stage/com.thoughtworks.xstream/jars/xstream.LICENSE)
+     
\ No newline at end of file

Added: james/server/trunk/repository-file/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/NOTICE.txt?rev=1049812&view=auto
==============================================================================
--- james/server/trunk/repository-file/NOTICE.txt (added)
+++ james/server/trunk/repository-file/NOTICE.txt Thu Dec 16 08:20:25 2010
@@ -0,0 +1,11 @@
+
+=========================================================================
+==      NOTICE file for use with the Apache License, Version 2.0,      ==
+=========================================================================
+
+Apache JAMES 
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+            
\ No newline at end of file

Added: james/server/trunk/repository-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/pom.xml?rev=1049812&view=auto
==============================================================================
--- james/server/trunk/repository-file/pom.xml (added)
+++ james/server/trunk/repository-file/pom.xml Thu Dec 16 08:20:25 2010
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  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.    
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>james-server</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>3.0-M3-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server-repository-file</artifactId>
+  <name>Apache James Server Repository File implementation</name>
+  <properties>
+    <!-- OSGI stuff -->
+    <james.osgi.export>
+      org.apache.james.*
+    </james.osgi.export>
+    <james.osgi.import>
+      *
+    </james.osgi.import>
+  </properties> 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+         <configuration>       
+           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>       
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-repository-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
(from r1049799, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java&r1=1049799&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/filepair/AbstractFileRepository.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
Thu Dec 16 08:20:25 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.filepair;
+package org.apache.james.repository.file;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -28,7 +28,6 @@ import org.apache.james.lifecycle.Config
 import org.apache.james.lifecycle.LogEnabled;
 import org.apache.james.repository.api.Repository;
 import org.apache.james.services.FileSystem;
-import org.apache.james.util.io.ExtensionFileFilter;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -196,7 +195,7 @@ public abstract class AbstractFileReposi
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.services.store.Repository#getChildRepository(java.lang.String)
+     * @see org.apache.james.repository.api.Repository#getChildRepository(java.lang.String)
      */
     public Repository getChildRepository( final String childName )
     {

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
(from r1049797, james/server/trunk/util/src/main/java/org/apache/james/util/io/ClassLoaderObjectInputStream.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java&p1=james/server/trunk/util/src/main/java/org/apache/james/util/io/ClassLoaderObjectInputStream.java&r1=1049797&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/util/src/main/java/org/apache/james/util/io/ClassLoaderObjectInputStream.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
Thu Dec 16 08:20:25 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.util.io;
+package org.apache.james.repository.file;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/DirectoryFileFilter.java
(from r1049797, james/server/trunk/util/src/main/java/org/apache/james/util/io/DirectoryFileFilter.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/DirectoryFileFilter.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/DirectoryFileFilter.java&p1=james/server/trunk/util/src/main/java/org/apache/james/util/io/DirectoryFileFilter.java&r1=1049797&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/util/src/main/java/org/apache/james/util/io/DirectoryFileFilter.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/DirectoryFileFilter.java
Thu Dec 16 08:20:25 2010
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.util.io;
+package org.apache.james.repository.file;
 
 import java.io.File;
 import java.io.FilenameFilter;

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
(from r1049797, james/server/trunk/util/src/main/java/org/apache/james/util/io/ExtensionFileFilter.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java&p1=james/server/trunk/util/src/main/java/org/apache/james/util/io/ExtensionFileFilter.java&r1=1049797&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/util/src/main/java/org/apache/james/util/io/ExtensionFileFilter.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
Thu Dec 16 08:20:25 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.util.io;
+package org.apache.james.repository.file;
 
 import java.io.File;
 import java.io.FilenameFilter;

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
(from r1049799, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java&r1=1049799&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentObjectRepository.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
Thu Dec 16 08:20:25 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.filepair;
+package org.apache.james.repository.file;
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -27,7 +27,6 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
 import org.apache.james.repository.api.ObjectRepository;
-import org.apache.james.util.io.ClassLoaderObjectInputStream;
 
 /**
  * This is a simple implementation of persistent object store using
@@ -38,16 +37,19 @@ public class FilePersistentObjectReposit
     extends AbstractFileRepository
     implements ObjectRepository
 {
-    /**
-     * @see org.apache.james.filepair.AbstractFileRepository#getExtensionDecorator()
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.file.AbstractFileRepository#getExtensionDecorator()
      */
     protected String getExtensionDecorator()
     {
         return ".FileObjectStore";
     }
 
-    /**
-     * @see org.apache.james.repository.api.avalon.cornerstone.services.store.ObjectRepository#get(String)
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.api.ObjectRepository#get(java.lang.String)
      */
     public synchronized Object get( final String key )
     {
@@ -83,8 +85,10 @@ public class FilePersistentObjectReposit
         }
     }
 
-    /**
-     * @see org.apache.james.repository.api.avalon.cornerstone.services.store.ObjectRepository#get(String,
ClassLoader)
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.api.ObjectRepository#get(java.lang.String, java.lang.ClassLoader)
      */
     public synchronized Object get( final String key, final ClassLoader classLoader )
     {
@@ -122,10 +126,10 @@ public class FilePersistentObjectReposit
 
     }
 
-    /**
-     * Store the given object and associates it to the given key
-     * 
-     * @see org.apache.james.repository.api.avalon.cornerstone.services.store.ObjectRepository#put(String,
Object)
+    
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.api.ObjectRepository#put(java.lang.String, java.lang.Object)
      */
     public synchronized void put( final String key, final Object value )
     {

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
(from r1049799, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java&r1=1049799&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/filepair/FilePersistentStreamRepository.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
Thu Dec 16 08:20:25 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.filepair;
+package org.apache.james.repository.file;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -38,19 +38,20 @@ public class FilePersistentStreamReposit
     extends AbstractFileRepository
     implements StreamRepository
 {
- 
-    /**
-     * @see org.apache.james.filepair.AbstractFileRepository#getExtensionDecorator()
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.file.AbstractFileRepository#getExtensionDecorator()
      */
     protected String getExtensionDecorator()
     {
         return ".FileStreamStore";
     }
 
-    /**
-     * Get the object associated to the given unique key.
-     * 
-     * @see org.apache.james.repository.api.avalon.cornerstone.services.store.StreamRepository#get(String)
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.api.StreamRepository#get(java.lang.String)
      */
     public synchronized InputStream get( final String key )
     {
@@ -66,10 +67,10 @@ public class FilePersistentStreamReposit
         }
     }
 
-    /**
-     * Store the given object and associates it to the given key
-     * 
-     * @see org.apache.james.repository.api.avalon.cornerstone.services.store.StreamRepository#put(String)
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.repository.api.StreamRepository#put(java.lang.String)
      */
     public synchronized OutputStream put( final String key )
     {

Copied: james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
(from r1049797, james/server/trunk/core-library/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java?p2=james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java&r1=1049797&r2=1049812&rev=1049812&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/filepair/NumberedRepositoryFileFilter.java
(original)
+++ james/server/trunk/repository-file/src/main/java/org/apache/james/repository/file/NumberedRepositoryFileFilter.java
Thu Dec 16 08:20:25 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.filepair;
+package org.apache.james.repository.file;
 
 import java.io.File;
 import java.io.FilenameFilter;

Modified: james/server/trunk/user-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/pom.xml?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/user-file/pom.xml (original)
+++ james/server/trunk/user-file/pom.xml Thu Dec 16 08:20:25 2010
@@ -39,6 +39,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-repository-file</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-mail-api</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1049812&r1=1049811&r2=1049812&view=diff
==============================================================================
--- james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
(original)
+++ james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
Thu Dec 16 08:20:25 2010
@@ -29,9 +29,9 @@ import java.util.Iterator;
 
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.filepair.FilePersistentObjectRepository;
 import org.apache.james.lifecycle.LifecycleUtil;
 import org.apache.james.mailstore.MockMailStore;
+import org.apache.james.repository.file.FilePersistentObjectRepository;
 import org.apache.james.services.FileSystem;
 import org.apache.james.user.api.JamesUser;
 import org.apache.james.user.api.UsersRepository;



---------------------------------------------------------------------
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