From mime4j-dev-return-1649-apmail-james-mime4j-dev-archive=james.apache.org@james.apache.org  Wed Jul 20 10:59:34 2011
Return-Path: <mime4j-dev-return-1649-apmail-james-mime4j-dev-archive=james.apache.org@james.apache.org>
X-Original-To: apmail-james-mime4j-dev-archive@minotaur.apache.org
Delivered-To: apmail-james-mime4j-dev-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9F75876DE
	for <apmail-james-mime4j-dev-archive@minotaur.apache.org>; Wed, 20 Jul 2011 10:59:34 +0000 (UTC)
Received: (qmail 25882 invoked by uid 500); 20 Jul 2011 10:59:33 -0000
Delivered-To: apmail-james-mime4j-dev-archive@james.apache.org
Received: (qmail 25809 invoked by uid 500); 20 Jul 2011 10:59:27 -0000
Mailing-List: contact mime4j-dev-help@james.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mime4j-dev-help@james.apache.org>
List-Unsubscribe: <mailto:mime4j-dev-unsubscribe@james.apache.org>
List-Post: <mailto:mime4j-dev@james.apache.org>
List-Id: <mime4j-dev.james.apache.org>
Reply-To: mime4j-dev@james.apache.org
Delivered-To: mailing list mime4j-dev@james.apache.org
Received: (qmail 25792 invoked by uid 99); 20 Jul 2011 10:59:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 10:59:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 10:59:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1E0D123888CF;
	Wed, 20 Jul 2011 10:59:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1148696 - in /james/mime4j/trunk: LICENSE LICENSE.txt NOTICE
 NOTICE.txt assemble/src/assemble/bin.xml
Date: Wed, 20 Jul 2011 10:59:00 -0000
To: mime4j-dev@james.apache.org
From: bago@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110720105901.1E0D123888CF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bago
Date: Wed Jul 20 10:59:00 2011
New Revision: 1148696

URL: http://svn.apache.org/viewvc?rev=1148696&view=rev
Log:
rename LICENSE.txt/NOTICE.txt to LICENSE/NOTICE to follow maven convention and make sure the source package defined in apache parent pom includes our licensing stuff instead of maven defaults.
remove src.xml descriptor from assemble module: we don't need to generate a source package because the "apache-release" profile already creates a correct one for the main pom.
alter bin.xml assembly descriptor to include all of our generated jars (previously it only included core jars).

Added:
    james/mime4j/trunk/LICENSE   (contents, props changed)
      - copied, changed from r1148693, james/mime4j/trunk/LICENSE.txt
    james/mime4j/trunk/NOTICE
      - copied unchanged from r1148693, james/mime4j/trunk/NOTICE.txt
Removed:
    james/mime4j/trunk/LICENSE.txt
    james/mime4j/trunk/NOTICE.txt
Modified:
    james/mime4j/trunk/assemble/src/assemble/bin.xml

Copied: james/mime4j/trunk/LICENSE (from r1148693, james/mime4j/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/LICENSE?p2=james/mime4j/trunk/LICENSE&p1=james/mime4j/trunk/LICENSE.txt&r1=1148693&r2=1148696&rev=1148696&view=diff
==============================================================================
    (empty)

Propchange: james/mime4j/trunk/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mime4j/trunk/LICENSE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: james/mime4j/trunk/assemble/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/assemble/src/assemble/bin.xml?rev=1148696&r1=1148695&r2=1148696&view=diff
==============================================================================
--- james/mime4j/trunk/assemble/src/assemble/bin.xml (original)
+++ james/mime4j/trunk/assemble/src/assemble/bin.xml Wed Jul 20 10:59:00 2011
@@ -31,12 +31,12 @@
       <directory>${project.basedir}/..</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>LICENSE.*</include>
-        <include>NOTICE.*</include>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
         <include>RELEASE_NOTES.txt</include>
         <include>README</include>
       </includes>
-    </fileSet>
+    </fileSet>
     <fileSet>
       <directory>${project.basedir}/../core/target</directory>
       <outputDirectory>/</outputDirectory>
@@ -44,12 +44,40 @@
         <include>apache-mime4j*.jar</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../dom/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-mime4j*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../storage/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-mime4j*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../benchmark/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-mime4j*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../examples/target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>apache-mime4j*.jar</include>
+      </includes>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib/</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
-      <scope>runtime</scope>
+      <scope>runtime</scope>
       <excludes>
         <exclude>apache-mime4j*</exclude>
       </excludes>