svn commit: r684424 [1/2] - in /james/server/trunk: ./ avalon-socket-library/ avalon-socket-library/src/ avalon-socket-library/src/main/ avalon-socket-library/src/main/java/ avalon-socket-library/src/main/java/org/ avalon-socket-library/src/main/java/o...

[ba...@apache.org]

Author: bago
Date: Sun Aug 10 02:04:40 2008
New Revision: 684424

URL: http://svn.apache.org/viewvc?rev=684424&view=rev
Log:
Introduced new modules:
common-util: contains only InternetPrintWriter ATM
mailnotification-utl: some javamail only dsn/mdn code
avalon-socket-library: the basic framework used by our socketbased functions.
moved some class from user-library to user-api.

Added:
    james/server/trunk/avalon-socket-library/   (with props)
    james/server/trunk/avalon-socket-library/LICENSE.txt   (with props)
    james/server/trunk/avalon-socket-library/NOTICE.txt   (with props)
    james/server/trunk/avalon-socket-library/build.xml
    james/server/trunk/avalon-socket-library/pom.xml   (with props)
    james/server/trunk/avalon-socket-library/src/
    james/server/trunk/avalon-socket-library/src/main/
    james/server/trunk/avalon-socket-library/src/main/java/
    james/server/trunk/avalon-socket-library/src/main/java/org/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesService.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/CopyInputStream.java
      - copied unchanged from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/SplitOutputStream.java
      - copied unchanged from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/services/JamesConnectionManager.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/connection/
      - copied from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/connection/
    james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/watchdog/
      - copied from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/watchdog/
    james/server/trunk/avalon-socket-library/src/test/
    james/server/trunk/common-util/   (with props)
    james/server/trunk/common-util/LICENSE.txt   (with props)
    james/server/trunk/common-util/NOTICE.txt   (with props)
    james/server/trunk/common-util/build.xml   (with props)
    james/server/trunk/common-util/pom.xml   (with props)
    james/server/trunk/common-util/src/
    james/server/trunk/common-util/src/main/
    james/server/trunk/common-util/src/main/java/
    james/server/trunk/common-util/src/main/java/org/
    james/server/trunk/common-util/src/main/java/org/apache/
    james/server/trunk/common-util/src/main/java/org/apache/james/
    james/server/trunk/common-util/src/main/java/org/apache/james/util/
    james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/InternetPrintWriter.java
    james/server/trunk/common-util/src/test/
    james/server/trunk/mailnotification-util/   (with props)
    james/server/trunk/mailnotification-util/LICENSE.txt   (with props)
    james/server/trunk/mailnotification-util/NOTICE.txt   (with props)
    james/server/trunk/mailnotification-util/build.xml   (with props)
    james/server/trunk/mailnotification-util/pom.xml   (with props)
    james/server/trunk/mailnotification-util/src/
    james/server/trunk/mailnotification-util/src/main/
    james/server/trunk/mailnotification-util/src/main/java/
    james/server/trunk/mailnotification-util/src/main/java/org/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/dsn/
      - copied from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/dsn/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/handlers/
      - copied from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/handlers/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/mdn/
      - copied from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/mdn/
    james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/package.html   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/package.html
    james/server/trunk/mailnotification-util/src/test/
    james/server/trunk/user-api/src/main/java/org/apache/james/management/
    james/server/trunk/user-api/src/main/java/org/apache/james/management/UserManagementException.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagementException.java
    james/server/trunk/user-api/src/main/java/org/apache/james/management/UserManagementMBean.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagementMBean.java
    james/server/trunk/user-api/src/main/java/org/apache/james/management/VirtualUserTableManagementException.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagementException.java
    james/server/trunk/user-api/src/main/java/org/apache/james/management/VirtualUserTableManagementMBean.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagementMBean.java
    james/server/trunk/user-api/src/main/java/org/apache/james/services/VirtualUserTableManagementService.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagementService.java
    james/server/trunk/user-api/src/main/java/org/apache/james/vut/InvalidMappingException.java   (contents, props changed)
      - copied, changed from r681655, james/server/trunk/user-library/src/main/java/org/apache/james/vut/InvalidMappingException.java
