[javamail~mercurial:552] Another try at getting "publish" to work right".

From: <shannon_at_java.net>
Date: Thu, 4 Apr 2013 06:45:50 +0000

Project: javamail
Repository: mercurial
Revision: 552
Author: shannon
Date: 2013-04-04 04:25:35 UTC
Link:

Log Message:
------------
updates in preparation for the JavaMail 1.5 release;
restructure assemblies for new publishing process;
remove content no longer needed
Run the assembly plugin in the package phase.
Exclude some FindBugs errors.
Another try at getting "publish" to work right".

Revisions:
----------
549
550
551
552

Modified Paths:
---------------
doc/release/README.txt
pom.xml
publish/pom.xml
mail/exclude.xml

Added Paths:
------------
publish/pom.xml
publish/publish.xml
publish/samples.xml

Diffs:
------
diff -r 700ae6fd4a6c -r cbe12c8ad0f8 assembly.xml
--- a/assembly.xml Fri Mar 29 14:04:23 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-
-<assembly>
- <formats>
- <format>zip</format>
- </formats>
- <baseDirectory>javamail-${mail.version}</baseDirectory>
- <moduleSets>
- 
- <moduleSet>
- <includes>
- <include>com.sun.mail:javax.mail</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <outputFileNameMapping>
- mail.jar
- </outputFileNameMapping>
- </binaries>
- </moduleSet>
-
- 
- <moduleSet>
- <includes>
- <include>com.sun.mail:mailapi</include>
- <include>com.sun.mail:smtp</include>
- <include>com.sun.mail:imap</include>
- <include>com.sun.mail:pop3</include>
- <include>com.sun.mail:dsn</include>
- <include>com.sun.mail:gimap</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>
- ${module.artifactId}.${module.extension}
- </outputFileNameMapping>
- </binaries>
- </moduleSet>
-
- 
- <moduleSet>
- <includes>
- <include>com.sun.mail:demo</include>
- </includes>
- <sources>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>internal/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>com.sun.mail:client</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>demo/client</outputDirectory>
- <excludes>
- <exclude>internal/**</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>com.sun.mail:servlet</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>demo/servlet</outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>com.sun.mail:webapp</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>
- demo/webapp/src/classes
- </outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/webapp</directory>
- <outputDirectory>
- demo/webapp/src/docroot
- </outputDirectory>
- </fileSet>
- <fileSet>
- <directory></directory>
- <outputDirectory>demo/webapp</outputDirectory>
- <includes>
- <include>build.*</include>
- <include>webapp.README.txt</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>com.sun.mail:taglib</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>
- demo/webapp/src/taglib
- </outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory>
- demo/webapp/src/taglib
- </outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>com.sun.mail:logging</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>demo/logging</outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- <moduleSet>
- <includes>
- <include>com.sun.mail:outlook</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>src/main/java</directory>
- <outputDirectory>demo/outlook</outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- </moduleSets>
-
- 
- <fileSets>
- <fileSet>
- <directory>doc/release</directory>
- <outputDirectory></outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>*.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>doc/spec</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- 
- <directory>/net/anybodys.us.oracle.com/export6/javamail/spec</directory>
- <outputDirectory>docs</outputDirectory>
- <includes>
- <include>JavaMail-1.5.pdf</include>
- <include>Providers.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>javadoc/target/site/apidocs</directory>
- <outputDirectory>docs/javadocs</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>

diff -r 700ae6fd4a6c -r cbe12c8ad0f8 doc/release/COPYRIGHT.txt
--- a/doc/release/COPYRIGHT.txt Fri Mar 29 14:04:23 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-Copyright © 1997-2012, Oracle and/or its affiliates. All rights reserved.
-
-This software and related documentation are provided under a license
-agreement containing restrictions on use and disclosure and are
-protected by intellectual property laws. Except as expressly permitted
-in your license agreement or allowed by law, you may not use, copy,
-reproduce, translate, broadcast, modify, license, transmit, distribute,
-exhibit, perform, publish, or display any part, in any form, or by any
-means. Reverse engineering, disassembly, or decompilation of this
-software, unless required by law for interoperability, is prohibited.
-
-The information contained herein is subject to change without notice
-and is not warranted to be error-free. If you find any errors, please
-report them to us in writing.
-
-If this is software or related software documentation that is delivered
-to the U.S. Government or anyone licensing it on behalf of the U.S.
-Government, the following notice is applicable:
-
-U.S. GOVERNMENT RIGHTS Programs, software, databases, and related
-documentation and technical data delivered to U.S. Government customers
-are "commercial computer software" or "commercial technical data"
-pursuant to the applicable Federal Acquisition Regulation and
-agency-specific supplemental regulations. As such, the use,
-duplication, disclosure, modification, and adaptation shall be subject
-to the restrictions and license terms set forth in the applicable
-Government contract, and, to the extent applicable by the terms of the
-Government contract, the additional rights set forth in FAR 52.227-19,
-Commercial Computer Software License (December 2007). Oracle America,
-Inc., 500 Oracle Parkway, Redwood City, CA 94065.
-
-This software or hardware is developed for general use in a variety of
-information management applications. It is not developed or intended
-for use in any inherently dangerous applications, including
-applications which may create a risk of personal injury. If you use
-this software or hardware in dangerous applications, then you shall be
-responsible to take all appropriate fail-safe, backup, redundancy, and
-other measures to ensure its safe use. Oracle Corporation and its
-affiliates disclaim any liability for any damages caused by use of this
-software or hardware in dangerous applications.
-
-Oracle and Java are registered trademarks of Oracle and/or its
-affiliates. Other names may be trademarks of their respective owners.
-
-AMD, Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
-registered trademarks of Advanced Micro Devices. Intel and Intel Xeon
-are trademarks or registered trademarks of Intel Corporation. All SPARC
-trademarks are used under license and are trademarks or registered
-trademarks of SPARC International, Inc. UNIX is a registered trademark
-licensed through X/Open Company, Ltd.
-
-This software or hardware and documentation may provide access to or
-information on content, products, and services from third parties.
-Oracle Corporation and its affiliates are not responsible for and
-expressly disclaim all warranties of any kind with respect to
-third-party content, products, and services. Oracle Corporation and its
-affiliates will not be responsible for any loss, costs, or damages
-incurred due to your access to or use of third-party content, products,
-or services.

diff -r 700ae6fd4a6c -r cbe12c8ad0f8 doc/release/LICENSE.txt
--- a/doc/release/LICENSE.txt Fri Mar 29 14:04:23 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,337 +0,0 @@
-Oracle Corporation ("ORACLE") ENTITLEMENT for SOFTWARE
-
-Licensee/Company: Entity receiving Software.
-
-Effective Date: Date of delivery of the Software to You.
-
-Software: JavaMail ${mail.version}
-
-License Term: Perpetual (subject to termination under the SLA).
-
-Licensed Unit: Software Copy.
-
-Licensed unit Count: Unlimited.
-
-Permitted Uses:
-
-1. You may reproduce and use the Software for Your own Individual,
-Commercial and Research and Instructional Use only for the purposes of
-designing, developing, testing, and running Your applets and
-applications ("Programs").
-
-2. Subject to the terms and conditions of this Agreement and
-restrictions and exceptions set forth in the Software's documentation,
-You may reproduce and distribute portions of Software identified as a
-redistributable in the documentation (each a "Redistributable"),
-provided that You comply with the following (note that You may be
-entitled to reproduce and distribute other portions of the Software not
-defined in the documentation as a Redistributable under certain other
-licenses as described in the THIRDPARTYLICENSEREADME, if applicable):
-
-(a) You distribute Redistributable complete and unmodified and only
-bundled as part of Your Programs,
-
-(b) Your Programs add significant and primary functionality to the
-Redistributable,
-
-(c) You distribute Redistributable for the sole purpose of running Your
-Programs,
-
-(d) You do not distribute additional software intended to replace any
-component(s) of the Redistributable,
-
-(e) You do not remove or alter any proprietary legends or notices
-contained in or on the Redistributable.
-
-(f) You only distribute the Redistributable subject to a license
-agreement that protects Oracle's interests consistent with the terms
-contained in this Agreement, and
-
-(g) You agree to defend and indemnify Oracle and its licensors from and
-against any damages, costs, liabilities, settlement amounts and/or
-expenses (including attorneys' fees) incurred in connection with any
-claim, lawsuit or action by any third party that arises or results from
-the use or distribution of any and all Programs and/or
-Redistributable.
-
-3. Java Technology Restrictions. You may not create, modify, or change
-the behavior of, or authorize Your licensees to create, modify, or
-change the behavior of, classes, interfaces, or subpackages that are in
-any way identified as "java", "javax", "sun" or similar convention as
-specified by Oracle in any naming convention designation.
-
-4. No Diagnostic, Maintenance, Repair or Technical Support Services.
-The scope of Your license does not include any right, express or
-implied, (i) to access, copy, distribute, display or use the Software
-to provide diagnostic, maintenance, repair or technical support
-services for Oracle software or Oracle hardware on behalf of any third party
-for Your direct or indirect commercial gain or advantage, without Oracle's
-prior written authorization, or (ii) for any third party to access,
-copy, distribute, display or use the Software to provide diagnostic,
-maintenance, repair or technical support services for Oracle software or
-Oracle hardware on Your behalf for such party's direct or indirect
-commercial gain or advantage, without Oracle's prior written
-authorization. The limitations set forth in this paragraph apply to any
-and all error corrections, patches, updates, and upgrades to the
-Software You may receive, access, download or otherwise obtain from
-Oracle.
-
-5. Records and Documentation. During the term of the SLA and
-Entitlement, and for a period of three (3) years thereafter, You agree
-to keep proper records and documentation of Your compliance with the
-SLA and Entitlement. Upon Oracle's reasonable request, You will provide
-copies of such records and documentation to Oracle for the purpose of
-confirming Your compliance with the terms and conditions of the SLA and
-Entitlement. This section will survive any termination of the SLA and
-Entitlement. You may terminate this SLA and Entitlement at any time by
-destroying all copies of the Software in which case the obligations set
-forth in Section 7 of the SLA shall apply.
-
-
-Oracle Corporation ("ORACLE")
-SOFTWARE LICENSE AGREEMENT
-
-READ THE TERMS OF THIS AGREEMENT ("AGREEMENT") CAREFULLY BEFORE OPENING
-SOFTWARE MEDIA PACKAGE. BY OPENING SOFTWARE MEDIA PACKAGE, YOU AGREE TO
-THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING SOFTWARE
-ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
-THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE
-TO ALL OF THE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
-OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS ACCESSED ELECTRONICALLY,
-SELECT THE "DECLINE" (OR "EXIT") BUTTON AT THE END OF THIS AGREEMENT.
-IF YOU HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER TERMS") FOR
-YOUR LICENSE TO THIS SOFTWARE, THEN SECTIONS 1-6 OF THIS AGREEMENT
-("SUPPLEMENTAL LICENSE TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE
-MASTER TERMS IN RELATION TO THIS SOFTWARE.
-
-1. Definitions.
-
-(a) "Entitlement" means the collective set of applicable documents
-authorized by Oracle evidencing your obligation to pay associated fees (if
-any) for the license, associated Services, and the authorized scope of
-use of Software under this Agreement.
-
-(b) "Licensed Unit" means the unit of measure by which your use of
-Software and/or Service is licensed, as described in your Entitlement.
-
-(c) "Permitted Use" means the licensed Software use(s) authorized
-in this Agreement as specified in your Entitlement. The Permitted Use
-for any bundled Oracle software not specified in your Entitlement will be
-evaluation use as provided in Section 3.
-
-(d) "Service" means the service(s) that Oracle or its delegate will
-provide, if any, as selected in your Entitlement and as further
-described in the applicable service listings at
-www.sun.com/service/servicelist.
-
-(e) "Software" means the Oracle software described in your
-Entitlement. Also, certain software may be included for evaluation use
-under Section 3.
-
-(f) "You" and "Your" means the individual or legal entity specified
-in the Entitlement, or for evaluation purposes, the entity performing
-the evaluation.
-
-2. License Grant and Entitlement.
-
-Subject to the terms of your Entitlement, Oracle grants you a
-nonexclusive, nontransferable limited license to use Software for its
-Permitted Use for the license term. Your Entitlement will specify (a)
-Software licensed, (b) the Permitted Use, (c) the license term, and (d)
-the Licensed Units.
-
-Additionally, if your Entitlement includes Services, then it will also
-specify the (e) Service and (f) service term.
-
-If your rights to Software or Services are limited in duration and the
-date such rights begin is other than the purchase date, your
-Entitlement will provide that beginning date(s).
-
-The Entitlement may be delivered to you in various ways depending on
-the manner in which you obtain Software and Services, for example, the
-Entitlement may be provided in your receipt, invoice or your contract
-with Oracle or authorized Oracle reseller. It may also be in electronic
-format if you download Software.
-
-3. Permitted Use.
-
-As selected in your Entitlement, one or more of the following Permitted
-Uses will apply to your use of Software. Unless you have an Entitlement
-that expressly permits it, you may not use Software for any of the
-other Permitted Uses. If you don't have an Entitlement, or if your
-Entitlement doesn't cover additional software delivered to you, then
-such software is for your Evaluation Use.
-
-(a) Evaluation Use. You may evaluate Software internally for a period
-of 90 days from your first use.
-
-(b) Research and Instructional Use. You may use Software internally to
-design, develop and test, and also to provide instruction on such
-uses.
-
-(c) Individual Use. You may use Software internally for personal,
-individual use.
-
-(d) Commercial Use. You may use Software internally for your own
-commercial purposes.
-
-(e) Service Provider Use. You may make Software functionality
-accessible (but not by providing Software itself or through outsourcing
-services) to your end users in an extranet deployment, but not to your
-affiliated companies or to government agencies.
-
-4. Licensed Units.
-
-Your Permitted Use is limited to the number of Licensed Units stated in
-your Entitlement. If you require additional Licensed Units, you will
-need additional Entitlement(s).
-
-5. Restrictions.
-
-(a) The copies of Software provided to you under this Agreement are
-licensed, not sold, to you by Oracle. Oracle reserves all rights not
-expressly granted. (b) You may make a single archival copy of Software,
-but otherwise may not copy, modify, or distribute Software. However if
-the Oracle documentation accompanying Software lists specific portions of
-Software, such as header files, class libraries, reference source code,
-and/or redistributable files, that may be handled differently, you may
-do so only as provided in the Oracle documentation. (c) You may not rent,
-lease, lend or encumber Software. (d) Unless enforcement is prohibited
-by applicable law, you may not decompile, or reverse engineer Software.
-(e) The terms and conditions of this Agreement will apply to any
-Software updates, provided to you at Oracle's discretion, that replace
-and/or supplement the original Software, unless such update contains a
-separate license. (f) You may not publish or provide the results of any
-benchmark or comparison tests run on Software to any third party
-without the prior written consent of Oracle. (g) Software is confidential
-and copyrighted. (h) Unless otherwise specified, if Software is
-delivered with embedded or bundled software that enables functionality
-of Software, you may not use such software on a stand-alone basis or
-use any portion of such software to interoperate with any program(s)
-other than Software. (i) Software may contain programs that perform
-automated collection of system data and/or automated software updating
-services. System data collected through such programs may be used by
-Oracle, its subcontractors, and its service delivery partners for the
-purpose of providing you with remote system services and/or improving
-Oracle's software and systems. (j) Software is not designed, licensed or
-intended for use in the design, construction, operation or maintenance
-of any nuclear facility and Oracle and its licensors disclaim any express
-or implied warranty of fitness for such uses. (k) No right, title or
-interest in or to any trademark, service mark, logo or trade name of
-Oracle or its licensors is granted under this Agreement.
-
-6. Java Compatibility and Open Source.
-
-Software may contain Java technology. You may not create additional
-classes to, or modifications of, the Java technology, except under
-compatibility requirements available under a separate agreement
-available at www.java.net.
-
-Oracle supports and benefits from the global community of open source
-developers, and thanks the community for its important contributions
-and open standards-based technology, which Oracle has adopted into many of
-its products.
-
-Please note that portions of Software may be provided with notices and
-open source licenses from such communities and third parties that
-govern the use of those portions, and any licenses granted hereunder do
-not alter any rights and obligations you may have under such open
-source licenses, however, the disclaimer of warranty and limitation of
-liability provisions in this Agreement will apply to all Software in
-this distribution.
-
-7. Term and Termination.
-
-The license and service term are set forth in your Entitlement(s). Your
-rights under this Agreement will terminate immediately without notice
-from Oracle if you materially breach it or take any action in derogation
-of Oracle's and/or its licensors' rights to Software. Oracle may terminate
-this Agreement should any Software become, or in Oracle's reasonable
-opinion likely to become, the subject of a claim of intellectual
-property infringement or trade secret misappropriation. Upon
-termination, you will cease use of, and destroy, Software and confirm
-compliance in writing to Oracle. Sections 1, 5, 6, 7, and 9-15 will
-survive termination of the Agreement.
-
-8. Limited Warranty.
-
-Oracle warrants to you that for a period of 90 days from the date of
-purchase, as evidenced by a copy of the receipt, the media on which
-Software is furnished (if any) will be free of defects in materials and
-workmanship under normal use. Except for the foregoing, Software is
-provided "AS IS". Your exclusive remedy and Oracle's entire liability
-under this limited warranty will be at Oracle's option to replace Software
-media or refund the fee paid for Software. Some states do not allow
-limitations on certain implied warranties, so the above may not apply
-to you. This limited warranty gives you specific legal rights. You may
-have others, which vary from state to state.
-
-9. Disclaimer of Warranty.
-
-UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT
-ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO
-BE LEGALLY INVALID.
-
-10. Limitation of Liability.
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE OR ITS
-LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
-SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
-HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR
-RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF ORACLE HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Oracle's
-liability to you, whether in contract, tort (including negligence), or
-otherwise, exceed the amount paid by you for Software under this
-Agreement. The foregoing limitations will apply even if the above
-stated warranty fails of its essential purpose. Some states do not
-allow the exclusion of incidental or consequential damages, so some of
-the terms above may not be applicable to you.
-
-11. Export Regulations.
-
-All Software, documents, technical data, and any other materials
-delivered under this Agreement are subject to U.S. export control laws
-and may be subject to export or import regulations in other countries.
-You agree to comply strictly with these laws and regulations and
-acknowledge that you have the responsibility to obtain any licenses to
-export, re-export, or import as may be required after delivery to you.
-
-12. U.S. Government Restricted Rights.
-
-If Software is being acquired by or on behalf of the U.S. Government or
-by a U.S. Government prime contractor or subcontractor (at any tier),
-then the Government's rights in Software and accompanying documentation
-will be only as set forth in this Agreement; this is in accordance with
-48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD)
-acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD
-acquisitions).
-
-13. Governing Law.
-
-Any action related to this Agreement will be governed by California law
-and controlling U.S. federal law. No choice of law rules of any
-jurisdiction will apply.
-
-14. Severability.
-
-If any provision of this Agreement is held to be unenforceable, this
-Agreement will remain in effect with the provision omitted, unless
-omission would frustrate the intent of the parties, in which case this
-Agreement will immediately terminate.
-
-15. Integration.
-
-This Agreement, including any terms contained in your Entitlement, is
-the entire agreement between you and Oracle relating to its subject
-matter. It supersedes all prior or contemporaneous oral or written
-communications, proposals, representations and warranties and prevails
-over any conflicting or additional terms of any quote, order,
-acknowledgment, or other communication between the parties relating to
-its subject matter during the term of this Agreement. No modification
-of this Agreement will be binding, unless in writing and signed by an
-authorized representative of each party.
-
-For inquiries please contact: Oracle Corporation, 500 Oracle Parkway,
-Redwood Shores, California 94065, USA.

diff -r 700ae6fd4a6c -r cbe12c8ad0f8 doc/release/README.txt
--- a/doc/release/README.txt Fri Mar 29 14:04:23 2013 -0700
+++ b/doc/release/README.txt Wed Apr 03 15:50:08 2013 -0700
@@ -14,8 +14,8 @@
JDK Version notes
-----------------

-The JavaMail API supports JDK 1.4 or higher. Note that we have
-currently tested this implementation with JDK 1.4, 1.5, and 1.6.
+The JavaMail API supports JDK 1.5 or higher. Note that we have
+currently tested this implementation with JDK 1.5, 1.6, and 1.7.

While JavaMail will work with JAF 1.0.2, we recommend the use of JAF 1.1
or newer. JAF 1.1.1 is currently the newest version. Note that JAF 1.1
@@ -50,99 +50,20 @@
for the latest information on third party protocol providers.

-Contents
+Download
--------

- Included in this release are the following:
+See the JavaMail project page to download this release.

- README.txt this file
- LICENSE.txt Software license
- NOTES.txt Notes, issues and known bugs
- SSLNOTES.txt Notes on using SSL/TLS with JavaMail
- CHANGES.txt Changes since the previous release
- COMPAT.txt Important notes about compatibility
- mail.jar The JavaMail API and all service providers,
- most users need *only* this jar file
- lib/mailapi.jar The JavaMail API with no service providers
- lib/imap.jar The IMAP service provider
- lib/smtp.jar The SMTP service provider
- lib/pop3.jar The POP3 service provider
- lib/dsn.jar multipart/report DSN message support
- lib/gimap.jar Gmail IMAP provider
-
- docs/JavaMail-1.1-changes.txt
- Description of the new APIs that were added in
- JavaMail API 1.1
- docs/JavaMail-1.2-changes.txt
- Description of the new APIs that were added in
- JavaMail API 1.2
- docs/JavaMail-1.3-changes.txt
- Description of the new APIs that were added in
- JavaMail API 1.3
- docs/JavaMail-1.4-changes.txt
- Description of the new APIs that were added in
- JavaMail API 1.4
- docs/JavaMail-1.2.ps
- Postscript version of the JavaMail API 1.2 specification
- docs/JavaMail-1.2.pdf
- PDF version of the JavaMail API 1.2 specification
- docs/Providers.ps
- Postscript version of the JavaMail Service Provider
- guide.
- docs/Providers.pdf
- PDF version of the JavaMail Service Provider guide.
-
- docs/javadocs/ The JavaMail API javadocs
-
- demo/README.txt Instructions for running the demo programs
- demo/CRLFOutputStream.java
- demo OutputStream filter to convert all line terminators
- to CRLF
- demo/NewlineOutputStream.java
- demo OutputStream filter to convert all line terminators
- to platform's line terminator
- demo/copier.java demo program to copy mail between folders
- demo/folderlist.java demo program to list subfolders
- demo/monitor.java demo program to monitor for new mail
- demo/mover.java demo program to move mail between folders
- demo/msgmultisendsample.java
- demo program to send a sample multipart message
- demo/msgsend.java demo program to send a single part text message
- to a specified recipient (ala /bin/mail)
- demo/msgsendsample.java
- demo program to send a sample single part text message
- demo/msgshow.java demo program to read messages from an IMAP store
- demo/namespace.java demo program that illustrates use of namespace APIs
- demo/populate.java demo program that copies entire folder hierarchies
- demo/registry.java demo program that illustrates the registry
- demo/search.java demo program to search folders
- demo/sendfile.java demo program to send a file as an attachment
- demo/sendhtml.java demo program to send html mail
- demo/smtpsend.java demo program to illustrate handling SMTP error codes
- demo/transport.java demo program to illustrate use of Transport
- demo/uidmsgshow.java
- demo program to read messages from an IMAP store
- demo/client/ source files for cool demo program that implements
- a simple mail reader. (Uses Swing)
- demo/client/README.txt
- README file for running the simple mail-reader demo
- demo/servlet/ source for a simple servlet that allows using a
- web browser to read and send mail
- demo/servlet/README.txt
- README file that describes the JavaMailServlet
- demo/logging/ source files for demo program showing use of the
- com.sun.mail.util.logging.MailHandler class
- demo/outlook/ source files for demo classes showing how to handle
- old non-MIME messages generated by Outlook
+ http://javamail.java.net

Requirements
------------

Note that the JavaMail API requires the JavaBeans(TM) Activation
-Framework package to be installed as well if you're using JDK 1.5
-or earlier. Download the latest version of the JavaBeans Activation
-Framework from
+Framework package to be installed as well if you're using JDK 1.5.
+Download the latest version of the JavaBeans Activation Framework from

         http://www.oracle.com/technetwork/java/javase/index-jsp-136939.html

@@ -155,87 +76,87 @@
   UNIX/Linux
   ----------

- 1. Unzip the javamail${mail.zipversion}.zip archive.
- (You may have already done this.)
+ 1. Download the javax.mail.jar file from the JavaMail project website.
+ http://java.net/projects/javamail/downloads/download/javax.mail.jar

- 2. Set your CLASSPATH to include the "mail.jar" file obtained from
- the download, as well as the current directory.
+ 2. Set your CLASSPATH to include the "javax.mail.jar" file obtained from
+ the download, as well as the current directory.

- Assuming you unzipped javamail${mail.zipversion}.zip in /u/me/download/ the
- following would work:
+ Assuming you have downloaded javax.mail.jar to the /u/me/download/
+ directory, the following would work:

- export CLASSPATH=$CLASSPATH:/u/me/download/javamail-${mail.version}/mail.jar:.
+ export CLASSPATH=$CLASSPATH:/u/me/download/javax.mail.jar:.

- Also, if you're using JDK 1.5 or earlier, include the
- "activation.jar" file that you obtained from downloading the
- JavaBeans Activation Framework, in your CLASSPATH. For example:
+ (Don't forget the trailing "." for the current directory.)
+ Also, if you're using JDK 1.5, include the "activation.jar" file that you
+ obtained from downloading the JavaBeans Activation Framework. For example:

       export CLASSPATH=$CLASSPATH:/u/me/download/activation/activation.jar

-
- 3. Go to the demo directory
+ 3. Download the javamail-samples.zip file from the project website.
+ http://java.net/projects/javamail/downloads/download/javamail-samples.zip

- 4. Compile any demo using your Java compiler. For example:
+ 4. Compile any sample program using your Java compiler. For example:

       javac msgshow.java

- 5. Run the demo. The '-' option lists the required and optional
- command-line options to successfully run any demo. For example:
+ 5. Run the sample program. The '-' option lists the required and optional
+ command-line options to successfully run any sample. For example:

       java msgshow -
-
- lists the available options. And
+
+ lists the available options. And

       java msgshow -T imap -H <mailserver> -U <username> -P <passwd> -f INBOX 5
-
+
     uses the IMAP protocol to display message number 5 from your INBOX.

- (Additional instructions on how to run the simple mail reader demo
- and servlet demo are provided in demo/client/README.txt and
- demo/servlet/README.txt, respectively.)
+ (Additional instructions on how to run the simple mail reader sample
+ and servlet sample are provided in client/README.txt and servlet/README.txt,
+ respectively.)

   Windows
   -------

- 1. Unzip the javamail${mail.zipversion}.zip archive.
- (You may have already done this.)
+ 1. Download the javax.mail.jar file from the JavaMail project website.
+ http://java.net/projects/javamail/downloads/download/javax.mail.jar

- 2. Set your CLASSPATH to include the "mail.jar" file obtained from
- the download, as well as the current directory.
+ 2. Set your CLASSPATH to include the "javax.mail.jar" file obtained from
+ the download, as well as the current directory.

- Assuming you unzipped javamail${mail.zipversion}.zip in c:\download the
- following would work:
-
- set CLASSPATH=%CLASSPATH%;c:\download\javamail-${mail.version}\mail.jar;.
+ Assuming you have downloaded javax.mail.jar to the /u/me/download/
+ directory, the following would work:

- Also, if you're using JDK 1.5 or earlier, include the
- "activation.jar" file that you obtained from downloading the
- JavaBeans Activation Framework, in your CLASSPATH.
+ set CLASSPATH=%CLASSPATH%;c:\download\javax.mail.jar;.
+
+ (Don't forget the trailing "." for the current directory.)
+ Also, if you're using JDK 1.5, include the "activation.jar" file that you
+ obtained from downloading the JavaBeans Activation Framework. For example:

       set CLASSPATH=%CLASSPATH%;c:\download\activation\activation.jar
-
- 3. Go to the demo directory

- 4. Compile any demo using your Java compiler. For example:
+ 3. Download the javamail-samples.zip file from the project website.
+ http://java.net/projects/javamail/downloads/download/javamail-samples.zip
+
+ 4. Compile any sample program using your Java compiler. For example:

       javac msgshow.java

- 5. Run the demo. The '-' option lists the required and optional
- command-line options to successfully run any demo. For example:
+ 5. Run the sample program. The '-' option lists the required and optional
+ command-line options to successfully run any sample. For example:

       java msgshow -

- lists the available options. And
+ lists the available options. And

       java msgshow -T imap -H <mailserver> -U <username> -P <passwd> -f INBOX 5
-
+
     uses the IMAP protocol to display message number 5 from your INBOX.

-
- (Additional instructions on how to run the simple mail reader demo
- and servlet demo are provided in demo/client/README.txt and
- demo/servlet/README.txt, respectively.)
+ (Additional instructions on how to run the simple mail reader sample
+ and servlet sample are provided in client/README.txt and servlet/README.txt,
+ respectively.)

Problems?

diff -r 700ae6fd4a6c -r cbe12c8ad0f8 doc/release/distributionREADME.txt
--- a/doc/release/distributionREADME.txt Fri Mar 29 14:04:23 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-DistributionREADME
-
-DISTRIBUTION BY DEVELOPERS. Subject to the terms and conditions of the
-Software License Agreement and the obligations, restrictions, and
-exceptions set forth below, You may reproduce and distribute the
-portions of Software identified below ("each a Redistributable"),
-provided that You comply with the following (note that You may be
-entitled to reproduce and distribute other portions of the Software not
-defined here as a Redistributable under certain other licenses as
-described in the THIRDPARTYLICENSEREADME, if applicable):
-
-(a) You distribute the Redistributable complete and unmodified and only
-bundled as part of Your applets and applications ("Programs"),
-
-(b) Your Programs add significant and primary functionality to the
-Software
-
-(c) You distribute Redistributable for the sole purpose of running Your
-Programs,
-
-(d) You do not distribute additional software intended to replace any
-component(s) of the Redistributable,
-
-(e) You do not remove or alter any proprietary legends or notices
-contained in or on the Redistributable.
-
-(f) You only distribute the Redistributable subject to a license
-agreement that protects Oracle's interests consistent with the terms
-contained in the Software License Agreement, and
-
-(g) You agree to defend and indemnify Oracle and its licensors from and
-against any damages, costs, liabilities, settlement amounts and/or
-expenses (including attorneys' fees) incurred in connection with any
-claim, lawsuit or action by any third party that arises or results from
-the use or distribution of any and all Programs and/or
-Redistributable.
-
-The following files are each a Redistributable:
-
-mail.jar
-lib/mailapi.jar
-lib/imap.jar
-lib/smtp.jar
-lib/pop3.jar
-lib/dsn.jar

diff -r 700ae6fd4a6c -r cbe12c8ad0f8 pom.xml
--- a/pom.xml Fri Mar 29 14:04:23 2013 -0700
+++ b/pom.xml Wed Apr 03 15:50:08 2013 -0700
@@ -57,12 +57,12 @@
     <version>1.5.0-SNAPSHOT</version>
     <name>JavaMail API distribution</name>
     <description>${project.name}</description>
- <url>http://kenai.com/projects/javamail</url>
+ <url>http://javamail.java.net</url>

     <scm>
- <connection>scm:hg:http://kenai.com/hg/javamail~mercurial</connection>
- <developerConnection>scm:hg:https://kenai.com/hg/javamail~mercurial</developerConnection>
- <url>http://kenai.com/hg/javamail~mercurial</url>
+ <connection>scm:hg:http://java.net/hg/javamail~mercurial</connection>
+ <developerConnection>scm:hg:https://java.net/hg/javamail~mercurial</developerConnection>
+ <url>http://java.net/hg/javamail~mercurial</url>
     </scm>

     <issueManagement>
@@ -72,16 +72,10 @@

     <licenses>
       <license>
- <name>CDDL</name>
- <url>http://www.sun.com/cddl</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- <license>
- <name>GPLv2+CE</name>
+ <name>CDDL/GPLv2+CE</name>
         <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
         <distribution>repo</distribution>
- <comments>GPL version 2 plus the Classpath Exception</comments>
+ <comments>CDDL or GPL version 2 plus the Classpath Exception</comments>
       </license>
     </licenses>

@@ -552,38 +546,6 @@
                 </configuration>
             </plugin>

- 
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- 
- <configuration>
- <finalName>javamail${mail.zipversion}</finalName>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- 
- </plugin>
-

+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>all</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>publish</artifactId>
+ <packaging>pom</packaging>
+ <version>1.5.0-SNAPSHOT</version>
+ <name>JavaMail API publish project</name>
+
+ <build>
+ <plugins>
+ 
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ 
+ <configuration>
+ <finalName>javamail${mail.zipversion}</finalName>
+ <descriptors>
+ <descriptor>publish.xml</descriptor>
+ <descriptor>samples.xml</descriptor>
+ </descriptors>
+ </configuration>
+ 
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>demo</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>client</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>servlet</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>webapp</artifactId>
+ <type>war</type>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>taglib</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>logging</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>outlook</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>

diff -r 700ae6fd4a6c -r cbe12c8ad0f8 publish/publish.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/publish/publish.xml Wed Apr 03 15:50:08 2013 -0700
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+
+<assembly>
+ <id>publish</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ 
+ <dependencySet>
+ <includes>
+ <include>com.sun.mail:javax.mail</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <outputFileNameMapping>
+ javax.mail.jar
+ </outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+
+ 
+ <fileSets>
+ <fileSet>
+ <directory>../doc/release</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../doc/spec</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../javadoc/target/site/apidocs</directory>
+ <outputDirectory>docs/api</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>

di
[truncated due to length]