commits@javamail.java.net

[mercurial:118] fix for new assembly plugin; include license file

From: <shannon_at_kenai.com>
Date: Mon, 9 Feb 2009 19:41:03 +0000 (GMT)

Repository: mercurial
Revision: 118
Author: Bill Shannon <bill.shannon_at_sun.com>
Date: 2009-02-06 22:51:43 UTC

Log Message:
-----------
fix for new assembly plugin; include license file

Modified Paths:
--------------
    mbox/dist/assembly.xml

Diffs:
-----
diff -r f0fc305ed895 -r 67adb9f35afa mbox/dist/assembly.xml
--- a/mbox/dist/assembly.xml Thu Feb 05 19:41:00 2009 -0800
+++ b/mbox/dist/assembly.xml Fri Feb 06 14:51:43 2009 -0800
@@ -2,7 +2,7 @@
 <!--
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
- Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
 
     The contents of this file are subject to the terms of either the
GNU
     General Public License Version 2 only ("GPL") or the Common
Development
@@ -41,32 +41,16 @@
     </formats>
     <baseDirectory>mbox-${mail.version}</baseDirectory>
     <moduleSets>
- <!-- include LICENSE.txt from the legal module -->
- <moduleSet>
- <includes>
- <include>javax.mail:legal</include>
- </includes>
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
-
<directory>src/main/resources/META-INF</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
        <!-- include the main mbox.jar file -->
        <moduleSet>
            <includes>
- <include>javax.mail:mbox</include>
+ <include>com.sun.mail:mbox</include>
            </includes>
            <binaries>
                <includeDependencies>false</includeDependencies>
                <unpack>false</unpack>
                <outputFileNameMapping>
- ${artifactId}.${extension}
+ ${module.artifactId}.${module.extension}
                </outputFileNameMapping>
            </binaries>
        </moduleSet>
@@ -74,16 +58,27 @@
        <!-- include the native code library in the lib directory -->
        <moduleSet>
            <includes>
- <include>javax.mail:libmbox</include>
+ <include>com.sun.mail:libmbox</include>
            </includes>
            <binaries>
                <includeDependencies>false</includeDependencies>
                <unpack>false</unpack>
                <outputDirectory>lib/sparc</outputDirectory>
                <outputFileNameMapping>
- ${artifactId}.${extension}
+ ${module.artifactId}.${module.extension}
                </outputFileNameMapping>
            </binaries>
        </moduleSet>
     </moduleSets>
+
+ <!-- LICENSE.txt -->
+ <fileSets>
+ <fileSet>
+ <directory>../../doc/release</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
 </assembly>