james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r1150640 - in /james/jdkim/trunk: LICENSE NOTICE assemble/src/assemble/bin.xml assemble/src/licensing/ assemble/src/licensing/licenseForApp.txt assemble/src/licensing/noticeForApp.txt main/pom.xml
Date Mon, 25 Jul 2011 11:40:22 GMT
Author: bago
Date: Mon Jul 25 11:40:21 2011
New Revision: 1150640

URL: http://svn.apache.org/viewvc?rev=1150640&view=rev
Log:
Updated main LICENSE/NOTICE and created licenseForApp/noticeForApp for the binary package (JDKIM-29).
Also updated the rat configuration for main library.

Added:
    james/jdkim/trunk/assemble/src/licensing/
    james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt   (with props)
    james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt   (with props)
Modified:
    james/jdkim/trunk/LICENSE
    james/jdkim/trunk/NOTICE
    james/jdkim/trunk/assemble/src/assemble/bin.xml
    james/jdkim/trunk/main/pom.xml

Modified: james/jdkim/trunk/LICENSE
URL: http://svn.apache.org/viewvc/james/jdkim/trunk/LICENSE?rev=1150640&r1=1150639&r2=1150640&view=diff
==============================================================================
--- james/jdkim/trunk/LICENSE (original)
+++ james/jdkim/trunk/LICENSE Mon Jul 25 11:40:21 2011
@@ -176,431 +176,9 @@
    END OF TERMS AND CONDITIONS
    
    
-   
-
 THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
 FOLLOWING LICENSES:
 
