[maven-release-plugin] copy for tag apache-jsieve-0.5
git-svn-id: https://svn.apache.org/repos/asf/james/jsieve/tags/apache-jsieve-0.5@1292283 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE.activation b/LICENSE.activation
deleted file mode 100644
index 8bd019d..0000000
--- a/LICENSE.activation
+++ /dev/null
@@ -1,116 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
-
-1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
-1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
-1.4. Executable means the Covered Software in any form other than Source Code.
-
-1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
-
-1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
-1.7. License means this document.
-
-1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. Modifications means the Source Code and Executable form of any of the following:
-
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
-B. Any new file that contains any part of the Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made available under the terms of this License.
-
-1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
-
-1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
-1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sections2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-(d) Notwithstanding Section2.1(b) above, no patent license is granted: (1)for code that You delete from the Original Software, or (2)for infringements caused by: (i)the modification of the Original Software, or (ii)the combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)Modifications made by that Contributor (or portions thereof); and (2)the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) The licenses granted in Sections2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Section2.2(b) above, no patent license is granted: (1)for any code that Contributor has deleted from the Contributor Version; (2)for infringements caused by: (i)third party modifications of Contributor Version, or (ii)the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
-3.3. Required Notices.
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-3.6. Larger Works.
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)otherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
-
-6.3. In the event of termination under Sections6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a commercial item, as that term is defined in 48C.F.R.2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48C.F.R.12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
diff --git a/LICENSE.mail b/LICENSE.mail
deleted file mode 100644
index 8bd019d..0000000
--- a/LICENSE.mail
+++ /dev/null
@@ -1,116 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
-
-1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
-1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
-1.4. Executable means the Covered Software in any form other than Source Code.
-
-1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
-
-1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
-1.7. License means this document.
-
-1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. Modifications means the Source Code and Executable form of any of the following:
-
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
-B. Any new file that contains any part of the Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made available under the terms of this License.
-
-1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
-
-1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
-1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sections2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-(d) Notwithstanding Section2.1(b) above, no patent license is granted: (1)for code that You delete from the Original Software, or (2)for infringements caused by: (i)the modification of the Original Software, or (ii)the combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)Modifications made by that Contributor (or portions thereof); and (2)the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) The licenses granted in Sections2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Section2.2(b) above, no patent license is granted: (1)for any code that Contributor has deleted from the Contributor Version; (2)for infringements caused by: (i)third party modifications of Contributor Version, or (ii)the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
-3.3. Required Notices.
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-3.6. Larger Works.
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)otherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
-
-6.3. In the event of termination under Sections6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a commercial item, as that term is defined in 48C.F.R.2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48C.F.R.12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
diff --git a/NOTICE.txt b/NOTICE.txt
index 02c1448..a90b5c2 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache James JSieve Library
-Copyright 2009 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.txt b/README.txt
index 0369457..4ffc69d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,10 @@
-JSieve is built using Maven 2 (http://maven.apache.org). To build all modules type
+JSieve is built using Maven 2 (http://maven.apache.org).
+To build all modules type:
% mvn install
-
+To release:
+%mvn clean javadoc:aggregate site install
+%mvn release:clean
+%mvn release:perform
+Read the rest on http://www.apache.org/dev/publishing-maven-artifacts.html
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index c62a3bf..d7b014d 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -20,6 +20,34 @@
For legal and licensing issues, please look in the legal section of
the documentation or read the LICENSE and NOTICE files.
+Version 0.5
+-----------
+
+Changes
+---------
+Sub-task
+ [JSIEVE-65] - Inherit plugin management
+Bug
+ [JSIEVE-74] - Script parsing fails when the string contains a backslash
+ [JSIEVE-75] - incorrect parsing of script containing multiple multi-line forms
+Improvement
+ [JSIEVE-67] - Improve Documentation
+ [JSIEVE-70] - Improve Validation Exceptions
+ [JSIEVE-73] - Ensure Body Extension Functions As Per Specification
+ [JSIEVE-78] - Add a Mail notification mechanism for when Sieve scripts fail
+ [JSIEVE-80] - Add the ability to advertise the available Sieve extensions
+ [JSIEVE-83] - Integrate managesieve in the current jSieve modules
+ [JSIEVE-85] - Add build-helper-maven-plugin on apache-jsieve-core pom for generated src
+ [JSIEVE-88] - Rename apache-jsieve-assembly to apache-jsieve-all
+New Feature
+ [JSIEVE-51] - Sieve-In-Xml (Full Preview)
+Task
+ [JSIEVE-61] - Split Parent And Aggregation Poms
+ [JSIEVE-62] - Review TODOs
+ [JSIEVE-64] - Improve and Standardise Build
+ [JSIEVE-89] - move to geronimo / remove oracle dependencies and licensing stuff
+ [JSIEVE-90] - Clean up build configuration, assembly, notice/license attachment, ant build
+
Version 0.4
-----------
diff --git a/assemble/pom.xml b/all/pom.xml
similarity index 80%
rename from assemble/pom.xml
rename to all/pom.xml
index 450f68b..b60028d 100644
--- a/assemble/pom.xml
+++ b/all/pom.xml
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>apache-jsieve-assemble</artifactId>
+ <artifactId>apache-jsieve-all</artifactId>
<packaging>pom</packaging>
- <name>Apache James jSieve Assembly</name>
+ <name>Apache James jSieve All</name>
<description>
Apache jSieve is a server side mail filtering system
implementing RFC3028. Apache jSieve is developed by the
@@ -42,59 +42,35 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve</artifactId>
+ <artifactId>apache-jsieve-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-util</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
+ <artifactId>apache-jsieve-manager-jsieve</artifactId>
</dependency>
-
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mailet</artifactId>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
</dependency>
</dependencies>
diff --git a/all/src/assemble/bin.xml b/all/src/assemble/bin.xml
new file mode 100644
index 0000000..b38c93f
--- /dev/null
+++ b/all/src/assemble/bin.xml
@@ -0,0 +1,56 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>RELEASE_NOTES.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../target/site/apidocs</directory>
+ <outputDirectory>/apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib/</outputDirectory>
+ <scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.james:apache-jsieve*</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.james:apache-jsieve*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git a/assemble/src/assemble/src.xml b/all/src/assemble/src.xml
similarity index 100%
rename from assemble/src/assemble/src.xml
rename to all/src/assemble/src.xml
diff --git a/assemble/src/reporting-site/site.xml b/all/src/reporting-site/site.xml
similarity index 100%
rename from assemble/src/reporting-site/site.xml
rename to all/src/reporting-site/site.xml
diff --git a/assemble/src/assemble/bin.xml b/assemble/src/assemble/bin.xml
deleted file mode 100644
index cadd27a..0000000
--- a/assemble/src/assemble/bin.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<assembly>
- <!--
- 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.
- -->
- <id>bin</id>
- <!--
- Generates a jar file including the binary jar and the runtime dependencies.
- including NOTICE and LICENSE in the root.
- -->
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>RELEASE_NOTES.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../mailet/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>apache-jsieve*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../util/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>apache-jsieve*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../main/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>apache-jsieve*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../target/site/apidocs</directory>
- <outputDirectory>/apidocs</outputDirectory>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>${project.basedir}/../LICENSE.mail</source>
- <outputDirectory>lib</outputDirectory>
- <destName>mail.LICENSE</destName>
- </file>
- <file>
- <source>${project.basedir}/../LICENSE.activation</source>
- <outputDirectory>lib</outputDirectory>
- <destName>activation.LICENSE</destName>
- </file>
- <file>
- <source>${project.basedir}/../LICENSE.txt</source>
- <outputDirectory>lib</outputDirectory>
- <destName>apache-mailet.LICENSE</destName>
- </file>
- <file>
- <source>${project.basedir}/../LICENSE.txt</source>
- <outputDirectory>lib</outputDirectory>
- <destName>apache-mailet-base.LICENSE</destName>
- </file>
- <file>
- <source>${project.basedir}/../LICENSE.txt</source>
- <outputDirectory>lib</outputDirectory>
- <destName>apache-mime4j.LICENSE</destName>
- </file>
- <file>
- <source>${project.basedir}/../LICENSE.txt</source>
- <outputDirectory>lib</outputDirectory>
- <destName>commons-logging.LICENSE</destName>
- </file>
- </files>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib/</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <scope>runtime</scope>
- <excludes>
- <exclude>apache-jsieve*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/core/BUILDING.txt b/core/BUILDING.txt
deleted file mode 100644
index 7c8f4ea..0000000
--- a/core/BUILDING.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-# BUILDING JSIEVE WITH MAVEN
-#############################################################################
-
-1) Install maven 2.0.9
-
-2) Add maven to your path and make sure you also have a JAVA_HOME environment
- variable to point a java 1.4+ virtual machine.
-
-3) Run "mvn package"
-
-
-#############################################################################
-# BUILDING JSIEVE WITH ANT
-#############################################################################
-
-The source trunk for JSIEVE no longer includes Ant, so in order to
-build JSIEVE, you will need to install Ant as well as acquire JSIEVE
-source from subversion or a source tarball.
-
-JSIEVE uses JavaCC during the build process to generate the script parser.
-Unfortunately, though the latest codebase is now available under the BSD
-license there is (at this time) no official open sourced release. So
-to build JSIEVE download the JavaCC 4.0 release from
-https://javacc.dev.java.net/. Extract the javacc.jar and copy into the
-root of the JSIEVE directory. Rename this to javacc-4.0.jar.
-
-You also have to download activation-1.1.1.jar and mail-1.4.1.jar files to
-the root folder in order to build/run unit tests.
-
-Steps:
-
-1) Install Ant (v1.6.5 as of the time of this writing)
-
-2) Add Ant to your path. For me, I do the following:
- $ tar zxvf apache-ant-1.6.5-bin.tar.gz
- $ mv apache-ant-1.6.5 /usr/local
- $ ln -sf /usr/local/apache-ant-1.6.5 /usr/local/ant
- $ ln -sf /usr/local/ant/bin/ant /usr/local/bin/ant
-
-3) Change any JSIEVE-related build scripts that you might have to call
- Ant directly, e.g.: ./build.sh <target> ==> ant <target>
-
-That's it. Please contact general@james.apache.org if you have any
-problems.
-
-##############################################################################
-# SET UP JSIEVE INSIDE ECLIPSE
-##############################################################################
-
-You can use maven facility to setup an eclipse project:
-mvn eclipse:eclipse
-
-You can also use q4e plugin from eclipse.
\ No newline at end of file
diff --git a/core/LICENSE.apache b/core/LICENSE.apache
deleted file mode 100644
index 94d8c58..0000000
--- a/core/LICENSE.apache
+++ /dev/null
@@ -1,176 +0,0 @@
- 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
\ No newline at end of file
diff --git a/core/NOTICE.base b/core/NOTICE.base
deleted file mode 100644
index 76a0011..0000000
--- a/core/NOTICE.base
+++ /dev/null
@@ -1,10 +0,0 @@
- =========================================================================
- == NOTICE file for use with the Apache License, Version 2.0, ==
- =========================================================================
-
- Apache James JSieve Library
- Copyright 2009 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/core/build.xml b/core/build.xml
deleted file mode 100644
index 5954bb0..0000000
--- a/core/build.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
-==========================================================================
-
- jSieve build file
-
-
- 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 name='jsieve-main' default="main" basedir=".">
-
- <!--
- Give user a chance to override without editing this file
- (and without typing -D each time he compiles it)
- -->
- <property file=".ant.properties" />
- <property file="${user.home}/.ant.properties" />
- <property file="../include.properties" />
- <property file="../default.properties" />
-
- <path id="project.class.path">
- <pathelement location="${commons-logging.jar}" />
- <pathelement location="${log4j.jar}" />
- <pathelement location="${junit.jar}" />
- <pathelement path="${java.class.path}" />
- <pathelement path="${build.classes}" />
- </path>
-
- <path id="mail.class.path">
- <pathelement location='${mail.jar}' />
- <pathelement location='${activation.jar}' />
- </path>
-
- <path id="project.test.class.path">
- <path refid="project.class.path" />
- <path refid="mail.class.path" />
- </path>
-
- <import file='../build.xml'/>
- <target name="main" depends="run-tests" description=" - main target"/>
-
- <target name="prepare" depends="preprocess" description=" - paparations [internal]">
- <CheckMailConditions/>
- </target>
-
- <!--
- Unless you want to alter the Sieve grammar, expressed by the seive.jjt
- file, is built, consider the following processing a black box.
- Or zen for the more spiritual amongst you.
- -->
- <target name="preprocess" description=" - generate source from grammar [internal]">
- <!--
- Generate JavaCC source inserting parse tree building actions
- and the Java source for the parse classes.
- -->
- <mkdir dir="${build.src}/org/apache/jsieve/parser/generated/address" />
- <java classname="jjtree" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${javacc.dir}/sieve/sieve.jjt" />
- <classpath>
- <pathelement location="${javacc.jar}" />
- <pathelement path="${java.class.path}" />
- </classpath>
- </java>
- <java classname="jjtree" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${javacc.dir}/address/AddressListParser.jjt" />
- <classpath>
- <pathelement location="${javacc.jar}" />
- <pathelement path="${java.class.path}" />
- </classpath>
- </java>
-
- <!-- Generate Java source from the JavaCC source -->
- <java classname="javacc" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${build.src}/org/apache/jsieve/parser/generated/sieve.jj" />
- <classpath>
- <pathelement location="${javacc.jar}" />
- <pathelement path="${java.class.path}" />
- </classpath>
- </java>
- <java classname="javacc" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${build.src}/org/apache/jsieve/parser/generated/address/AddressListParser.jj" />
- <classpath>
- <pathelement location="${javacc.jar}" />
- <pathelement path="${java.class.path}" />
- </classpath>
- </java>
- </target>
-
- <target name="compile" depends="prepare" description=" - compiles test and main source">
- <CompileMain>
- <src path="${build.src}" />
- <src path="${java.dir}" />
- </CompileMain>
- <CompileTests/>
- </target>
-
- <target name="jar" depends="compile" description=" - jars classes">
- <Jar name='' prefix=''/>
-
- <!-- Make jSieve jUnit jar-->
- <echo message="Making jSieve jUnit Jar (${name}-tests-${version}.jar)" />
- <jar jarfile="${build.lib}/${name}-tests-${version}.jar" basedir="${build.classes.test}">
- <include name="org/apache/jsieve/**" />
- <include name="META-INF/**" />
- <manifest>
- <attribute name="Created-By" value='${creator}' />
- <attribute name="X-Compile-Source-JDK" value='${jdk.source}' />
- <attribute name="X-Compile-Target-JDK" value='${jdk.target}' />
- </manifest>
- </jar>
-
- <copy todir='${lib.jsieve.dir}' file='${build.lib}/${name}-tests-${version}.jar' />
- </target>
-
- <target name="run-tests" depends="jar" description=" - runs all tests">
- <RunTests/>
- </target>
-
- <target name="clean" description=" - cleans build files">
- <Clean/>
- </target>
-
- <target name="usage" description=" - prints help">
- <Usage/>
- </target>
-
-</project>
diff --git a/core/pom.xml b/core/pom.xml
index ae9099f..71d1e78 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,7 +41,7 @@
<distributionManagement>
<site>
<id>${james.www.id}</id>
- <url>${james.jsieve.www}/main</url>
+ <url>${james.jsieve.www}/core</url>
</site>
</distributionManagement>
@@ -64,14 +64,14 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -121,6 +121,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
diff --git a/core/src/test/java/org/apache/jsieve/MultipleToTest.java b/core/src/test/java/org/apache/jsieve/MultipleToTest.java
index 6532eea..959798e 100644
--- a/core/src/test/java/org/apache/jsieve/MultipleToTest.java
+++ b/core/src/test/java/org/apache/jsieve/MultipleToTest.java
@@ -29,26 +29,26 @@
public class MultipleToTest extends TestCase {
- private static final String SOLO_TO_EMAIL = "Date: Sun, 1 Apr 2007 1100:00:00 +0100 (BST)\r\f"
- + "From: roadrunner@acme.example.com\r\f"
- + "To: coyote@desert.example.org\r\f"
- + "Subject: Who's The Fool?\r\f" + "\r\f" + "Beep-Beep\r\f";
+ private static final String SOLO_TO_EMAIL = "Date: Sun, 1 Apr 2007 1100:00:00 +0100 (BST)\r\n"
+ + "From: roadrunner@acme.example.com\r\n"
+ + "To: coyote@desert.example.org\r\n"
+ + "Subject: Who's The Fool?\r\n" + "\r\n" + "Beep-Beep\r\n";
- private static final String MULTIPLE_TO_EMAIL = "Date: Sun, 1 Apr 2007 1100:00:00 +0100 (BST)\r\f"
- + "From: roadrunner@acme.example.com\r\f"
+ private static final String MULTIPLE_TO_EMAIL = "Date: Sun, 1 Apr 2007 1100:00:00 +0100 (BST)\r\n"
+ + "From: roadrunner@acme.example.com\r\n"
+ "To: coyote@desert.example.org, bugs@example.org, "
- + " elmer@hunters.example.org,\r\f"
- + "Subject: Who's The Fool?\r\f" + "\r\f" + "Beep-Beep\r\f";
+ + " elmer@hunters.example.org,\r\n"
+ + "Subject: Who's The Fool?\r\n" + "\r\n" + "Beep-Beep\r\n";
- private static final String FILTER_SCRIPT = "require \"fileinto\";\r\f"
- + "if address :is :all \"to\" \"coyote@desert.example.org\" {\r\f"
- + " fileinto \"coyote\";\r\f}\r\f"
- + "if address :is :all \"to\" \"bugs@example.org\" {\r\f"
- + " fileinto \"bugs\";\r\f}\r\f"
- + "if address :is :all \"to\" \"roadrunneracme.@example.org\" {\r\f"
- + " fileinto \"rr\";\r\f}\r\f"
- + "if address :is :all \"to\" \"elmer@hunters.example.org\" {\r\f"
- + " fileinto \"elmer\";\r\f}\r\f";
+ private static final String FILTER_SCRIPT = "require \"fileinto\";\r\n"
+ + "if address :is :all \"to\" \"coyote@desert.example.org\" {\r\n"
+ + " fileinto \"coyote\";\r\n}\r\n"
+ + "if address :is :all \"to\" \"bugs@example.org\" {\r\n"
+ + " fileinto \"bugs\";\r\n}\r\n"
+ + "if address :is :all \"to\" \"roadrunneracme.@example.org\" {\r\n"
+ + " fileinto \"rr\";\r\n}\r\n"
+ + "if address :is :all \"to\" \"elmer@hunters.example.org\" {\r\n"
+ + " fileinto \"elmer\";\r\n}\r\n";
public void testSingleTo() throws Exception {
ScriptChecker checker = new ScriptChecker();
diff --git a/mailet/LICENSE.apache b/mailet/LICENSE.apache
deleted file mode 100644
index 94d8c58..0000000
--- a/mailet/LICENSE.apache
+++ /dev/null
@@ -1,176 +0,0 @@
- 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
\ No newline at end of file
diff --git a/mailet/NOTICE.base b/mailet/NOTICE.base
deleted file mode 100644
index 76a0011..0000000
--- a/mailet/NOTICE.base
+++ /dev/null
@@ -1,10 +0,0 @@
- =========================================================================
- == NOTICE file for use with the Apache License, Version 2.0, ==
- =========================================================================
-
- Apache James JSieve Library
- Copyright 2009 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/mailet/build.xml b/mailet/build.xml
deleted file mode 100644
index b2dd89d..0000000
--- a/mailet/build.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<!--
-==========================================================================
-
- jSieve build file
-
-
- 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 name='jsieve-mailet' default="main" basedir=".">
-
- <!--
- Give user a chance to override without editing this file
- (and without typing -D each time he compiles it)
- -->
- <property file=".ant.properties" />
- <property file="${user.home}/.ant.properties" />
- <property file="../include.properties" />
- <property file="../default.properties" />
-
- <path id="mail.class.path">
- <pathelement location='${mail.jar}' />
- <pathelement location='${activation.jar}' />
- </path>
-
- <path id="project.class.path">
- <pathelement location="${commons-logging.jar}" />
- <pathelement location="${log4j.jar}" />
- <pathelement location="${junit.jar}" />
- <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar' />
- <pathelement location="${mailet.jar}" />
- <pathelement location="${mailet-base.jar}" />
- <pathelement location="${mime4j.jar}" />
- <path refid="mail.class.path" />
- <pathelement path="${java.class.path}" />
- <pathelement path="${build.classes}" />
- </path>
-
- <path id="project.test.class.path">
- <path refid="project.class.path" />
- </path>
-
- <import file='../build.xml'/>
-
- <target name="main" depends="run-tests" description=" - main target"/>
-
- <target name="prepare" description=" - paparations [internal]">
- <CheckMailConditions/>
- </target>
-
- <target name="compile" depends="prepare" description=" - compiles test and main source">
- <CompileMain>
- <src path="${java.dir}" />
- </CompileMain>
- <CompileTests/>
- </target>
-
- <target name="jar" depends="compile" description=" - jars classes">
- <Jar name='mailet'/>
- </target>
-
- <target name="run-tests" depends="jar" description=" - runs all tests">
- <RunTests/>
- </target>
-
- <target name="clean" description=" - cleans build files">
- <Clean/>
- </target>
-
- <target name="usage" description=" - prints help">
- <Usage/>
- </target>
-</project>
diff --git a/mailet/pom.xml b/mailet/pom.xml
index da6fd5e..6ee090a 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -89,13 +89,13 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
<dependency>
diff --git a/manager/api/pom.xml b/manager/api/pom.xml
index eb62f9f..54af85c 100644
--- a/manager/api/pom.xml
+++ b/manager/api/pom.xml
@@ -16,15 +16,14 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
<relativePath>..</relativePath>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</parent>
<artifactId>apache-jsieve-manager-api</artifactId>
diff --git a/manager/core/pom.xml b/manager/core/pom.xml
index 7502888..730e18e 100644
--- a/manager/core/pom.xml
+++ b/manager/core/pom.xml
@@ -16,13 +16,12 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/manager/jsieve/pom.xml b/manager/jsieve/pom.xml
index 1fbc443..3683c63 100644
--- a/manager/jsieve/pom.xml
+++ b/manager/jsieve/pom.xml
@@ -16,14 +16,13 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/manager/mailet/pom.xml b/manager/mailet/pom.xml
index eed8295..8aee1c4 100644
--- a/manager/mailet/pom.xml
+++ b/manager/mailet/pom.xml
@@ -16,13 +16,12 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<relativePath>..</relativePath>
</parent>
@@ -41,14 +40,20 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet</artifactId>
<version>${mailet.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${mailet-base.version}</version>
- <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-jsieve-manager-mock</artifactId>
diff --git a/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java b/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
index fd4e008..cc9bb89 100644
--- a/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
+++ b/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
@@ -197,6 +197,11 @@
"application/sieve; charset=UTF-8")
));
scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
+ // setting a DataHandler with no mailcap definition is not
+ // supported by the specs. Javamail activation still work,
+ // but Geronimo activation translate it to text/plain.
+ // Let's manually force the header.
+ scriptPart.setHeader("Content-Type", "application/sieve; charset=UTF-8");
scriptPart.setFileName(scriptName);
multipart.addBodyPart(scriptPart);
message.setContent(multipart);
@@ -264,6 +269,7 @@
"SyntaxException",
"application/sieve; charset=UTF-8")
));
+ scriptPart.setHeader("Content-Type", "application/sieve; charset=UTF-8");
scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
scriptPart.setFileName(scriptName);
multipart.addBodyPart(scriptPart);
@@ -469,6 +475,7 @@
scriptContent,
"application/sieve; charset=UTF-8")
));
+ scriptPart.setHeader("Content-Type", "application/sieve; charset=UTF-8");
scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
scriptPart.setFileName(scriptName);
multipart.addBodyPart(scriptPart);
@@ -536,6 +543,7 @@
"SyntaxException",
"application/sieve; charset=UTF-8")
));
+ scriptPart.setHeader("Content-Type", "application/sieve; charset=UTF-8");
scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
scriptPart.setFileName(scriptName);
multipart.addBodyPart(scriptPart);
@@ -1164,7 +1172,8 @@
MimeMessage result = ((MockMailetContext) _mailet.getMailetContext()).getMessage();
assertNotNull(result);
// Check the subject header
- assertEquals("Re: ", result.getSubject());
+ // Javamail returns "Re: " instead Geronimo returns "Re:" (no trailing space)
+ assertEquals("Re:", result.getSubject().trim());
// Check the response
MimeMultipart multipart = (MimeMultipart) result.getContent();
assertEquals(1, multipart.getCount());
diff --git a/manager/mock/pom.xml b/manager/mock/pom.xml
index 66ffe11..4747cbe 100644
--- a/manager/mock/pom.xml
+++ b/manager/mock/pom.xml
@@ -16,13 +16,12 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/manager/pom.xml b/manager/pom.xml
index 8273af3..ce1faf0 100644
--- a/manager/pom.xml
+++ b/manager/pom.xml
@@ -16,8 +16,7 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-jsieve-manager</artifactId>
@@ -27,7 +26,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<relativePath>..</relativePath>
</parent>
@@ -37,7 +36,6 @@
<module>jsieve</module>
<module>mailet</module>
<module>mock</module>
- <module>server</module>
</modules>
<dependencies>
@@ -70,7 +68,6 @@
<target.jdk>1.6</target.jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<commons-io.version>2.1</commons-io.version>
- <james-server.version>3.0-beta4-SNAPSHOT</james-server.version>
<mailet.version>2.4</mailet.version>
<mailet-base.version>1.0</mailet-base.version>
</properties>
diff --git a/manager/server/pom.xml b/manager/server/pom.xml
deleted file mode 100644
index 3aad095..0000000
--- a/manager/server/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
- <!--
- 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve-manager</artifactId>
- <version>0.5-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>apache-jsieve-manager-server</artifactId>
- <packaging>jar</packaging>
- <name>Apache James jSieve Manager Server</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <version>${james-server.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-jsieve-manager-core</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/manager/server/src/main/java/org/apache/james/managesieve/file/SieveFileRepository.java b/manager/server/src/main/java/org/apache/james/managesieve/file/SieveFileRepository.java
deleted file mode 100644
index d6901f8..0000000
--- a/manager/server/src/main/java/org/apache/james/managesieve/file/SieveFileRepository.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.james.managesieve.file;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Scanner;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.managesieve.api.ConfigurationError;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.DuplicateUserException;
-import org.apache.james.managesieve.api.IsActiveException;
-import org.apache.james.managesieve.api.ManageSieveError;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.QuotaNotFoundException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.ScriptSummary;
-import org.apache.james.managesieve.api.SieveRepository;
-import org.apache.james.managesieve.api.StorageException;
-import org.apache.james.managesieve.api.UserNotFoundException;
-
-/**
- * <code>SieveFileRepository</code> manages sieve scripts stored on the file system.
- * <p>The sieve root directory is a sub-directory of the application base directory named "sieve".
- * Scripts are stored in sub-directories of the sieve root directory, each with the name of the
- * associated user.
- */
-public class SieveFileRepository implements SieveRepository {
-
- private static final String SIEVE_ROOT = FileSystem.FILE_PROTOCOL + "sieve/";
- private static final String UTF_8 = "UTF-8";
- private static final String FILE_NAME_QUOTA = ".quota";
- private static final String FILE_NAME_ACTIVE = ".active";
- private static final List<String> SYSTEM_FILES = Arrays.asList(FILE_NAME_QUOTA, FILE_NAME_ACTIVE);
- private static final int MAX_BUFF_SIZE = 32768;
-
- private FileSystem _fileSystem = null;
-
- /**
- * Read a file with the specified encoding into a String
- *
- * @param file
- * @param encoding
- * @return
- * @throws FileNotFoundException
- */
- static protected String toString(File file, String encoding) throws FileNotFoundException {
- String script = null;
- Scanner scanner = null;
- try {
- scanner = new Scanner(file, encoding).useDelimiter("\\A");
- script = scanner.next();
- } finally {
- if (null != scanner) {
- scanner.close();
- }
- }
- return script;
- }
-
- static protected void toFile(File file, String content) throws StorageException {
- // Create a temporary file
- int bufferSize = content.length() > MAX_BUFF_SIZE ? MAX_BUFF_SIZE : content.length();
- File tmpFile = null;
- Writer out = null;
- try {
- tmpFile = File.createTempFile(file.getName(), ".tmp", file.getParentFile());
- try {
- out = new OutputStreamWriter(new BufferedOutputStream(
- new FileOutputStream(tmpFile), bufferSize), UTF_8);
- out.write(content);
- } catch (UnsupportedEncodingException ex1) {
- // UTF-8 must always be supported
- throw new ManageSieveError("Runtime must always support UTF-8", ex1);
- } finally {
- IOUtils.closeQuietly(out);
- }
- } catch (IOException ex) {
- FileUtils.deleteQuietly(tmpFile);
- throw new StorageException(ex);
- }
-
- // Does the file exist?
- // If so, make a backup
- File backupFile = new File(file.getParentFile(), file.getName() + ".bak");
- if (file.exists()) {
- try {
- FileUtils.copyFile(file, backupFile);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
-
- // Copy the temporary file to its final name
- try {
- FileUtils.copyFile(tmpFile, file);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- // Tidy up
- if (tmpFile.exists()) {
- FileUtils.deleteQuietly(tmpFile);
- }
- if (backupFile.exists()) {
- FileUtils.deleteQuietly(backupFile);
- }
- }
-
- /**
- * Creates a new instance of SieveFileRepository.
- *
- */
- public SieveFileRepository() {
- super();
- }
-
- /**
- * Creates a new instance of SieveFileRepository.
- *
- * @param fileSystem
- */
- public SieveFileRepository(FileSystem fileSystem) {
- this();
- setFileSystem(fileSystem);
- }
-
- @Resource(name = "filesystem")
- public void setFileSystem(FileSystem fileSystem)
- {
- _fileSystem = fileSystem;
- }
-
- /**
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#deleteScript(java.lang.String, java.lang.String)
- */
- public void deleteScript(final String user, final String name) throws UserNotFoundException,
- ScriptNotFoundException, IsActiveException, StorageException {
- synchronized (user) {
- File file = getScriptFile(user, name);
- if (isActiveFile(user, file)) {
- throw new IsActiveException("User: " + user + "Script: " + name);
- }
- try {
- FileUtils.forceDelete(file);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#getScript(java.lang.String, java.lang.String)
- */
- public String getScript(final String user, final String name) throws UserNotFoundException,
- ScriptNotFoundException {
- String script = null;
- try {
- script = toString(getScriptFile(user, name), UTF_8);
- } catch (FileNotFoundException ex) {
- throw new ScriptNotFoundException(ex);
- }
- return script;
- }
-
- /**
- * The default quota, if any, is stored in file '.quota' in the sieve root directory. Quotas for
- * specific users are stored in file '.quota' in the user's directory.
- *
- * <p>The '.quota' file contains a single positive integer value representing the quota in octets.
- *
- * @see org.apache.james.managesieve.api.SieveRepository#haveSpace(java.lang.String, java.lang.String, long)
- */
- public void haveSpace(final String user, final String name, final long size) throws UserNotFoundException,
- QuotaExceededException {
- long usedSpace = 0;
- for (File file : getUserDirectory(user).listFiles()) {
- if (!(file.getName().equals(name) || SYSTEM_FILES.contains(file.getName()))) {
- usedSpace = usedSpace + file.length();
- }
- }
-
- long quota = Long.MAX_VALUE;
- File file = getQuotaFile(user);
- if (!file.exists()) {
- file = getQuotaFile();
- }
- if (file.exists()) {
- Scanner scanner = null;
- try {
- scanner = new Scanner(file, UTF_8);
- quota = scanner.nextLong();
- } catch (FileNotFoundException ex) {
- // no op
- } catch (NoSuchElementException ex) {
- // no op
- }
- finally
- {
- if (null != scanner)
- {
- scanner.close();
- }
- }
- }
- if ((usedSpace + size) > quota) {
- throw new QuotaExceededException(" Quota: " + quota + " Used: " + usedSpace
- + " Requested: " + size);
- }
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#listScripts(java.lang.String)
- */
- public List<ScriptSummary> listScripts(final String user) throws UserNotFoundException {
- File[] files = getUserDirectory(user).listFiles();
- List<ScriptSummary> summaries = new ArrayList<ScriptSummary>(files.length);
- File activeFile = null;
- try {
- activeFile = getActiveFile(user);
- } catch (ScriptNotFoundException ex) {
- // no op
- }
- final File activeFile1 = activeFile;
- for (final File file : files) {
- if (!SYSTEM_FILES.contains(file.getName())) {
- summaries.add(new ScriptSummary() {
-
- public String getName() {
- return file.getName();
- }
-
- public boolean isActive() {
- boolean isActive = false;
- if (null != activeFile1)
- {
- isActive = 0 == activeFile1.compareTo(file);
- }
- return isActive;
- }
- });
- }
- }
- return summaries;
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#putScript(java.lang.String, java.lang.String, java.lang.String)
- */
- public void putScript(final String user, final String name, final String content)
- throws UserNotFoundException, StorageException, QuotaExceededException {
- synchronized (user) {
- File file = new File(getUserDirectory(user), name);
- haveSpace(user, name, content.length());
- toFile(file, content);
- }
- }
-
- /**
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#renameScript(java.lang.String, java.lang.String, java.lang.String)
- */
- public void renameScript(final String user, final String oldName, final String newName)
- throws UserNotFoundException, ScriptNotFoundException,
- DuplicateException, StorageException {
- synchronized (user) {
- File oldFile = getScriptFile(user, oldName);
- File newFile = new File(getUserDirectory(user), newName);
- if (newFile.exists()) {
- throw new DuplicateException("User: " + user + "Script: " + newName);
- }
- boolean isActive = isActiveFile(user, oldFile);
- try {
- FileUtils.copyFile(oldFile, newFile);
- if (isActive) {
- setActiveFile(newFile, true);
- }
- FileUtils.forceDelete(oldFile);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#getActive(java.lang.String)
- */
- public String getActive(final String user) throws UserNotFoundException,
- ScriptNotFoundException {
- String script = null;
- try {
- script = toString(getActiveFile(user), UTF_8);
- } catch (FileNotFoundException ex) {
- throw new ScriptNotFoundException(ex);
- }
- return script;
- }
-
- /**
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#setActive(java.lang.String, java.lang.String)
- */
- public void setActive(final String user, final String name) throws UserNotFoundException,
- ScriptNotFoundException, StorageException {
- synchronized (user) {
- // Turn off currently active script, if any
- File oldActive = null;
- try {
- oldActive = getActiveFile(user);
- setActiveFile(oldActive, false);
- } catch (ScriptNotFoundException ex) {
- // This is permissible
- }
- // Turn on the new active script if not an empty name
- if ((null != name) && (!name.trim().isEmpty())) {
- try {
- setActiveFile(getScriptFile(user, name), true);
- } catch (ScriptNotFoundException ex) {
- if (null != oldActive) {
- setActiveFile(oldActive, true);
- }
- throw ex;
- }
- }
- }
- }
-
- protected File getSieveRootDirectory()
- {
- try {
- return _fileSystem.getFile(SIEVE_ROOT);
- } catch (FileNotFoundException ex1) {
- throw new ConfigurationError(ex1);
- }
- }
-
- protected File getUserDirectory(String user) throws UserNotFoundException {
- File file = getUserDirectoryFile(user);
- if (!file.exists()) {
- throw new UserNotFoundException("User: " + user);
- }
- return file;
- }
-
- protected File getUserDirectoryFile(String user) {
- return new File(getSieveRootDirectory(), user + '/');
- }
-
- protected File getActiveFile(String user) throws UserNotFoundException,
- ScriptNotFoundException {
- File dir = getUserDirectory(user);
- String content = null;
- try {
- content = toString(new File(dir, FILE_NAME_ACTIVE), UTF_8);
- } catch (FileNotFoundException ex) {
- throw new ScriptNotFoundException("There is no active script.");
- }
- return new File(dir,content);
- }
-
- protected boolean isActiveFile(String user, File file) throws UserNotFoundException
- {
- boolean isActive = false;
- try {
- isActive = 0 == getActiveFile(user).compareTo(file);
- } catch (ScriptNotFoundException ex) {
- // no op;
- }
- return isActive;
- }
-
- protected void setActiveFile(File activeFile, boolean isActive) throws StorageException {
- File file = new File(activeFile.getParentFile(), FILE_NAME_ACTIVE);
- if (isActive) {
- String content = activeFile.getName();
- toFile(file, content);
- } else {
- try {
- FileUtils.forceDelete(file);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
- }
-
- protected File getScriptFile(String user, String name) throws UserNotFoundException,
- ScriptNotFoundException {
- File file = new File(getUserDirectory(user), name);
- if (!file.exists()) {
- throw new ScriptNotFoundException("User: " + user + "Script: " + name);
- }
- return file;
- }
-
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#hasUser()
- */
- public boolean hasUser(final String user) {
- boolean userExists = true;
- try {
- getUserDirectory(user);
- } catch (UserNotFoundException ex) {
- userExists = false;
- }
- return userExists;
- }
-
- /**
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#addUser(java.lang.String)
- */
- public void addUser(final String user) throws DuplicateUserException, StorageException {
- synchronized (user) {
- boolean userExists = true;
- try {
- getUserDirectory(user);
- } catch (UserNotFoundException ex) {
- userExists = false;
- }
- if (userExists) {
- throw new DuplicateUserException("User: " + user);
- }
- File dir = getUserDirectoryFile(user);
- try {
- FileUtils.forceMkdir(dir);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
- }
-
- /**
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#removeUser(java.lang.String)
- */
- public void removeUser(final String user) throws UserNotFoundException, StorageException {
- synchronized (user) {
- File dir = getUserDirectory(user);
- try {
- FileUtils.forceDelete(dir);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
- }
-
- protected File getQuotaFile()
- {
- return new File(getSieveRootDirectory(), FILE_NAME_QUOTA);
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#hasQuota()
- */
- public boolean hasQuota() {
- return getQuotaFile().exists();
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#getQuota()
- */
- public long getQuota() throws QuotaNotFoundException {
- Long quota = null;
- File file = getQuotaFile();
- if (file.exists()) {
- Scanner scanner = null;
- try {
- scanner = new Scanner(file, UTF_8);
- quota = scanner.nextLong();
- } catch (FileNotFoundException ex) {
- // no op
- } catch (NoSuchElementException ex) {
- // no op
- }
- finally {
- if (null != scanner)
- {
- scanner.close();
- }
- }
- }
- if (null == quota)
- {
- throw new QuotaNotFoundException("No default quota");
- }
- return quota;
- }
-
- /**
- * @throws QuotaNotFoundException
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#removeQuota()
- */
- public synchronized void removeQuota() throws QuotaNotFoundException, StorageException {
- File file = getQuotaFile();
- if (!file.exists()) {
- throw new QuotaNotFoundException("No default quota");
- }
- try {
- FileUtils.forceDelete(file);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#setQuota(long)
- */
- public synchronized void setQuota(final long quota) throws StorageException {
- File file = getQuotaFile();
- String content = Long.toString(quota);
- toFile(file, content);
- }
-
- protected File getQuotaFile(String user) throws UserNotFoundException
- {
- return new File(getUserDirectory(user), FILE_NAME_QUOTA);
- }
-
- /**
- * @see org.apache.james.managesieve.api.SieveRepository#hasQuota(java.lang.String)
- */
- public boolean hasQuota(final String user) throws UserNotFoundException {
- return getQuotaFile(user).exists();
- }
-
- /**
- * @throws QuotaNotFoundException
- * @see org.apache.james.managesieve.api.SieveRepository#getQuota(java.lang.String)
- */
- public long getQuota(final String user) throws UserNotFoundException, QuotaNotFoundException {
- Long quota = null;
- File file = getQuotaFile(user);
- if (file.exists()) {
- Scanner scanner = null;
- try {
- scanner = new Scanner(file, UTF_8);
- quota = scanner.nextLong();
- } catch (FileNotFoundException ex) {
- // no op
- } catch (NoSuchElementException ex) {
- // no op
- } finally {
- if (null != scanner) {
- scanner.close();
- }
- }
- }
- if (null == quota) {
- throw new QuotaNotFoundException("No quota for user: " + user);
- }
- return quota;
- }
-
- /**
- * @throws QuotaNotFoundException
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#removeQuota(java.lang.String)
- */
- public void removeQuota(final String user) throws UserNotFoundException,
- QuotaNotFoundException, StorageException {
- synchronized (user) {
- File file = getQuotaFile(user);
- if (!file.exists()) {
- throw new QuotaNotFoundException("No quota for user: " + user);
- }
- try {
- FileUtils.forceDelete(file);
- } catch (IOException ex) {
- throw new StorageException(ex);
- }
- }
- }
-
- /**
- * @throws StorageException
- * @see org.apache.james.managesieve.api.SieveRepository#setQuota(java.lang.String, long)
- */
- public void setQuota(final String user, final long quota) throws UserNotFoundException,
- StorageException {
- synchronized (user) {
- File file = getQuotaFile(user);
- String content = Long.toString(quota);
- toFile(file, content);
- }
- }
-
-}
diff --git a/manager/server/src/main/resources/META-INF/MANIFEST.MF b/manager/server/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69de29..0000000
--- a/manager/server/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
diff --git a/manager/server/src/test/java/org/apache/james/managesieve/file/SieveFileRepositoryTestCase.java b/manager/server/src/test/java/org/apache/james/managesieve/file/SieveFileRepositoryTestCase.java
deleted file mode 100644
index 51e1ab6..0000000
--- a/manager/server/src/test/java/org/apache/james/managesieve/file/SieveFileRepositoryTestCase.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.james.managesieve.file;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.DuplicateUserException;
-import org.apache.james.managesieve.api.IsActiveException;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.QuotaNotFoundException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.ScriptSummary;
-import org.apache.james.managesieve.api.SieveRepository;
-import org.apache.james.managesieve.api.StorageException;
-import org.apache.james.managesieve.api.UserNotFoundException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * <code>SieveFileRepositoryTestCase</code>
- */
-public class SieveFileRepositoryTestCase {
- private static final String SIEVE_ROOT = FileSystem.FILE_PROTOCOL + "sieve";
-
- private FileSystem fs = new FileSystem() {
-
- public File getBasedir() throws FileNotFoundException {
- return new File(System.getProperty("java.io.tmpdir"));
- }
-
- public InputStream getResource(String url) throws IOException {
- return new FileInputStream(getFile(url));
- }
-
- public File getFile(String fileURL) throws FileNotFoundException {
- return new File(getBasedir(), fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
- }
- };
-
- /**
- * setUp.
- *
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- File root = fs.getFile(SIEVE_ROOT);
- // Remove files from the previous test, if any
- if (root.exists())
- {
- FileUtils.forceDelete(root);
- }
- root.mkdir();
- }
-
- /**
- * tearDown.
- *
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- // Files from the current run are not removed to allow post run analysis
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#SieveFileRepository(org.apache.james.filesystem.api.FileSystem)}.
- */
- @Test
- public final void testSieveFileRepository() {
- SieveRepository repo = new SieveFileRepository(fs);
- assertTrue(repo instanceof SieveRepository);
- assertTrue(repo instanceof SieveFileRepository);
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#deleteScript(java.lang.String, java.lang.String)}.
- * @throws StorageException
- * @throws DuplicateUserException
- * @throws QuotaExceededException
- * @throws UserNotFoundException
- * @throws IsActiveException
- * @throws ScriptNotFoundException
- * @throws FileNotFoundException
- */
- @Test
- public final void testDeleteScript() throws DuplicateUserException, StorageException,
- UserNotFoundException, QuotaExceededException, ScriptNotFoundException,
- IsActiveException, FileNotFoundException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
-
- // Delete existent inactive script
- repo.putScript(user, scriptName, content);
- repo.deleteScript(user, scriptName);
- assertTrue("Script deletion failed", !new File(fs.getFile(SIEVE_ROOT), user + '/'
- + scriptName).exists());
-
- // Delete existent active script
- repo.putScript(user, scriptName, content);
- repo.setActive(user, scriptName);
- boolean isActiveExceptionThrown = false;
- try {
- repo.deleteScript(user, scriptName);
- } catch (IsActiveException ex) {
- isActiveExceptionThrown = true;
- }
- assertTrue(isActiveExceptionThrown);
-
- // Delete non existent script
- boolean scriptNotFoundExceptionThrown = false;
- try {
- repo.deleteScript(user, "nonExistent");
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#getScript(java.lang.String, java.lang.String)}.
- * @throws StorageException
- * @throws DuplicateUserException
- * @throws UserNotFoundException
- * @throws QuotaExceededException
- * @throws ScriptNotFoundException
- */
- @Test
- public final void testGetScript() throws DuplicateUserException, StorageException, UserNotFoundException, QuotaExceededException, ScriptNotFoundException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
-
- // Non existent script
- boolean scriptNotFoundExceptionThrown = false;
- try {
- repo.getScript(user, scriptName);
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
-
- // Existent script
- repo.putScript(user, scriptName, content);
- assertEquals("Script content did not match", content, repo.getScript(user, scriptName));
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#haveSpace(java.lang.String, java.lang.String, long)}.
- * @throws DuplicateUserException
- * @throws QuotaExceededException
- * @throws UserNotFoundException
- * @throws StorageException
- * @throws ScriptNotFoundException
- */
- @Test
- public final void testHaveSpace() throws DuplicateUserException, UserNotFoundException, QuotaExceededException, StorageException, ScriptNotFoundException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- long defaultQuota = Long.MAX_VALUE - 1;
- long userQuota = Long.MAX_VALUE / 2;
- boolean quotaExceededExceptionThrown = false;
-
- // No quota
- repo.haveSpace(user, scriptName, defaultQuota + 1);
-
- // Default quota
- repo.setQuota(defaultQuota);
- // Default quota - not exceeded
- repo.haveSpace(user, scriptName, defaultQuota);
- // Default quota - exceeded
- quotaExceededExceptionThrown = false;
- try {
- repo.haveSpace(user, scriptName, defaultQuota + 1);
- } catch (QuotaExceededException ex) {
- quotaExceededExceptionThrown = true;
- }
- assertTrue(quotaExceededExceptionThrown);
-
- // User quota file
- repo.setQuota(user, userQuota);
- // User quota - not exceeded
- repo.haveSpace(user, scriptName, userQuota);
- // User quota - exceeded
- quotaExceededExceptionThrown = false;
- try {
- repo.haveSpace(user, scriptName, userQuota + 1);
- } catch (QuotaExceededException ex) {
- quotaExceededExceptionThrown = true;
- }
- assertTrue(quotaExceededExceptionThrown);
-
- // Script replacement
- String content = "01234567";
- repo.putScript(user, scriptName, content);
- // Script replacement, quota not exceeded
- repo.haveSpace(user, scriptName, userQuota);
- // Script replacement, quota exceeded
- quotaExceededExceptionThrown = false;
- try {
- repo.haveSpace(user, scriptName, userQuota + 1);
- } catch (QuotaExceededException ex) {
- quotaExceededExceptionThrown = true;
- }
- assertTrue(quotaExceededExceptionThrown);
-
- // Active script
- repo.setActive(user, scriptName);
- // User quota - not exceeded
- repo.haveSpace(user, scriptName, userQuota);
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#listScripts(java.lang.String)}.
- * @throws StorageException
- * @throws DuplicateUserException
- * @throws UserNotFoundException
- * @throws QuotaExceededException
- * @throws ScriptNotFoundException
- */
- @Test
- public final void testListScripts() throws DuplicateUserException, StorageException, UserNotFoundException, QuotaExceededException, ScriptNotFoundException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
- String scriptName1 = "script1";
- String content1 = "abcdefgh";
-
- // No scripts
- assertTrue(repo.listScripts(user).isEmpty());
-
- // Inactive script
- repo.putScript(user, scriptName, content);
- List<ScriptSummary> summaries = repo.listScripts(user);
- assertEquals(1, summaries.size());
- assertEquals(scriptName, summaries.get(0).getName());
- assertTrue(!summaries.get(0).isActive());
-
- // Active script
- repo.setActive(user, scriptName);
- summaries = repo.listScripts(user);
- assertEquals(1, summaries.size());
- assertEquals(scriptName, summaries.get(0).getName());
- assertTrue(summaries.get(0).isActive());
-
- // One of each
- repo.putScript(user, scriptName1, content1);
- summaries = repo.listScripts(user);
- assertEquals(2, summaries.size());
- assertEquals(scriptName, summaries.get(0).getName());
- assertTrue(summaries.get(0).isActive());
- assertEquals(scriptName1, summaries.get(1).getName());
- assertTrue(!summaries.get(1).isActive());
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#putScript(java.lang.String, java.lang.String, java.lang.String)}.
- * @throws DuplicateUserException
- * @throws QuotaExceededException
- * @throws StorageException
- * @throws UserNotFoundException
- * @throws FileNotFoundException
- */
- @Test
- public final void testPutScript() throws DuplicateUserException, UserNotFoundException,
- StorageException, QuotaExceededException, FileNotFoundException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
-
- // test new script
- repo.putScript(user, scriptName, content);
- assertTrue("Script creation failed", new File(fs.getFile(SIEVE_ROOT), user + '/'
- + scriptName).exists());
-
- // test script replacement
- repo.putScript(user, scriptName, content);
- assertTrue("Script replacement failed", new File(fs.getFile(SIEVE_ROOT), user + '/'
- + scriptName).exists());
-
- // test quota
- repo.setQuota(content.length());
- repo.putScript(user, scriptName, content);
- repo.setQuota(content.length() - 1);
- boolean quotaExceededExceptionThrown = false;
- try {
- repo.putScript(user, scriptName, content);
- } catch (QuotaExceededException ex) {
- quotaExceededExceptionThrown = true;
- }
- assertTrue(quotaExceededExceptionThrown);
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#renameScript(java.lang.String, java.lang.String, java.lang.String)}.
- * @throws StorageException
- * @throws DuplicateUserException
- * @throws DuplicateException
- * @throws IsActiveException
- * @throws UserNotFoundException
- * @throws ScriptNotFoundException
- * @throws QuotaExceededException
- */
- @Test
- public final void testRenameScript() throws DuplicateUserException, StorageException, UserNotFoundException, IsActiveException, DuplicateException, ScriptNotFoundException, QuotaExceededException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
- String scriptName1 = "script1";
-
- // Non existent script
- boolean scriptNotFoundExceptionThrown = false;
- try {
- repo.renameScript(user, scriptName, scriptName1);
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
-
- // Existent script
- repo.putScript(user, scriptName, content);
- repo.renameScript(user, scriptName, scriptName1);
- assertEquals("Script content did not match", content, repo.getScript(user, scriptName1));
-
- // Propagate active script
- repo.setActive(user, scriptName1);
- repo.renameScript(user, scriptName1, scriptName);
- assertEquals("Script content did not match", content, repo.getActive(user));
-
- // Duplicate script
- repo.setActive(user, "");
- boolean duplicateExceptionThrown = false;
- try {
- repo.renameScript(user, scriptName, scriptName);
- } catch (DuplicateException ex) {
- duplicateExceptionThrown = true;
- }
- assertTrue(duplicateExceptionThrown);
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#getActive(java.lang.String)}.
- * @throws StorageException
- * @throws DuplicateUserException
- * @throws QuotaExceededException
- * @throws UserNotFoundException
- * @throws ScriptNotFoundException
- */
- @Test
- public final void testGetActive() throws DuplicateUserException, StorageException, UserNotFoundException, QuotaExceededException, ScriptNotFoundException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
-
- // Non existent script
- boolean scriptNotFoundExceptionThrown = false;
- try {
- repo.getActive(user);
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
-
- // Inactive script
- repo.putScript(user, scriptName, content);
- scriptNotFoundExceptionThrown = false;
- try {
- repo.getActive(user);
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
-
- // Active script
- repo.setActive(user, scriptName);
- assertEquals("Script content did not match", content, repo.getActive(user));
- }
-
- /**
- * Test method for {@link org.apache.james.managesieve.file.SieveFileRepository#setActive(java.lang.String, java.lang.String)}.
- * @throws StorageException
- * @throws DuplicateUserException
- * @throws UserNotFoundException
- * @throws ScriptNotFoundException
- * @throws QuotaExceededException
- */
- @Test
- public final void testSetActive() throws DuplicateUserException, StorageException,
- UserNotFoundException, ScriptNotFoundException, QuotaExceededException {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
- String scriptName = "script";
- String content = "01234567";
- String scriptName1 = "script1";
- String content1 = "abcdefgh";
-
- // Non existent script
- boolean scriptNotFoundExceptionThrown = false;
- try {
- repo.setActive(user, scriptName);
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
-
- // Existent script
- repo.putScript(user, scriptName, content);
- repo.setActive(user, scriptName);
- assertEquals("Script content did not match", content, repo.getActive(user));
-
- // Switch active script
- repo.putScript(user, scriptName1, content1);
- scriptNotFoundExceptionThrown = false;
- repo.setActive(user, scriptName1);
- assertEquals("Script content did not match", content1, repo.getActive(user));
-
- // Disable active script
- repo.setActive(user, "");
- scriptNotFoundExceptionThrown = false;
- try {
- repo.getActive(user);
- } catch (ScriptNotFoundException ex) {
- scriptNotFoundExceptionThrown = true;
- }
- assertTrue(scriptNotFoundExceptionThrown);
- }
-
- @Test
- public final void testAddUser() throws DuplicateUserException, StorageException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
-
- repo.addUser(user);
- assertTrue(repo.hasUser(user));
- }
-
- @Test
- public final void testRemoveUser() throws StorageException, DuplicateUserException, UserNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
-
- // Non existent user
- boolean userNotFoundExceptionThrown = false;
- try {
- repo.removeUser(user);
- } catch (UserNotFoundException ex) {
- userNotFoundExceptionThrown = true;
- }
- assertTrue(userNotFoundExceptionThrown);
-
- // Existent user
- repo.addUser(user);
- repo.removeUser(user);
- assertTrue(!repo.hasUser(user));
- }
-
- @Test
- public final void testHasUser() throws DuplicateUserException, StorageException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
-
- // Non existent user
- assertTrue(!repo.hasUser(user));
-
- // Existent user
- repo.addUser(user);
- assertTrue(repo.hasUser(user));
- }
-
- @Test
- public final void testGetQuota() throws StorageException, QuotaNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
-
- // Non existent quota
- boolean quotaNotFoundExceptionThrown = false;
- try {
- repo.getQuota();
- } catch (QuotaNotFoundException ex) {
- quotaNotFoundExceptionThrown = true;
- }
- assertTrue(quotaNotFoundExceptionThrown);
-
- // Existent Quota
- repo.setQuota(Long.MAX_VALUE);
- assertEquals(Long.MAX_VALUE, repo.getQuota());
- }
-
- @Test
- public final void testHasQuota() throws StorageException
- {
- SieveRepository repo = new SieveFileRepository(fs);
-
- // Non existent quota
- assertTrue(!repo.hasQuota());
-
- // Existent quota
- repo.setQuota(Long.MAX_VALUE);
- assertTrue(repo.hasQuota());
- }
-
- @Test
- public final void testRemoveQuota() throws StorageException, QuotaNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
-
- // Non existent quota
- boolean quotaNotFoundExceptionThrown = false;
- try {
- repo.removeQuota();
- } catch (QuotaNotFoundException ex) {
- quotaNotFoundExceptionThrown = true;
- }
- assertTrue(quotaNotFoundExceptionThrown);
-
- // Existent quota
- repo.setQuota(Long.MAX_VALUE);
- repo.removeQuota();
- assertTrue(!repo.hasQuota());
- }
-
- @Test
- public final void testSetQuota() throws QuotaNotFoundException, StorageException
- {
- SieveRepository repo = new SieveFileRepository(fs);
-
- repo.setQuota(Long.MAX_VALUE);
- assertEquals(Long.MAX_VALUE, repo.getQuota());
- }
-
- @Test
- public final void testGetUserQuota() throws StorageException, QuotaNotFoundException, DuplicateUserException, UserNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
-
- // Non existent quota
- boolean quotaNotFoundExceptionThrown = false;
- try {
- repo.getQuota(user);
- } catch (QuotaNotFoundException ex) {
- quotaNotFoundExceptionThrown = true;
- }
- assertTrue(quotaNotFoundExceptionThrown);
-
- // Existent Quota
- repo.setQuota(user, Long.MAX_VALUE);
- assertEquals(Long.MAX_VALUE, repo.getQuota(user));
- }
-
- @Test
- public final void testHasUserQuota() throws StorageException, DuplicateUserException, UserNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
-
- // Non existent quota
- assertTrue(!repo.hasQuota(user));
-
- // Existent quota
- repo.setQuota(user, Long.MAX_VALUE);
- assertTrue(repo.hasQuota(user));
- }
-
- @Test
- public final void testRemoveUserQuota() throws StorageException, QuotaNotFoundException, DuplicateUserException, UserNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
-
- // Non existent quota
- boolean quotaNotFoundExceptionThrown = false;
- try {
- repo.removeQuota(user);
- } catch (QuotaNotFoundException ex) {
- quotaNotFoundExceptionThrown = true;
- }
- assertTrue(quotaNotFoundExceptionThrown);
-
- // Existent quota
- repo.setQuota(user, Long.MAX_VALUE);
- repo.removeQuota(user);
- assertTrue(!repo.hasQuota(user));
- }
-
- @Test
- public final void testSetUserQuota() throws QuotaNotFoundException, StorageException, DuplicateUserException, UserNotFoundException
- {
- SieveRepository repo = new SieveFileRepository(fs);
- String user = "test";
- repo.addUser(user);
-
- repo.setQuota(user, Long.MAX_VALUE);
- assertEquals(Long.MAX_VALUE, repo.getQuota(user));
- }
-
-}
diff --git a/pom.xml b/pom.xml
index f84ff31..2ee41ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,11 +36,11 @@
<inceptionYear>2008</inceptionYear>
<modules>
+ <module>all</module>
<module>core</module>
<module>mailet</module>
+ <module>manager</module>
<module>util</module>
-<!-- <module>manager</module> -->
-<!-- <module>assemble</module> -->
</modules>
<scm>
@@ -88,6 +88,17 @@
<james.www.id>jsieve-website</james.www.id>
<target.jdk>1.5</target.jdk>
<mime4j.version>0.7.2</mime4j.version>
+
+ <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
+ <javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
+ <javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId>
+ <javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
+ <!--
+ <javax.activation.groupId>javax.activation</javax.activation.groupId>
+ <javax.activation.artifactId>activation</javax.activation.artifactId>
+ <javax.mail.groupId>javax.mail</javax.mail.groupId>
+ <javax.mail.artifactId>mail</javax.mail.artifactId>
+ -->
</properties>
<dependencyManagement>
@@ -114,13 +125,54 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-jsieve</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mailet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -183,6 +235,16 @@
<artifactId>activation</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.8.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/src/site/site.xml b/src/site/site.xml
index 01cc2d2..ac87b98 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,7 @@
<body>
<menu name="jSieve">
- <item name="Main" href="http://james.apache.org/jsieve/main/index.html" />
+ <item name="Core" href="http://james.apache.org/jsieve/core/index.html" />
<item name="Mailet" href="http://james.apache.org/jsieve/mailet/index.html" />
<item name="Util" href="http://james.apache.org/jsieve/util/index.html" />
<item name="Changes" href="http://james.apache.org/jsieve/jira-report.html" />
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 54e99c4..6e598d2 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -44,7 +44,7 @@
<p>jSieve consists of three products:</p>
<ol>
<li>
- <a href='main/index.html'>Apache JSieve</a>
+ <a href='core/index.html'>Apache JSieve</a>
is a Sieve library coded in Java.
</li>
<li>
@@ -96,6 +96,14 @@
<p>
The Apache JAMES team is happy to announce the availability of
<a href='http://james.apache.org/download.cgi#Apache%20JSieve'>
+ Apache jSieve 0.5
+ </a>
+ See <a href='https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10412&version=12314991&styleName=Html'>release notes</a>
+ for more details.
+ </p>
+ <p>
+ The Apache JAMES team is happy to announce the availability of
+ <a href='http://james.apache.org/download.cgi#Apache%20JSieve'>
Apache jSieve 0.4
</a>
See <a href='https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10412&styleName=Html&version=12313855'>release notes</a>
diff --git a/util/LICENSE.apache b/util/LICENSE.apache
deleted file mode 100644
index 94d8c58..0000000
--- a/util/LICENSE.apache
+++ /dev/null
@@ -1,176 +0,0 @@
- 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
\ No newline at end of file
diff --git a/util/NOTICE.base b/util/NOTICE.base
deleted file mode 100644
index 76a0011..0000000
--- a/util/NOTICE.base
+++ /dev/null
@@ -1,10 +0,0 @@
- =========================================================================
- == NOTICE file for use with the Apache License, Version 2.0, ==
- =========================================================================
-
- Apache James JSieve Library
- Copyright 2009 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/util/build.xml b/util/build.xml
deleted file mode 100644
index 5f96689..0000000
--- a/util/build.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<!--
-==========================================================================
-
- jSieve build file
-
-
- 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 name='jsieve-util' default="main" basedir=".">
-
- <!--
- Give user a chance to override without editing this file
- (and without typing -D each time he compiles it)
- -->
- <property file=".ant.properties" />
- <property file="${user.home}/.ant.properties" />
- <property file="../include.properties" />
- <property file="../default.properties" />
-
- <path id="mail.class.path">
- <pathelement location='${mail.jar}' />
- <pathelement location='${activation.jar}' />
- </path>
-
- <path id="project.class.path">
- <pathelement location="${commons-logging.jar}" />
- <pathelement location="${log4j.jar}" />
- <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar' />
- <pathelement location="${mailet.jar}" />
- <path refid="mail.class.path" />
- <pathelement path="${java.class.path}" />
- <pathelement path="${build.classes}" />
- </path>
-
- <path id="project.test.class.path">
- <path refid="project.class.path" />
- <pathelement location="${junit.jar}" />
- <pathelement location="${jmock.jar}" />
- </path>
-
- <import file='../build.xml'/>
-
- <target name="main" depends="run-tests" description=" - main target"/>
-
- <target name="prepare" description=" - paparations [internal]">
- <CheckMailConditions/>
- </target>
-
- <target name="compile" depends="prepare" description=" - compiles test and main source">
- <CompileMain>
- <src path="${java.dir}" />
- </CompileMain>
- <CompileTests/>
- </target>
-
- <target name="jar" depends="compile" description=" - jars classes">
- <Jar name='util'/>
- </target>
-
- <target name="run-tests" depends="jar" description=" - runs all tests">
- <RunTests/>
- </target>
-
- <target name="clean" description=" - cleans build files">
- <Clean/>
- </target>
-
- <target name="usage" description=" - prints help">
- <Usage/>
- </target>
-
-</project>
diff --git a/util/pom.xml b/util/pom.xml
index 158a68e..a4a48d6 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -69,13 +69,13 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
<dependency>