Removed:
    james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
    james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesService.java
    james/server/trunk/core-library/src/main/java/org/apache/james/core/CopyInputStream.java
    james/server/trunk/core-library/src/main/java/org/apache/james/core/SplitOutputStream.java
    james/server/trunk/core-library/src/main/java/org/apache/james/services/JamesConnectionManager.java
    james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java
    james/server/trunk/core-library/src/main/java/org/apache/james/util/InternetPrintWriter.java
    james/server/trunk/core-library/src/main/java/org/apache/james/util/connection/
    james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java
    james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/dsn/
    james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/handlers/
    james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/mdn/
    james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/package.html
    james/server/trunk/core-library/src/main/java/org/apache/james/util/watchdog/
    james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagementException.java
    james/server/trunk/user-library/src/main/java/org/apache/james/management/UserManagementMBean.java
    james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagementException.java
    james/server/trunk/user-library/src/main/java/org/apache/james/management/VirtualUserTableManagementMBean.java
    james/server/trunk/user-library/src/main/java/org/apache/james/services/VirtualUserTableManagementService.java
    james/server/trunk/user-library/src/main/java/org/apache/james/vut/InvalidMappingException.java
Modified:
    james/server/trunk/basic-user-function/pom.xml
    james/server/trunk/core-library/pom.xml
    james/server/trunk/experimental-seda-imap-function/pom.xml
    james/server/trunk/imapserver-function/pom.xml
    james/server/trunk/mailets-function/pom.xml
    james/server/trunk/nntpserver-function/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/pop3server-function/pom.xml
    james/server/trunk/remotemanager-function/pom.xml
    james/server/trunk/smtpserver-function/pom.xml
    james/server/trunk/spoolmanager-function/pom.xml
    james/server/trunk/torque-mailboxmanager-function/pom.xml

Propchange: james/server/trunk/avalon-socket-library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 10 02:04:40 2008
@@ -0,0 +1 @@
+target