-Javax Activation (activation-1.1.1.jar) and Javax Mail (mail-1.4.1.jar) under
-
-	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 Sections 2.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 Section 2.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 Sections 2.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 Section 2.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 recipient's 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 Sections 2.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 Sections 6.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 PARTY'S 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 48 C.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 48 C.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
-	jurisdiction's 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. 	 
-	 
-
-
-dnsjava (http://www.dnsjava.org),
-
-	Copyright (c) 1999-2005, Brian Wellington
-	All rights reserved.
-	
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-	
-	    * Redistributions of source code must retain the above copyright notice,
-	      this list of conditions and the following disclaimer.
-	    * Redistributions in binary form must reproduce the above copyright notice,
-	      this list of conditions and the following disclaimer in the documentation
-	      and/or other materials provided with the distribution.
-	    * Neither the name of the dnsjava project nor the names of its contributors
-	      may be used to endorse or promote products derived from this software
-	      without specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-	ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Mail-DKIM tests are licensed under the Artistic License 1.0
 
   The Artistic License
@@ -717,54 +295,3 @@ Mail-DKIM tests are licensed under the A
 
   The End  
 	 
-ALL OTHERS JARS, BY APACHE SOFTWARE FOUNDATION
-ALL OF THESE ARE LICENSED UNDER The Apache License, Version 2.0 EXCEPT:
-
-Apache Commons Logging, 
-   The Apache Software License, Version 1.1 (commons-logging-1.1.1.jar)
-  
-	 The Apache Software License, Version 1.1
-	
-	 Redistribution and use in source and binary forms, with or without
-	 modification, are permitted provided that the following conditions
-	 are met:
-	
-	 1. Redistributions of source code must retain the above copyright
-	    notice, this list of conditions and the following disclaimer.
-	
-	 2. Redistributions in binary form must reproduce the above copyright
-	    notice, this list of conditions and the following disclaimer in
-	    the documentation and/or other materials provided with the
-	    distribution.
-	
-	 3. The end-user documentation included with the redistribution,
-	    if any, must include the following acknowledgment:
-	       "This product includes software developed by the
-	        Apache Software Foundation (http://www.apache.org/)."
-	    Alternately, this acknowledgment may appear in the software itself,
-	    if and wherever such third-party acknowledgments normally appear.
-	
-	 4. The names "Apache" and "Apache Software Foundation" must
-	    not be used to endorse or promote products derived from this
-	    software without prior written permission. For written
-	    permission, please contact apache@apache.org.
-	
-	 5. Products derived from this software may not be called "Apache",
-	    nor may "Apache" appear in their name, without prior written
-	    permission of the Apache Software Foundation.
-	
-	 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-	 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-	 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-	 DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-	 ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-	 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-	 USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-	 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-	 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-	 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-	 SUCH DAMAGE.
-	
-
-	
\ No newline at end of file

Modified: james/jdkim/trunk/NOTICE
URL: http://svn.apache.org/viewvc/james/jdkim/trunk/NOTICE?rev=1150640&r1=1150639&r2=1150640&view=diff
==============================================================================
--- james/jdkim/trunk/NOTICE (original)
+++ james/jdkim/trunk/NOTICE Mon Jul 25 11:40:21 2011
@@ -8,23 +8,6 @@
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).
    
-   This product may include/use not-yet-commons-ssl library
-   (http://juliusdavies.ca/commons-ssl/) by Julius Davies.
-   
-   not-yet-commons-ssl PKCS12 key derivation function was developed 
-   by BouncyCastle (bouncycastle.org). 
-   (Look for the "pkcs12()" method inside PKCS8.java).
-
-   Some of not-yet-common-ssl library was originally developed by
-   Credit Union Central of British Columbia (http://www.cucbc.com/).
-   The CUCBC code was licensed to the Apache Software Foundation on
-   August 23rd, 2006.
-   
    "main\src\test\resources\org\apache\james\jdkim\Mail-DKIM" folder
    includes test data from the Mail-DKIM perl module licensed under
    the Artistic License 1.0
-   
-   This product may include or use software developed by :
-     - Sun Microsystems (http://java.sun.com/)
-     - Brian Wellington (http://www.dnsjava.org)
-     
\ No newline at end of file

Modified: james/jdkim/trunk/assemble/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/jdkim/trunk/assemble/src/assemble/bin.xml?rev=1150640&r1=1150639&r2=1150640&view=diff
==============================================================================
--- james/jdkim/trunk/assemble/src/assemble/bin.xml (original)
+++ james/jdkim/trunk/assemble/src/assemble/bin.xml Mon Jul 25 11:40:21 2011
@@ -29,12 +29,39 @@
       <directory>..</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>LICENSE</include>
-        <include>NOTICE</include>
         <include>RELEASE_NOTES.txt</include>
       </includes>
     </fileSet>
+
+    <fileSet>
+      <directory>../main/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-jdkim*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../mailets/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-jdkim*.jar</include>
+      </includes>
+    </fileSet>
   </fileSets>
+      
+  <files>
+    <file>
+      <source>src/licensing/noticeForApp.txt</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>NOTICE</destName>
+    </file>
+    <file>
+      <source>src/licensing/licenseForApp.txt</source>
+      <outputDirectory>/</outputDirectory> 
+      <destName>LICENSE</destName>
+    </file>
+  </files>
+    
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib/</outputDirectory>

Added: james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt
URL: http://svn.apache.org/viewvc/james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt?rev=1150640&view=auto
==============================================================================
--- james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt (added)
+++ james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt Mon Jul 25 11:40:21 2011
@@ -0,0 +1,381 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+   
+   
+THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+FOLLOWING LICENSES:
+
+dnsjava (http://www.dnsjava.org),
+
+	Copyright (c) 1999-2005, Brian Wellington
+	All rights reserved.
+	
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	
+	    * Redistributions of source code must retain the above copyright notice,
+	      this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above copyright notice,
+	      this list of conditions and the following disclaimer in the documentation
+	      and/or other materials provided with the distribution.
+	    * Neither the name of the dnsjava project nor the names of its contributors
+	      may be used to endorse or promote products derived from this software
+	      without specific prior written permission.
+	
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+	ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Mail-DKIM tests are licensed under the Artistic License 1.0
+
+  The Artistic License
+  August 15, 1997
+  Preamble
+
+  The intent of this document is to state the conditions under which a Package may 
+  be copied, such that the Copyright Holder maintains some semblance of artistic 
+  control over the development of the package, while giving the users of the 
+  package the right to use and distribute the Package in a more-or-less customary 
+  fashion, plus the right to make reasonable modifications. Definitions
+
+    "Package" refers to the collection of files distributed by the Copyright 
+    Holder, and derivatives of that collection of files created through textual 
+    modification.
+
+    "Standard Version" refers to such a Package if it has not been modified, or 
+    has been modified in accordance with the wishes of the Copyright Holder as 
+    specified below.
+
+    "Copyright Holder" is whoever is named in the copyright or copyrights for 
+    the package.
+
+    "You" is you, if you're thinking about copying or distributing this Package.
+
+    "Reasonable copying fee" is whatever you can justify on the basis of media 
+    cost, duplication charges, time of people involved, and so on. (You will not 
+    be required to justify it to the Copyright Holder, but only to the computing 
+    community at large as a market that must bear the fee.)
+
+    "Freely Available" means that no fee is charged for the item itself, though 
+    there may be fees involved in handling the item. It also means that 
+    recipients of the item may redistribute it under the same conditions they 
+    received it.
+
+   1. You may make and give away verbatim copies of the source form of the 
+   Standard Version of this Package without restriction, provided that you 
+   duplicate all of the original copyright notices and associated disclaimers.
+
+   2. You may apply bug fixes, portability fixes and other modifications derived 
+   from the Public Domain or from the Copyright Holder. A Package modified in 
+   such a way shall still be considered the Standard Version.
+
+   3. You may otherwise modify your copy of this Package in any way, provided 
+   that you insert a prominent notice in each changed file stating how and when 
+   you changed that file, and provided that you do at least ONE of the 
+   following:
+
+         1. place your modifications in the Public Domain or otherwise make them 
+         Freely Available, such as by posting said modifications to Usenet or an 
+         equivalent medium, or placing the modifications on a major archive site 
+         such as uunet.uu.net, or by allowing the Copyright Holder to include 
+         your modifications in the Standard Version of the Package. 2. use the 
+         modified Package only within your corporation or organization. 3. 
+         rename any non-standard executables so the names do not conflict with 
+         standard executables, which must also be provided, and provide a 
+         separate manual page for each non-standard executable that clearly 
+         documents how it differs from the Standard Version. 4. make other 
+         distribution arrangements with the Copyright Holder. 
+
+   4. You may distribute the programs of this Package in object code or 
+   executable form, provided that you do at least ONE of the following:
+
+         1. distribute a Standard Version of the executables and library files, 
+         together with instructions (in the manual page or equivalent) on where 
+         to get the Standard Version. 2. accompany the distribution with the 
+         machine-readable source of the Package with your modifications. 3. give 
+         non-standard executables non-standard names, and clearly document the 
+         differences in manual pages (or equivalent), together with instructions 
+         on where to get the Standard Version. 4. make other distribution 
+         arrangements with the Copyright Holder. 
+
+   5. You may charge a reasonable copying fee for any distribution of this 
+   Package. You may charge any fee you choose for support of this Package. You 
+   may not charge a fee for this Package itself. However, you may distribute 
+   this Package in aggregate with other (possibly commercial) programs as part 
+   of a larger (possibly commercial) software distribution provided that you do 
+   not advertise this Package as a product of your own. You may embed this 
+   Package's interpreter within an executable of yours (by linking); this shall 
+   be construed as a mere form of aggregation, provided that the complete 
+   Standard Version of the interpreter is so embedded.
+
+   6. The scripts and library files supplied as input to or produced as output 
+   from the programs of this Package do not automatically fall under the 
+   copyright of this Package, but belong to whomever generated them, and may be 
+   sold commercially, and may be aggregated with this Package. If such scripts 
+   or library files are aggregated with this Package via the so-called "undump" 
+   or "unexec" methods of producing a binary executable image, then distribution 
+   of such an image shall neither be construed as a distribution of this Package 
+   nor shall it fall under the restrictions of Paragraphs 3 and 4, provided that 
+   you do not represent such an executable image as a Standard Version of this 
+   Package.
+
+   7. C subroutines (or comparably compiled subroutines in other languages) 
+   supplied by you and linked into this Package in order to emulate subroutines 
+   and variables of the language defined by this Package shall not be considered 
+   part of this Package, but are the equivalent of input as in Paragraph 6, 
+   provided these subroutines do not change the language in any way that would 
+   cause it to fail the regression tests for the language.
+
+   8. Aggregation of this Package with a commercial distribution is always 
+   permitted provided that the use of this Package is embedded; that is, when no 
+   overt attempt is made to make this Package's interfaces visible to the end 
+   user of the commercial distribution. Such use shall not be construed as a 
+   distribution of this Package.
+
+   9. The name of the Copyright Holder may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+  10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED 
+  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF 
+  MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. 
+
+  The End  
+	
+	
+not-yet-commons-ssl.jar by Julius Davies released under
+  The Apache License, Version 2.0
+ 
+
+ALL OTHERS JARS, BY APACHE SOFTWARE FOUNDATION
+ALL OF THESE ARE LICENSED UNDER The Apache License, Version 2.0 EXCEPT:
+
+Apache Commons Logging, 
+   The Apache Software License, Version 1.1 (commons-logging-1.1.1.jar)
+  
+	 The Apache Software License, Version 1.1
+	
+	 Redistribution and use in source and binary forms, with or without
+	 modification, are permitted provided that the following conditions
+	 are met:
+	
+	 1. Redistributions of source code must retain the above copyright
+	    notice, this list of conditions and the following disclaimer.
+	
+	 2. Redistributions in binary form must reproduce the above copyright
+	    notice, this list of conditions and the following disclaimer in
+	    the documentation and/or other materials provided with the
+	    distribution.
+	
+	 3. The end-user documentation included with the redistribution,
+	    if any, must include the following acknowledgment:
+	       "This product includes software developed by the
+	        Apache Software Foundation (http://www.apache.org/)."
+	    Alternately, this acknowledgment may appear in the software itself,
+	    if and wherever such third-party acknowledgments normally appear.
+	
+	 4. The names "Apache" and "Apache Software Foundation" must
+	    not be used to endorse or promote products derived from this
+	    software without prior written permission. For written
+	    permission, please contact apache@apache.org.
+	
+	 5. Products derived from this software may not be called "Apache",
+	    nor may "Apache" appear in their name, without prior written
+	    permission of the Apache Software Foundation.
+	
+	 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+	 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+	 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	 DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+	 ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+	 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+	 USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+	 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+	 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+	 SUCH DAMAGE.
+	
+
+	
\ No newline at end of file

Propchange: james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt
URL: http://svn.apache.org/viewvc/james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt?rev=1150640&view=auto
==============================================================================
--- james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt (added)
+++ james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt Mon Jul 25 11:40:21 2011
@@ -0,0 +1,28 @@
+   =========================================================================
+   ==      NOTICE file for use with the Apache License, Version 2.0,      ==
+   =========================================================================
+   
+   Apache JAMES jDKIM
+   Copyright 2009-2010 The Apache Software Foundation
+   
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+   
+   This product include/use not-yet-commons-ssl library
+   (http://juliusdavies.ca/commons-ssl/) by Julius Davies.
+   
+   not-yet-commons-ssl PKCS12 key derivation function was developed 
+   by BouncyCastle (bouncycastle.org). 
+   (Look for the "pkcs12()" method inside PKCS8.java).
+
+   Some of not-yet-common-ssl library was originally developed by
+   Credit Union Central of British Columbia (http://www.cucbc.com/).
+   The CUCBC code was licensed to the Apache Software Foundation on
+   August 23rd, 2006.
+   
+   This product includes test data from the Mail-DKIM perl module 
+   licensed under the Artistic License 1.0
+   
+   This product includes dnsjava developed by Brian Wellington
+   (http://www.dnsjava.org)
+     
\ No newline at end of file

Propchange: james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: james/jdkim/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/james/jdkim/trunk/main/pom.xml?rev=1150640&r1=1150639&r2=1150640&view=diff
==============================================================================
--- james/jdkim/trunk/main/pom.xml (original)
+++ james/jdkim/trunk/main/pom.xml Mon Jul 25 11:40:21 2011
@@ -101,11 +101,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
 
         <plugins>
             <plugin>
@@ -136,24 +131,27 @@
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <!-- test resources created by JAMES committers / we can't include ALv2 headers there -->
+                        <exclude>src/test/resources/org/apache/james/jdkim/corpus/*</exclude>
+                        <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/FAKE_DNS.dat</exclude>
+                        <!-- 3rd party resources described in NOTICE: see the maven-remote-resources-plugin 
+                            configuration, in this file -->
+                        <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/corpus/*</exclude>
+                        <!-- maven / IDE artifacts created during build -->
+                        <exclude>release.properties</exclude>
+                        <exclude>dependency-reduced-pom.xml</exclude>
+                        <exclude>nbactions.xml</exclude>
+                        <exclude>**/.*/**/*</exclude>
+                    </excludes>
+                </configuration>
                 <executions>
                     <execution>
                         <phase>verify</phase>
                         <goals>
                             <goal>check</goal>
                         </goals>
-                        <configuration>
-                            <excludes>
-                                <!-- test resources created by JAMES committers / we can't include ALv2 headers there -->
-                                <exclude>src/test/resources/org/apache/james/jdkim/corpus/*</exclude>
-                                <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/FAKE_DNS.dat</exclude>
-                                <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/corpus/*</exclude>
-                                <exclude>release.properties</exclude>
-                                <exclude>dependency-reduced-pom.xml</exclude>
-                                <exclude>nbactions.xml</exclude>
-                                <exclude>**/.*/**/*</exclude>
-                            </excludes>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -210,7 +208,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- I don't think this is a correct doap configuration, referencing Sieve in a jdkim project ... 
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-doap-plugin</artifactId>
@@ -235,16 +232,21 @@
                  <name>Apache JAMES</name>
                  <standards>
                   <standard>
-                    <id>RFC3028</id>
-                    <title>Sieve: A Mail Filtering Language</title>
+                    <id>DKIM</id>
+                    <title>DomainKeys Identified Mail (DKIM) Signatures</title>
                     <body>IEFT</body>
-                    <url>http://www.ietf.org/rfc/rfc3028.txt</url>
+                    <url>http://www.ietf.org/rfc/rfc4871.txt</url>
+                  </standard>
+                  <standard>
+                    <id>DKIM</id>
+                    <title>DomainKeys Identified Mail (DKIM) Signatures -- Update</title>
+                    <body>IEFT</body>
+                    <url>http://www.ietf.org/rfc/rfc5672.txt</url>
                   </standard>
                  </standards>
                </asfExtOptions>
               </configuration>
             </plugin>
-            -->
             <!-- Shading commons-codec Base64 class so that we don't have one more dependency -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -292,75 +294,6 @@
         </plugins>
     </build>
 
-    <!--
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rat-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!- test resources created by JAMES committers / we can't include ALv2 headers there ->
-                        <exclude>src/test/resources/org/apache/james/jdkim/corpus/*</exclude>
-                        <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/FAKE_DNS.dat</exclude>
-                        <exclude>src/test/resources/org/apache/james/jdkim/Mail-DKIM/corpus/*</exclude>
-                        <exclude>release.properties</exclude>
-                        <exclude>dependency-reduced-pom.xml</exclude>
-                        <exclude>nbactions.xml</exclude>
-                        <exclude>**/.*/**/*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <targetjdk>1.5</targetjdk>
-                    <rulesets>
-                        <ruleset>/rulesets/basic.xml</ruleset>
-                        <ruleset>/rulesets/controversial.xml</ruleset>
-                    </rulesets>
-                    <format>xml</format>
-                    <linkXref>true</linkXref>
-                    <sourceEncoding>utf-8</sourceEncoding>
-                    <minimumTokens>100</minimumTokens>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>2.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.4</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>emma-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-        </plugins>
-    </reporting>
-    -->
-
     <mailingLists>
         <mailingList>
             <name>Apache James User</name>



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


Mime
View raw message