Return-Path: 
 <jdo-dev-return-2948-apmail-db-jdo-dev-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-dev-archive@www.apache.org
Received: (qmail 80095 invoked from network); 18 Jan 2006 23:32:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Jan 2006 23:32:46 -0000
Received: (qmail 98871 invoked by uid 500); 18 Jan 2006 23:32:46 -0000
Mailing-List: contact jdo-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-dev-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-dev-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-dev@db.apache.org>
List-Id: <jdo-dev.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-dev@db.apache.org
Received: (qmail 98856 invoked by uid 99); 18 Jan 2006 23:32:46 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2006 15:32:46 -0800
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [212.224.30.66] (HELO service-01.spree.de) (212.224.30.66)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2006 15:32:44 -0800
Received: from [172.16.2.80] (vpn-server [192.168.16.104])
	(authenticated bits=0)
	by service-01.spree.de (8.13.4/8.13.4/Debian-3) with ESMTP id k0INTrEc000955
	for <jdo-dev@db.apache.org>; Thu, 19 Jan 2006 00:29:54 +0100
Message-ID: <43CED005.3070401@spree.de>
Date: Thu, 19 Jan 2006 00:32:21 +0100
From: Michael Bouschen <mbo.tech@spree.de>
Organization: Tech@Spree Engineering
User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Apache JDO project <jdo-dev@db.apache.org>
Subject: Settings for maven dist
Content-Type: multipart/mixed;
 boundary="------------080208070808010002020204"
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

--------------080208070808010002020204
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi Craig,

I tried calling 'maven dist' in projects api20 and tck20. It suceeded, 
but some of the generated distribution files do not include the expected 
files. I was able to resolve some of the issues, please see the attached 
patch.
- tck20/project.properties: allow to find all tck20 sources to be 
included in the src distribution file.
- tck20/maven.xml: copy the generated src distribution file to file with 
a different name.
- api20/project.xml: simplify the resource settings.
- project.properties: set  checkstyle properties for all subprojects.
Please update your workspace in order to get Michelle's recent changes 
befor applying the patch.

We still need to resolve the problem that the generated src distribution 
includes the project.xml as it is, which means it extends ../project.xml.

Regards Michael

-- 
Michael Bouschen		Tech@Spree Engineering GmbH
mailto:mbo.tech@spree.de	http://www.tech.spree.de/
Tel.:++49/30/235 520-33		Buelowstr. 66			
Fax.:++49/30/2175 2012		D-10783 Berlin			


--------------080208070808010002020204
Content-Type: text/plain;
 name="dist.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="dist.patch"

Index: tck20/project.properties
===================================================================
--- tck20/project.properties	(Revision 370300)
+++ tck20/project.properties	(Arbeitskopie)
@@ -20,6 +20,8 @@
 maven.repo.remote = http://www.ibiblio.org/maven, http://www.jpox.org/downloads/maven
 maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
 
+maven.src.dir=${basedir}/test
+
 # iut properties file
 iut.pmf.properties = iut-pmf.properties
 
Index: tck20/maven.xml
===================================================================
--- tck20/maven.xml	(Revision 370300)
+++ tck20/maven.xml	(Arbeitskopie)
@@ -697,4 +697,14 @@
         </copy>
     </goal>
 
+    <postGoal name="dist:build-src">
+         <tstamp>
+             <format property="distdate" pattern="dd_MMM_yyyy" locale="en"/>
+         </tstamp>
+         <u:replace var="version" oldChar="." newChar="_" value="${pom.currentVersion}"/>
+         <j:set var="distfile" value="jdotck-${version}-src-${distdate}.zip"/>
+         <copy file="${maven.build.dir}/distributions/${maven.final.name}-src.zip" 
+               tofile="${maven.build.dir}/distributions/${distfile}" failonerror="false"/>
+    </postGoal>
+
 </project>
Index: api20/project.xml
===================================================================
--- api20/project.xml	(Revision 370300)
+++ api20/project.xml	(Arbeitskopie)
@@ -70,11 +70,6 @@
                 <directory>${basedir}/src/dtd</directory>
                 <includes>
                     <include>javax/jdo/*.dtd</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/dtd</directory>
-                <includes>
                     <include>javax/jdo/*.xsd</include>
                 </includes>
             </resource>
Index: project.properties
===================================================================
--- project.properties	(Revision 370300)
+++ project.properties	(Arbeitskopie)
@@ -18,6 +18,9 @@
 maven.compile.source = 1.3
 maven.compile.target = 1.3
 
+# checkstyle settings
+maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+
 # Set the javadoc title 
 maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion}
 

--------------080208070808010002020204--