Added: james/server/trunk/avalon-socket-library/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/LICENSE.txt?rev=684424&view=auto
==============================================================================
--- james/server/trunk/avalon-socket-library/LICENSE.txt (added)
+++ james/server/trunk/avalon-socket-library/LICENSE.txt Sun Aug 10 02:04:40 2008
@@ -0,0 +1,218 @@
+                                 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 lib/concurrent.LICENSE)
+   
+   BouncyCastle, MIT License (see lib/BouncyCastle.LICENSE)
+     http://www.bouncycastle.org/licence.html
+     
+   DnsJava, BSD License (see lib/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 tools/lib/qdox.LICENSE)
+     http://qdox.codehaus.org/license.html
+     
+   MX4J, ASL 1.1 License (see phoenix-bin/bin/lib/mx4j.LICENSE)
+   
+   Spice, ASL 1.1 License (see phoenix-bin/bin/lib/spice.LICENSE)
+     http://spice.codehaus.org/license.html
+     
+   Wrapper, MIT License (see phoenix-bin/bin/Wrapper.LICENSE)
+     http://wrapper.tanukisoftware.org/doc/english/license.html
+     
+   ISO-Relax, MIT License (see phoenix-bin/tools/lib/isorelax.LICENSE)
+
+   MSV, BSD License (see phoenix-bin/tools/lib/msv.LICENSE)
+
+   RelaxNG-Datatype, BSD License (see phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
+   
+   XSDLib, BSD License (see phoenix-bin/tools/lib/xsdlib.LICENSE)
+   
\ No newline at end of file

Propchange: james/server/trunk/avalon-socket-library/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/avalon-socket-library/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/NOTICE.txt?rev=684424&view=auto
==============================================================================
--- james/server/trunk/avalon-socket-library/NOTICE.txt (added)
+++ james/server/trunk/avalon-socket-library/NOTICE.txt Sun Aug 10 02:04:40 2008
@@ -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

Propchange: james/server/trunk/avalon-socket-library/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/avalon-socket-library/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/build.xml?rev=684424&view=auto
==============================================================================
--- james/server/trunk/avalon-socket-library/build.xml (added)
+++ james/server/trunk/avalon-socket-library/build.xml Sun Aug 10 02:04:40 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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 default="main" name="avalon-socket-library">
+  <description>Builds avalon-socket-library module. This is an library module.</description>
+  <property name="name.module" value="avalon-socket-library" />
+  <import file="../build-tools/library-build.xml" optional="no" />
+</project>
\ No newline at end of file

Added: james/server/trunk/avalon-socket-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/pom.xml?rev=684424&view=auto
==============================================================================
--- james/server/trunk/avalon-socket-library/pom.xml (added)
+++ james/server/trunk/avalon-socket-library/pom.xml Sun Aug 10 02:04:40 2008
@@ -0,0 +1,221 @@
+<?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>
+  <parent>
+    <artifactId>james-server</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server-avalon-socket-library</artifactId>
+  <name>Apache JAMES Server Avalon Socket Library</name>
+  <dependencies>
+  
+    <!-- 
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>mailet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-mailet-base</artifactId>
+    </dependency>
+     -->
+    
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-common-util</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+    </dependency>
+
+    <!-- 
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <scope>provided</scope>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-api</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-datasource</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-api</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.store</groupId>
+      <artifactId>cornerstone-store-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-api</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mstor</groupId>
+      <artifactId>mstor</artifactId>
+    </dependency>
+    <dependency>
+    	<groupId>xml-apis</groupId>
+    	<artifactId>xml-apis</artifactId>
+    	<scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-jmx</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-mailet-base</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-user-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+      <version>2.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <version>2.2.2</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/server/trunk/avalon-socket-library/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/core/AbstractJamesService.java&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4.4.6

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/core/AbstractJamesService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/services/JamesConnectionManager.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/services/JamesConnectionManager.java&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/services/JamesConnectionManager.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java?p2=james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1.2.2

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/util/CRLFTerminatedReader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/server/trunk/basic-user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/pom.xml (original)
+++ james/server/trunk/basic-user-function/pom.xml Sun Aug 10 02:04:40 2008
@@ -34,6 +34,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-library</artifactId>
     </dependency>
 
@@ -61,13 +65,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

Propchange: james/server/trunk/common-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 10 02:04:40 2008
@@ -0,0 +1 @@
+target

Added: james/server/trunk/common-util/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/LICENSE.txt?rev=684424&view=auto
==============================================================================
--- james/server/trunk/common-util/LICENSE.txt (added)
+++ james/server/trunk/common-util/LICENSE.txt Sun Aug 10 02:04:40 2008
@@ -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

Propchange: james/server/trunk/common-util/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/common-util/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/common-util/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/NOTICE.txt?rev=684424&view=auto
==============================================================================
--- james/server/trunk/common-util/NOTICE.txt (added)
+++ james/server/trunk/common-util/NOTICE.txt Sun Aug 10 02:04:40 2008
@@ -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

Propchange: james/server/trunk/common-util/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/common-util/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/common-util/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/build.xml?rev=684424&view=auto
==============================================================================
--- james/server/trunk/common-util/build.xml (added)
+++ james/server/trunk/common-util/build.xml Sun Aug 10 02:04:40 2008
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="main" name="common-util">
+  <description>Builds common-util module. This is an util module.</description>
+  <property name="name.module" value="common-util" />
+  <import file="../build-tools/util-build.xml" optional="no" />
+</project>

Propchange: james/server/trunk/common-util/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/common-util/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/common-util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=684424&view=auto
==============================================================================
--- james/server/trunk/common-util/pom.xml (added)
+++ james/server/trunk/common-util/pom.xml Sun Aug 10 02:04:40 2008
@@ -0,0 +1,33 @@
+<?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>
+  <parent>
+    <artifactId>james-server</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-common-util</artifactId>
+  <name>Apache JAMES Server Common Utilities</name>
+  <dependencies>
+  	<!-- no dependencies -->
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/server/trunk/common-util/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/common-util/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/InternetPrintWriter.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/InternetPrintWriter.java&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3.4.3

Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/common-util/src/main/java/org/apache/james/util/InternetPrintWriter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sun Aug 10 02:04:40 2008
@@ -33,6 +33,8 @@
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
     </dependency>
+    <!-- Probably used for RFC2822Headers                             -->
+    <!-- Not needed at runtime because of compiler inlining constants -->
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailet-base</artifactId>
@@ -40,6 +42,10 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-domain-api</artifactId>
     </dependency>
 
@@ -57,10 +63,12 @@
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
+    <!-- 
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+     -->
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
@@ -77,6 +85,7 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
+    <!-- 
     <dependency>
       <groupId>org.apache.avalon.cornerstone.connection</groupId>
       <artifactId>cornerstone-connection-api</artifactId>
@@ -85,6 +94,7 @@
       <groupId>org.apache.avalon.cornerstone.connection</groupId>
       <artifactId>cornerstone-connection-impl</artifactId>
     </dependency>
+     -->
     <dependency>
       <groupId>org.apache.avalon.cornerstone.sockets</groupId>
       <artifactId>cornerstone-sockets-api</artifactId>
@@ -109,6 +119,7 @@
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
     </dependency>
+    <!-- 
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-pool-api</artifactId>
@@ -117,6 +128,7 @@
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-pool-impl</artifactId>
     </dependency>
+     -->
     <dependency>
       <groupId>org.apache.avalon.cornerstone.threads</groupId>
       <artifactId>cornerstone-threads-api</artifactId>

Modified: james/server/trunk/experimental-seda-imap-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/pom.xml (original)
+++ james/server/trunk/experimental-seda-imap-function/pom.xml Sun Aug 10 02:04:40 2008
@@ -13,10 +13,14 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
-    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-codec-library</artifactId>

Modified: james/server/trunk/imapserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Sun Aug 10 02:04:40 2008
@@ -28,6 +28,8 @@
   <artifactId>james-server-imapserver-function</artifactId>
   <name>Apache JAMES Server IMAP function</name>
   <dependencies>
+    <!-- This is used, not needed at runtime because -->
+    <!-- RFC2822Headers constants are inlined        -->
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailet-base</artifactId>
@@ -38,6 +40,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-mailbox-library</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/mailets-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Sun Aug 10 02:04:40 2008
@@ -44,6 +44,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-mailnotification-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-api</artifactId>
     </dependency>
     <dependency>

Propchange: james/server/trunk/mailnotification-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 10 02:04:40 2008
@@ -0,0 +1 @@
+target

Added: james/server/trunk/mailnotification-util/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/mailnotification-util/LICENSE.txt?rev=684424&view=auto
==============================================================================
--- james/server/trunk/mailnotification-util/LICENSE.txt (added)
+++ james/server/trunk/mailnotification-util/LICENSE.txt Sun Aug 10 02:04:40 2008
@@ -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

Propchange: james/server/trunk/mailnotification-util/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/mailnotification-util/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/mailnotification-util/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/mailnotification-util/NOTICE.txt?rev=684424&view=auto
==============================================================================
--- james/server/trunk/mailnotification-util/NOTICE.txt (added)
+++ james/server/trunk/mailnotification-util/NOTICE.txt Sun Aug 10 02:04:40 2008
@@ -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

Propchange: james/server/trunk/mailnotification-util/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/mailnotification-util/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/mailnotification-util/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailnotification-util/build.xml?rev=684424&view=auto
==============================================================================
--- james/server/trunk/mailnotification-util/build.xml (added)
+++ james/server/trunk/mailnotification-util/build.xml Sun Aug 10 02:04:40 2008
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="main" name="mailnotification-util">
+  <description>Builds mailnotification module. This is an util module.</description>
+  <property name="name.module" value="mailnotification-util" />
+  <import file="../build-tools/util-build.xml" optional="no" />
+</project>

Propchange: james/server/trunk/mailnotification-util/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/mailnotification-util/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/server/trunk/mailnotification-util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailnotification-util/pom.xml?rev=684424&view=auto
==============================================================================
--- james/server/trunk/mailnotification-util/pom.xml (added)
+++ james/server/trunk/mailnotification-util/pom.xml Sun Aug 10 02:04:40 2008
@@ -0,0 +1,37 @@
+<?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>
+  <parent>
+    <artifactId>james-server</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-mailnotification-util</artifactId>
+  <name>Apache JAMES Server Mail Notification Utilities</name>
+  <dependencies>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/server/trunk/mailnotification-util/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/server/trunk/mailnotification-util/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java?p2=james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1.2.1

Propchange: james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/MimeMultipartReport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/package.html (from r681655, james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/package.html)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/package.html?p2=james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/package.html&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/mail/package.html&r1=681655&r2=684424&rev=684424&view=diff
==============================================================================
    (empty)

Propchange: james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/package.html
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1.2.1

Propchange: james/server/trunk/mailnotification-util/src/main/java/org/apache/james/util/mail/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: james/server/trunk/nntpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Sun Aug 10 02:04:40 2008
@@ -50,6 +50,10 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+    </dependency>
     
     <dependency>
       <groupId>oro</groupId>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Aug 10 02:04:40 2008
@@ -35,6 +35,8 @@
   <packaging>pom</packaging>
   <modules>
     <module>stage</module>
+    <module>mailnotification-util</module>
+    <module>common-util</module>
     <module>user-api</module>
     <module>domain-api</module>
     <module>imap-api</module>
@@ -42,6 +44,7 @@
     <module>user-library</module>
     <module>core-library</module>
     <module>avalon-spring-bridge-library</module>
+    <module>avalon-socket-library</module>
     <module>mailbox-library</module>
     <module>smtpserver-function</module>
     <module>pop3server-function</module>
@@ -251,6 +254,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-mailnotification-util</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-common-util</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-api</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
@@ -276,6 +289,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-mailbox-library</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>

Modified: james/server/trunk/pop3server-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=684424&r1=684423&r2=684424&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Sun Aug 10 02:04:40 2008
@@ -45,6 +45,10 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
@@ -78,18 +82,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-thread-impl</artifactId>
-      <version>2.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
-      <artifactId>cornerstone-sockets-impl</artifactId>
-      <version>2.2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
       <scope>test</scope>



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