Return-Path: Delivered-To: apmail-incubator-empire-db-commits-archive@minotaur.apache.org Received: (qmail 79896 invoked from network); 8 Apr 2010 21:58:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Apr 2010 21:58:36 -0000 Received: (qmail 78243 invoked by uid 500); 8 Apr 2010 21:58:36 -0000 Delivered-To: apmail-incubator-empire-db-commits-archive@incubator.apache.org Received: (qmail 78221 invoked by uid 500); 8 Apr 2010 21:58:36 -0000 Mailing-List: contact empire-db-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@incubator.apache.org Delivered-To: mailing list empire-db-commits@incubator.apache.org Received: (qmail 78213 invoked by uid 99); 8 Apr 2010 21:58:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 21:58:36 +0000 X-ASF-Spam-Status: No, hits=-1112.2 required=10.0 tests=ALL_TRUSTED,AWL 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; Thu, 08 Apr 2010 21:58:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 776FD23888FE; Thu, 8 Apr 2010 21:58:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r932140 - in /incubator/empire-db/trunk: ./ empire-db-dist/ empire-db-dist/src/ empire-db-dist/src/assemble/ Date: Thu, 08 Apr 2010 21:58:14 -0000 To: empire-db-commits@incubator.apache.org From: francisdb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100408215814.776FD23888FE@eris.apache.org> Author: francisdb Date: Thu Apr 8 21:58:13 2010 New Revision: 932140 URL: http://svn.apache.org/viewvc?rev=932140&view=rev Log: moving the distribution build to a separate projects Added: incubator/empire-db/trunk/empire-db-dist/ incubator/empire-db/trunk/empire-db-dist/checksums.sh - copied, changed from r931358, incubator/empire-db/trunk/release.sh incubator/empire-db/trunk/empire-db-dist/pom.xml incubator/empire-db/trunk/empire-db-dist/src/ incubator/empire-db/trunk/empire-db-dist/src/assemble/ incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml - copied, changed from r926362, incubator/empire-db/trunk/empire-assembly-all.xml Removed: incubator/empire-db/trunk/empire-assembly-all.xml incubator/empire-db/trunk/release.sh Modified: incubator/empire-db/trunk/pom.xml Copied: incubator/empire-db/trunk/empire-db-dist/checksums.sh (from r931358, incubator/empire-db/trunk/release.sh) URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/checksums.sh?p2=incubator/empire-db/trunk/empire-db-dist/checksums.sh&p1=incubator/empire-db/trunk/release.sh&r1=931358&r2=932140&rev=932140&view=diff ============================================================================== --- incubator/empire-db/trunk/release.sh (original) +++ incubator/empire-db/trunk/empire-db-dist/checksums.sh Thu Apr 8 21:58:13 2010 @@ -13,73 +13,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -echo "Apache Empire-db Release script" +echo "Apache Empire-db Checksum script" echo "----------------------------" -echo "Building a release for Apache Empire-db. We will need the passphrase for" -echo "GPG to sign the release." -echo "This program assumes you use a jdk 1.5 explicitly configured when" -echo "invoking the 'mvn5' Maven 2 command." -echo "" - -echo "Enter your GPG passphrase (input will be hidden)" -stty_orig=`stty -g` -stty -echo -read passphrase -stty $stty_orig - -# Clear the current NOTICE.txt file -echo "Creating notice file." - -NOTICE=NOTICE -> $NOTICE -echo "Apache Empire-db" >> $NOTICE -echo "Copyright 2008 The Apache Software Foundation" >> $NOTICE -echo "" >> $NOTICE -echo "This product includes software developed at" >> $NOTICE -echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE -echo "" >> $NOTICE -echo "This is an aggregated NOTICE file for the Apache Empire-db projects included" >> $NOTICE -echo "in this distribution." >> $NOTICE -echo "" >> $NOTICE -echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE -echo " NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE -echo " AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE -echo "" >> $NOTICE - -# next concatenate all NOTICE files from sub projects to the root file -for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"` -do - echo "---------------------------------------------------------------------------" >> $NOTICE - echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE - echo "---------------------------------------------------------------------------" >> $NOTICE - cat $i >> $NOTICE - echo >> $NOTICE +echo "Generating md5/sha checksum files..." +for ext in "*.zip" "*.bz2" "*.gz"; do + for filename in `find . -type f -name "$ext"`; do + md5sum $filename > $filename.md5 + sha1sum $filename > $filename.sha + done done - -# clean all projects -echo "Clean all projects" -mvn5 clean -Pall - -# package and assemble the release -echo "Package and assemble the release" -# mvn5 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:aggregate assembly:attached $1 -mvn5 -ff -Dgpg.passphrase="$passphrase" clean install javadoc:aggregate assembly:attached $1 - -filename=`ls target/dist/apache-empire*gz` -md5sum $filename > $filename.md5 -sha1sum $filename > $filename.sha # gpg --print-md MD5 $filename > $filename.md5 # gpg --print-md SHA1 $filename > $filename.sha -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename - -filename=`ls target/dist/apache-empire*zip` -md5sum $filename > $filename.md5 -sha1sum $filename > $filename.sha -# gpg --print-md MD5 $filename > $filename.md5 -# gpg --print-md SHA1 $filename > $filename.sha -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename - -echo "Generating rat report in target/dist" -mvn5 rat:check -Drat.excludeSubprojects=false -Drat.outputFile=target/dist/rat.txt -N -echo "Distribution build completed in target/dist" +echo +echo "Copying rat report..." +cp ../target/rat.txt ./target +echo +echo "All Done. Files available in ./target" Added: incubator/empire-db/trunk/empire-db-dist/pom.xml URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/pom.xml?rev=932140&view=auto ============================================================================== --- incubator/empire-db/trunk/empire-db-dist/pom.xml (added) +++ incubator/empire-db/trunk/empire-db-dist/pom.xml Thu Apr 8 21:58:13 2010 @@ -0,0 +1,80 @@ + + + + 4.0.0 + + empire-db-parent + org.apache.empire-db + 2.0.6-incubating-SNAPSHOT + + org.apache.empire-db + empire-db-dist + Apache Empire-db Distribtion + pom + + + apache-empire-db-${project.version} + + + + + maven-deploy-plugin + + true + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + binary-release-assembly + package + + single + + + + src/assemble/empire-assembly-all.xml + + gnu + + + true + + + + + + + + + + org.apache.empire-db + empire-db + + + org.apache.empire-db + empire-db-struts2 + + + + \ No newline at end of file Copied: incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml (from r926362, incubator/empire-db/trunk/empire-assembly-all.xml) URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml?p2=incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml&p1=incubator/empire-db/trunk/empire-assembly-all.xml&r1=926362&r2=932140&rev=932140&view=diff ============================================================================== --- incubator/empire-db/trunk/empire-assembly-all.xml (original) +++ incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml Thu Apr 8 21:58:13 2010 @@ -21,17 +21,18 @@ tar.gz + tar.bz2 zip true - target/site/apidocs + ${basedir}/../target/site/apidocs apidocs - ${basedir} + ${basedir}/.. src true @@ -40,6 +41,8 @@ empire-db/** empire-db-struts2/** empire-db-examples/** + empire-db-maven-plugin/** + empire-db-codegen/** **/empire-db/target/** @@ -53,7 +56,7 @@ - ${basedir} + ${basedir}/.. true @@ -66,13 +69,13 @@ - empire-db-examples + ${basedir}/../empire-db-examples tutorial.pdf - + + + lib + + org.apache.empire-db:empire-db + org.apache.empire-db:empire-db-struts2 + + + Modified: incubator/empire-db/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=932140&r1=932139&r2=932140&view=diff ============================================================================== --- incubator/empire-db/trunk/pom.xml (original) +++ incubator/empire-db/trunk/pom.xml Thu Apr 8 21:58:13 2010 @@ -115,6 +115,9 @@ apache-release + + empire-db-dist + @@ -352,29 +355,6 @@ - org.apache.maven.plugins - maven-assembly-plugin - - - binary-release-assembly - package - - single - - - true - - empire-assembly-all.xml - - gnu - target/dist - apache-empire-db-${project.version} - true - - - - - true org.apache.maven.plugins maven-compiler-plugin