Return-Path: 
 <derby-commits-return-13444-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 22631 invoked from network); 16 Nov 2010 14:55:38 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 16 Nov 2010 14:55:38 -0000
Received: (qmail 64744 invoked by uid 500); 16 Nov 2010 14:56:09 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 64680 invoked by uid 500); 16 Nov 2010 14:56:09 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 64673 invoked by uid 99); 16 Nov 2010 14:56:08 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Nov 2010 14:56:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 16 Nov 2010 14:56:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C93FB23888E7; Tue, 16 Nov 2010 14:54:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1035648 - in /db/derby/code/branches/10.7: build.xml
 tools/ant/properties/dirs.properties tools/release/build.xml
Date: Tue, 16 Nov 2010 14:54:48 -0000
To: derby-commits@db.apache.org
From: rhillegas@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101116145448.C93FB23888E7@eris.apache.org>

Author: rhillegas
Date: Tue Nov 16 14:54:48 2010
New Revision: 1035648

URL: http://svn.apache.org/viewvc?rev=1035648&view=rev
Log:
DERBY-2573: Backport 1035647 from trunk to 10.7 branch.

Modified:
    db/derby/code/branches/10.7/build.xml
    db/derby/code/branches/10.7/tools/ant/properties/dirs.properties
    db/derby/code/branches/10.7/tools/release/build.xml

Modified: db/derby/code/branches/10.7/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/build.xml?rev=1035648&r1=1035647&r2=1035648&view=diff
==============================================================================
--- db/derby/code/branches/10.7/build.xml (original)
+++ db/derby/code/branches/10.7/build.xml Tue Nov 16 14:54:48 2010
@@ -1983,13 +1983,13 @@
    </target>
 
    <!--
-       Checkin in-flight edits
+       Checkin in-flight edits. Do not checkin files if we are running in debug mode.
 
        Args:
            checkinComment   This is the subversion checkin comment.
            fileName   This is the name of the file to checking (could be the root of the client).
    -->
-   <target name="checkinfile">
+   <target name="checkinfile" unless="debug.release.build">
 
      <property name="checkinMessage" value="${release.base}/tmp.checkin.message"/>
      <property name="fullComment" value="[RELEASE CHECKIN] ${checkinComment}"/>
@@ -2623,10 +2623,11 @@ you should not have to do this.
     >
       <ant antfile="${basedir}/tools/release/build.xml" target="release"/>
 
-      <!-- copy the eclipse plugin into the distribution directory -->
+      <!-- copy the eclipse plugins into the distribution directory -->
       <property file="${release.base}/plugintmp.properties"/>
       <property name="eclipse.plugin" value="${plugin.derby.core.zipfile}_${plugin.derby.version}.zip"/>
       <copy file="${jarsdist.dir}/insane/${eclipse.plugin}" todir="${release.dir}"/>
+      <copy file="${eclipse.ui.doc.plugin}" tofile="${release.dir}/${eclipse.ui.doc.plugin.name}"/>
 
       <!-- sign all of the artifacts -->
       <ant antfile="${basedir}/tools/release/build.xml" target="sign"/>
@@ -2702,7 +2703,7 @@ you should not have to do this.
 
         Sneaky, very, very sneaky.
     -->
-    <target name="promptforreleaseproperties" depends="promptforsvncredentials,promptforpgpcredentials,promptforreleaseid"/>
+    <target name="promptforreleaseproperties" depends="promptforsvncredentials,promptforpgpcredentials,promptforreleaseid,promptforeclipseplugin"/>
 
     <!-- Define the task which prompts for missing properties -->
     <target name="defineprompt" depends="prebuild">
@@ -2760,6 +2761,16 @@ you should not have to do this.
 
     </target>
 
+    <!-- Prompt for location of eclipse ui/doc plugin. This artifact does not generally change from one release to another -->
+    <target name="promptforeclipseplugin" depends="defineprompt">
+
+        <promptForProperty
+          propertyName="eclipse.ui.doc.plugin"
+          prompt="Enter the location of the eclipse ui/doc plugin (e.g., /Users/me/derby/derby_ui_doc_plugin_1.1.2.zip) >  "
+        />
+
+    </target>
+
     <!--
         Prompt for whether we should continue. The user is offered a Y/N choice.
 

Modified: db/derby/code/branches/10.7/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/tools/ant/properties/dirs.properties?rev=1035648&r1=1035647&r2=1035648&view=diff
==============================================================================
--- db/derby/code/branches/10.7/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/branches/10.7/tools/ant/properties/dirs.properties Tue Nov 16 14:54:48 2010
@@ -121,4 +121,6 @@ derby.testing.perf.dir=${derby.testing.d
 derby.testing.suites.dir=${derby.testing.functest.dir}/suites
 derby.testing.system.dir=${derby.testing.dir}/system
 
+# file names
 sqlstateTables=${gen.doc.dir}/rrefexcept71493.dita
+eclipse.ui.doc.plugin.name=derby_ui_doc_plugin_1.1.2.zip

Modified: db/derby/code/branches/10.7/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/tools/release/build.xml?rev=1035648&r1=1035647&r2=1035648&view=diff
==============================================================================
--- db/derby/code/branches/10.7/tools/release/build.xml (original)
+++ db/derby/code/branches/10.7/tools/release/build.xml Tue Nov 16 14:54:48 2010
@@ -469,6 +469,12 @@
     <antcall target="pgp">
       <param name="sign.archive" value="${release.dir}/${eclipse.plugin}"/>
     </antcall>
+    <antcall target="md5">
+      <param name="sign.archive" value="${release.dir}/${eclipse.ui.doc.plugin.name}"/>
+    </antcall>
+    <antcall target="pgp">
+      <param name="sign.archive" value="${release.dir}/${eclipse.ui.doc.plugin.name}"/>
+    </antcall>
   </target>
 
   <target name="md5">