db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1138000 - in /db/derby/code/trunk/tools/ide/netbeans: 5.5/ 6.0/ nbproject/ nbproject/project.xml
Date Tue, 21 Jun 2011 13:30:09 GMT
Author: kahatlen
Date: Tue Jun 21 13:30:09 2011
New Revision: 1138000

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

Switched from two NetBeans projects to one and updated the classpath,
source level and formatting settings.

Added:
    db/derby/code/trunk/tools/ide/netbeans/nbproject/
      - copied from r1137590, db/derby/code/trunk/tools/ide/netbeans/6.0/nbproject/
Removed:
    db/derby/code/trunk/tools/ide/netbeans/5.5/
    db/derby/code/trunk/tools/ide/netbeans/6.0/
Modified:
    db/derby/code/trunk/tools/ide/netbeans/nbproject/project.xml

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=1138000&r1=1137590&r2=1138000&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 13:30:09 2011
@@ -26,7 +26,7 @@
             <!-- Do not use Project Properties customizer when editing this file manually.
-->
             <name>derby</name>
             <properties>
-                <property name="project.dir">../../../..</property>
+                <property name="project.dir">../../..</property>
                 <property name="ant.script">${project.dir}/build.xml</property>
             </properties>
             <folders>
@@ -180,9 +180,32 @@
                 <package-root>${project.dir}/java/storeless</package-root>
                 <package-root>${project.dir}/java/testing</package-root>
                 <package-root>${project.dir}/java/tools</package-root>
-                <classpath mode="compile">${project.dir}/classes:${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:${project.dir}/tools/java/xercesImpl.jar:${project.dir}/tools/java/ant.jar:${project.dir}/classes/stubs/felix</classpath>
-                <source-level>1.4</source-level>
+                <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>
+                <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
+        <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1">
+            <module name="org-netbeans-modules-editor-indent">
+                <node name="CodeStyle">
+                    <property name="usedProfile" value="project"/>
+                    <node name="project">
+                        <property name="spaces-per-tab" value="4"/>
+                        <property name="tab-size" value="4"/>
+                        <property name="indent-shift-width" value="4"/>
+                        <property name="expand-tabs" value="true"/>
+                        <property name="text-limit-width" value="80"/>
+                        <property name="text-line-wrap" value="none"/>
+                    </node>
+                </node>
+                <node name="text">
+                    <node name="x-java">
+                        <node name="CodeStyle">
+                            <node name="project"/>
+                        </node>
+                    </node>
+                </node>
+            </module>
+            <module name="org-netbeans-modules-projectimport-eclipse-core"/>
+        </preferences>
     </configuration>
 </project>



Mime
View raw message