db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1138039 - in /db/derby/code/trunk/tools/ide/netbeans/nbproject: ide-file-targets.xml project.xml
Date Tue, 21 Jun 2011 15:16:09 GMT
Author: kahatlen
Date: Tue Jun 21 15:16:07 2011
New Revision: 1138039

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

- Set output directory and javadoc directory.

- Added debug targets for ij and network server.

Added:
    db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml   (with props)
Modified:
    db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml

Added: 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=1138039&view=auto
==============================================================================
--- db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml (added)
+++ db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml Tue Jun 21 15:16:07
2011
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  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.
+-->
+<project basedir=".." name="derby-IDE">
+    <property name="project.dir" value="../../.."/>
+    <property name="ant.script" value="${project.dir}/build.xml"/>
+    <target name="debug-ij">
+        <path id="cp">
+            <pathelement location="${project.dir}/classes"/>
+        </path>
+        <nbjpdastart addressproperty="jpda.address" name="derby" transport="dt_socket">
+            <classpath refid="cp"/>
+        </nbjpdastart>
+        <java classname="org.apache.derby.tools.ij" fork="true">
+            <classpath refid="cp"/>
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+        </java>
+    </target>
+    <target name="debug-server">
+        <path id="cp">
+            <pathelement location="${project.dir}/classes"/>
+        </path>
+        <nbjpdastart addressproperty="jpda.address" name="derby" transport="dt_socket">
+            <classpath refid="cp"/>
+        </nbjpdastart>
+        <java classname="org.apache.derby.drda.NetworkServerControl" fork="true">
+            <classpath refid="cp"/>
+            <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>

Propchange: db/derby/code/trunk/tools/ide/netbeans/nbproject/ide-file-targets.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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=1138039&r1=1138038&r2=1138039&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml (original)
+++ db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml Tue Jun 21 15:16:07 2011
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.ant.freeform</type>
     <configuration>
@@ -35,6 +34,11 @@
                     <location>${project.dir}</location>
                 </source-folder>
                 <source-folder>
+                    <label>derby</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>java/build</label>
                     <type>java</type>
                     <location>${project.dir}/java/build</location>
@@ -111,11 +115,21 @@
                     <target>clobber</target>
                     <target>all</target>
                 </action>
-                <action name="debug">
+                <action name="debug-ij">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>debug-ij</target>
+                </action>
+                <action name="debug-server">
                     <script>nbproject/ide-file-targets.xml</script>
-                    <target>debug-nb</target>
+                    <target>debug-server</target>
                 </action>
             </ide-actions>
+            <export>
+                <type>folder</type>
+                <location>${project.dir}/classes</location>
+                <script>${ant.script}</script>
+                <build-target>all</build-target>
+            </export>
             <view>
                 <items>
                     <source-folder style="packages">
@@ -164,12 +178,13 @@
                     <ide-action name="clean"/>
                     <ide-action name="javadoc"/>
                     <ide-action name="test"/>
-                    <ide-action name="debug"/>
+                    <ide-action name="debug-ij"/>
+                    <ide-action name="debug-server"/>
                 </context-menu>
             </view>
             <subprojects/>
         </general-data>
-        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>${project.dir}/java/build</package-root>
                 <package-root>${project.dir}/java/client</package-root>
@@ -181,6 +196,8 @@
                 <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>
+                <javadoc-built-to>${project.dir}/javadoc</javadoc-built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>



Mime
View raw message