Return-Path: 
 <jdo-commits-return-1490-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 56151 invoked from network); 17 Jun 2006 19:23:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 Jun 2006 19:23:47 -0000
Received: (qmail 76729 invoked by uid 500); 17 Jun 2006 19:23:47 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 76718 invoked by uid 99); 17 Jun 2006 19:23:47 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Jun 2006 12:23:47 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Jun 2006 12:23:46 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2D6691A983A; Sat, 17 Jun 2006 12:23:26 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r415048 - in /db/jdo/trunk: ./ api11/ api20/ core20/
 enhancer20/
 fostore20/ query20/ ri11/ runtime20/ tck11/ tck20/
Date: Sat, 17 Jun 2006 19:23:24 -0000
To: jdo-commits@db.apache.org
From: mbo@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060617192326.2D6691A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mbo
Date: Sat Jun 17 12:23:23 2006
New Revision: 415048

URL: http://svn.apache.org/viewvc?rev=415048&view=rev
Log:
JDO-386: source and binary distribution need to include NOTICE file; removed duplicated LICENSE file

Removed:
    db/jdo/trunk/api11/LICENSE.txt
    db/jdo/trunk/api20/LICENSE.txt
    db/jdo/trunk/core20/LICENSE.txt
    db/jdo/trunk/enhancer20/LICENSE.txt
    db/jdo/trunk/fostore20/LICENSE.txt
    db/jdo/trunk/query20/LICENSE.txt
    db/jdo/trunk/ri11/LICENSE.txt
    db/jdo/trunk/tck20/LICENSE.txt
Modified:
    db/jdo/trunk/api11/project.xml
    db/jdo/trunk/api20/project.xml
    db/jdo/trunk/core20/project.xml
    db/jdo/trunk/enhancer20/project.xml
    db/jdo/trunk/fostore20/project.xml
    db/jdo/trunk/maven.xml
    db/jdo/trunk/project.properties
    db/jdo/trunk/query20/project.xml
    db/jdo/trunk/ri11/project.xml
    db/jdo/trunk/runtime20/project.xml
    db/jdo/trunk/tck11/project.xml
    db/jdo/trunk/tck20/project.xml

Modified: db/jdo/trunk/api11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api11/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/api11/project.xml (original)
+++ db/jdo/trunk/api11/project.xml Sat Jun 17 12:23:23 2006
@@ -60,6 +60,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>javax/jdo/*.properties</include>

Modified: db/jdo/trunk/api20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/api20/project.xml (original)
+++ db/jdo/trunk/api20/project.xml Sat Jun 17 12:23:23 2006
@@ -85,6 +85,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>javax/jdo/*.properties</include>

Modified: db/jdo/trunk/core20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/core20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/core20/project.xml (original)
+++ db/jdo/trunk/core20/project.xml Sat Jun 17 12:23:23 2006
@@ -49,6 +49,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.properties</include>

Modified: db/jdo/trunk/enhancer20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.xml (original)
+++ db/jdo/trunk/enhancer20/project.xml Sat Jun 17 12:23:23 2006
@@ -59,6 +59,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.properties</include>

Modified: db/jdo/trunk/fostore20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.xml (original)
+++ db/jdo/trunk/fostore20/project.xml Sat Jun 17 12:23:23 2006
@@ -125,6 +125,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.properties</include>

Modified: db/jdo/trunk/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/maven.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/maven.xml (original)
+++ db/jdo/trunk/maven.xml Sat Jun 17 12:23:23 2006
@@ -171,16 +171,29 @@
     <!-- ==================== -->
 
     <preGoal name="dist:build-src">
-        <echo>Copying top-level project.xml, project.properties, and README.txt to ${maven.dist.src.archive.dir}</echo>
+        <echo>Copying top-level project.xml, project.properties, LICENSE.txt, NOTICE.txt, and README.txt to ${maven.dist.src.archive.dir}</echo>
         <copy toDir="${maven.dist.src.archive.dir}">
              <fileset dir="${basedir}/..">
                  <include name="project.properties"/>
                  <include name="project.xml"/>
                  <include name="README.txt"/>
+                 <include name="LICENSE.txt"/>
+                 <include name="NOTICE.txt"/>
              </fileset>
         </copy>
         <echo>Creating ${maven.dist.src.archive.dir}/lib/ext</echo>
         <mkdir dir="${maven.dist.src.archive.dir}/lib/ext"/>
+    </preGoal>
+
+    <preGoal name="dist:build-bin">
+        <echo>Copying top-level LICENSE.txt, NOTICE.txt, and README.txt to ${maven.dist.bin.archive.dir}</echo>
+        <copy toDir="${maven.dist.bin.archive.dir}">
+             <fileset dir="${basedir}/..">
+                 <include name="README.txt"/>
+                 <include name="LICENSE.txt"/>
+                 <include name="NOTICE.txt"/>
+             </fileset>
+        </copy>
     </preGoal>
 
     <postGoal name="dist">

Modified: db/jdo/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/project.properties?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/project.properties (original)
+++ db/jdo/trunk/project.properties Sat Jun 17 12:23:23 2006
@@ -18,8 +18,12 @@
 maven.compile.source = 1.3
 maven.compile.target = 1.3
 
+# refer to LICENSE file in root directory
+maven.license.licenseFile = ${basedir}/../LICENSE.txt
+
 # checkstyle settings
 maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+maven.checkstyle.header.file = ${basedir}/../LICENSE.txt
 
 # changelog settings
 maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory

Modified: db/jdo/trunk/query20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/query20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/query20/project.xml (original)
+++ db/jdo/trunk/query20/project.xml Sat Jun 17 12:23:23 2006
@@ -70,6 +70,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.properties</include>

Modified: db/jdo/trunk/ri11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/ri11/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.xml (original)
+++ db/jdo/trunk/ri11/project.xml Sat Jun 17 12:23:23 2006
@@ -105,6 +105,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.properties</include>

Modified: db/jdo/trunk/runtime20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/project.xml (original)
+++ db/jdo/trunk/runtime20/project.xml Sat Jun 17 12:23:23 2006
@@ -73,6 +73,13 @@
         <!-- Resources that are packaged up inside the JAR file -->
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.properties</include>

Modified: db/jdo/trunk/tck11/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck11/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.xml (original)
+++ db/jdo/trunk/tck11/project.xml Sat Jun 17 12:23:23 2006
@@ -103,13 +103,18 @@
         <sourceDirectory>test/java</sourceDirectory>
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/test/java</directory>
                 <includes>
                     <include>**/*.xml</include>
                 </includes>
             </resource>
-        </resources>
-        <resources>
             <resource>
                 <directory>${basedir}/test/conf</directory>
                 <includes>

Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.xml?rev=415048&r1=415047&r2=415048&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Sat Jun 17 12:23:23 2006
@@ -150,6 +150,13 @@
         <sourceDirectory>src/java</sourceDirectory>
         <resources>
             <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>${basedir}/src/java</directory>
                 <includes>
                     <include>**/*.xml</include>