Return-Path: 
 <derby-commits-return-14587-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CA0A6445B
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Wed, 29 Jun 2011 08:15:35 +0000 (UTC)
Received: (qmail 99236 invoked by uid 500); 29 Jun 2011 08:15:34 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 99138 invoked by uid 500); 29 Jun 2011 08:15:27 -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 98458 invoked by uid 99); 29 Jun 2011 08:15:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jun 2011 08:15:18 +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, 29 Jun 2011 08:15:17 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D3AE52388897;
	Wed, 29 Jun 2011 08:14:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1140995 - in /db/derby/code/trunk: build.xml
 tools/ide/netbeans/nbproject/ide-file-targets.xml
 tools/ide/netbeans/nbproject/project.xml
Date: Wed, 29 Jun 2011 08:14:56 -0000
To: derby-commits@db.apache.org
From: kahatlen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110629081456.D3AE52388897@eris.apache.org>

Author: kahatlen
Date: Wed Jun 29 08:14:56 2011
New Revision: 1140995

URL: http://svn.apache.org/viewvc?rev=1140995&view=rev
Log:
DERBY-5286: Remove or update tools/ide/netbeans directory

Make the NetBeans project build the jar files to make it easier to add
it as a dependency in other NetBeans projects (typically for debugging).

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml
    db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1140995&r1=1140994&r2=1140995&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Jun 29 08:14:56 2011
@@ -2129,6 +2129,14 @@
 
 
 <!-- =================================================================== -->
+<!--       IDE build targets used by the projects under tools/ide/       -->
+<!-- =================================================================== -->
+
+  <!-- Target used by NetBeans to build all code modules and all jars. -->
+  <target name="nb-buildall" depends="all,buildjarsclean"/>
+
+
+<!-- =================================================================== -->
 <!--                         Nightly build targets                       -->
 <!-- =================================================================== -->
 

Modified: db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml?rev=1140995&r1=1140994&r2=1140995&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml (original)
+++ db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml Wed Jun 29 08:14:56 2011
@@ -20,7 +20,7 @@
     <property name="ant.script" value="${project.dir}/build.xml"/>
     <target name="debug-ij">
         <path id="cp">
-            <pathelement location="${project.dir}/classes"/>
+            <pathelement location="${project.dir}/jars/sane/derbyrun.jar"/>
         </path>
         <nbjpdastart addressproperty="jpda.address" name="derby" transport="dt_socket">
             <classpath refid="cp"/>
@@ -33,7 +33,7 @@
     </target>
     <target name="debug-server">
         <path id="cp">
-            <pathelement location="${project.dir}/classes"/>
+            <pathelement location="${project.dir}/jars/sane/derbynet.jar"/>
         </path>
         <nbjpdastart addressproperty="jpda.address" name="derby" transport="dt_socket">
             <classpath refid="cp"/>
@@ -43,8 +43,6 @@
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
             <arg value="start"/>
-            <!-- Default security policy doesn't allow running from classes. -->
-            <arg value="-noSecurityManager"/>
         </java>
     </target>
 </project>

Modified: db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml?rev=1140995&r1=1140994&r2=1140995&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml (original)
+++ db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml Wed Jun 29 08:14:56 2011
@@ -96,10 +96,11 @@
             <ide-actions>
                 <action name="build">
                     <script>${ant.script}</script>
-                    <target>all</target>
+                    <target>nb-buildall</target>
                 </action>
                 <action name="clean">
                     <script>${ant.script}</script>
+                    <target>cleanalljars</target>
                     <target>clobber</target>
                 </action>
                 <action name="javadoc">
@@ -112,8 +113,9 @@
                 </action>
                 <action name="rebuild">
                     <script>${ant.script}</script>
+                    <target>cleanalljars</target>
                     <target>clobber</target>
-                    <target>all</target>
+                    <target>nb-buildall</target>
                 </action>
                 <action name="debug-ij">
                     <script>nbproject/ide-file-targets.xml</script>
@@ -125,10 +127,40 @@
                 </action>
             </ide-actions>
             <export>
-                <type>folder</type>
-                <location>${project.dir}/classes</location>
+                <type>jar</type>
+                <location>${project.dir}/jars/sane/derby.jar</location>
                 <script>${ant.script}</script>
-                <build-target>all</build-target>
+                <build-target>nb-buildall</build-target>
+            </export>
+            <export>
+                <type>jar</type>
+                <location>${project.dir}/jars/sane/derbyTesting.jar</location>
+                <script>${ant.script}</script>
+                <build-target>nb-buildall</build-target>
+            </export>
+            <export>
+                <type>jar</type>
+                <location>${project.dir}/jars/sane/derbyclient.jar</location>
+                <script>${ant.script}</script>
+                <build-target>nb-buildall</build-target>
+            </export>
+            <export>
+                <type>jar</type>
+                <location>${project.dir}/jars/sane/derbynet.jar</location>
+                <script>${ant.script}</script>
+                <build-target>nb-buildall</build-target>
+            </export>
+            <export>
+                <type>jar</type>
+                <location>${project.dir}/jars/sane/derbyrun.jar</location>
+                <script>${ant.script}</script>
+                <build-target>nb-buildall</build-target>
+            </export>
+            <export>
+                <type>jar</type>
+                <location>${project.dir}/jars/sane/derbytools.jar</location>
+                <script>${ant.script}</script>
+                <build-target>nb-buildall</build-target>
             </export>
             <view>
                 <items>
@@ -196,7 +228,12 @@
                 <package-root>${project.dir}/java/testing</package-root>
                 <package-root>${project.dir}/java/tools</package-root>
                 <classpath mode="compile">${project.dir}/tools/java/geronimo-spec-servlet-2.4-rc4.jar:${project.dir}/tools/java/jakarta-oro-2.0.8.jar:${project.dir}/tools/java/javacc.jar:${project.dir}/tools/java/junit.jar:${ant.core.lib}:${project.dir}/classes/stubs/felix</classpath>
-                <built-to>${project.dir}/classes</built-to>
+                <built-to>${project.dir}/jars/sane/derby.jar</built-to>
+                <built-to>${project.dir}/jars/sane/derbyTesting.jar</built-to>
+                <built-to>${project.dir}/jars/sane/derbyclient.jar</built-to>
+                <built-to>${project.dir}/jars/sane/derbynet.jar</built-to>
+                <built-to>${project.dir}/jars/sane/derbyrun.jar</built-to>
+                <built-to>${project.dir}/jars/sane/derbytools.jar</built-to>
                 <javadoc-built-to>${project.dir}/javadoc</javadoc-built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>