1.1 --- a/Libraries/ThirdParty/libs.commons/build.xml Wed Jul 25 13:49:33 2012 +0200
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,18 +0,0 @@
1.4 -<?xml version="1.0" encoding="UTF-8"?>
1.5 -<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
1.6 -<!-- for some information on what you could do (e.g. targets to override). -->
1.7 -<!-- If you delete this file and reopen the project it will be recreated. -->
1.8 -<project name="org.netbeans.libs.commons" default="netbeans" basedir=".">
1.9 - <description>Builds, tests, and runs the project org.netbeans.libs.commons.</description>
1.10 - <import file="nbproject/build-impl.xml"/>
1.11 - <target name="files-init" depends="external,projectized-common.files-init"/>
1.12 - <target name="external">
1.13 - <echo message="Copying commons-io-1.4.jar from IDE"/>
1.14 - <mkdir dir="release/modules/ext"/>
1.15 - <copy file="${nbplatform.default.netbeans.dest.dir}/ide/modules/ext/commons-io-1.4.jar" todir="release/modules/ext/"/>
1.16 - </target>
1.17 - <target name="clean" depends="projectized-common.clean">
1.18 - <echo message="Cleaning release directory"/>
1.19 - <delete dir="release" failonerror="false"/>
1.20 - </target>
1.21 -</project>
2.1 --- a/Libraries/ThirdParty/libs.commons/manifest.mf Wed Jul 25 13:49:33 2012 +0200
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,8 +0,0 @@
2.4 -Manifest-Version: 1.0
2.5 -Ant-Version: Apache Ant 1.8.1
2.6 -Created-By: 1.6.0_22-b22 (Sun Microsystems Inc.)
2.7 -OpenIDE-Module: org.netbeans.libs.commons
2.8 -OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/commons/Bundle.pro
2.9 - perties
2.10 -OpenIDE-Module-Specification-Version: 1.0.1
2.11 -
3.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/build-impl.xml Wed Jul 25 13:49:33 2012 +0200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,45 +0,0 @@
3.4 -<?xml version="1.0" encoding="UTF-8"?>
3.5 -<!--
3.6 -*** GENERATED FROM project.xml - DO NOT EDIT ***
3.7 -*** EDIT ../build.xml INSTEAD ***
3.8 --->
3.9 -<project name="org.netbeans.libs.commons-impl" basedir="..">
3.10 - <fail message="Please build using Ant 1.7.1 or higher.">
3.11 - <condition>
3.12 - <not>
3.13 - <antversion atleast="1.7.1"/>
3.14 - </not>
3.15 - </condition>
3.16 - </fail>
3.17 - <property file="nbproject/private/suite-private.properties"/>
3.18 - <property file="nbproject/suite.properties"/>
3.19 - <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
3.20 - <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
3.21 - <property file="${suite.dir}/nbproject/platform.properties"/>
3.22 - <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
3.23 - <attribute name="name"/>
3.24 - <attribute name="value"/>
3.25 - <sequential>
3.26 - <property name="@{name}" value="${@{value}}"/>
3.27 - </sequential>
3.28 - </macrodef>
3.29 - <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
3.30 - <attribute name="property"/>
3.31 - <attribute name="value"/>
3.32 - <sequential>
3.33 - <property name="@{property}" value="@{value}"/>
3.34 - </sequential>
3.35 - </macrodef>
3.36 - <property file="${user.properties.file}"/>
3.37 - <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
3.38 - <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
3.39 - <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
3.40 - <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
3.41 - <condition>
3.42 - <not>
3.43 - <contains string="${cluster.path.evaluated}" substring="platform"/>
3.44 - </not>
3.45 - </condition>
3.46 - </fail>
3.47 - <import file="${harness.dir}/build.xml"/>
3.48 -</project>
4.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/genfiles.properties Wed Jul 25 13:49:33 2012 +0200
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,8 +0,0 @@
4.4 -build.xml.data.CRC32=9503a8ee
4.5 -build.xml.script.CRC32=7749a78a
4.6 -build.xml.stylesheet.CRC32=a56c6a5b@1.44
4.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.8 -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.9 -nbproject/build-impl.xml.data.CRC32=610829b0
4.10 -nbproject/build-impl.xml.script.CRC32=6199d30f
4.11 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
5.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/platform.properties Wed Jul 25 13:49:33 2012 +0200
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,18 +0,0 @@
5.4 -nbplatform.default.netbeans.dest.dir=/hudson/workdir/jobs/plsql-support/workspace/ide/netbeans
5.5 -nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness
5.6 -cluster.path=\
5.7 - ${nbplatform.active.dir}/enterprise:\
5.8 - ${nbplatform.active.dir}/harness:\
5.9 - ${nbplatform.active.dir}/ide:\
5.10 - ${nbplatform.active.dir}/java:\
5.11 - ${nbplatform.active.dir}/nb:\
5.12 - ${nbplatform.active.dir}/platform:\
5.13 - ${nbplatform.active.dir}/profiler:\
5.14 - ${nbplatform.active.dir}/websvccommon
5.15 -disabled.modules=\
5.16 - org.netbeans.modules.bugzilla.exceptionreporter,\
5.17 - org.netbeans.modules.ide.branding.kit,\
5.18 - org.netbeans.modules.updatecenters,\
5.19 - org.netbeans.modules.welcome,\
5.20 - org.netbeans.upgrader
5.21 -nbplatform.active=default
6.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/project.properties Wed Jul 25 13:49:33 2012 +0200
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,1 +0,0 @@
6.4 -is.autoload=true
7.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/project.xml Wed Jul 25 13:49:33 2012 +0200
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,22 +0,0 @@
7.4 -<?xml version="1.0" encoding="UTF-8"?>
7.5 -<project xmlns="http://www.netbeans.org/ns/project/1">
7.6 - <type>org.netbeans.modules.apisupport.project</type>
7.7 - <configuration>
7.8 - <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
7.9 - <code-name-base>org.netbeans.libs.commons</code-name-base>
7.10 - <suite-component/>
7.11 - <module-dependencies/>
7.12 - <public-packages>
7.13 - <package>org.apache.commons.io</package>
7.14 - <package>org.apache.commons.io.comparator</package>
7.15 - <package>org.apache.commons.io.filefilter</package>
7.16 - <package>org.apache.commons.io.input</package>
7.17 - <package>org.apache.commons.io.output</package>
7.18 - </public-packages>
7.19 - <class-path-extension>
7.20 - <runtime-relative-path>ext/commons-io-1.4.jar</runtime-relative-path>
7.21 - <binary-origin>release/modules/ext/commons-io-1.4.jar</binary-origin>
7.22 - </class-path-extension>
7.23 - </data>
7.24 - </configuration>
7.25 -</project>
8.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/suite.properties Wed Jul 25 13:49:33 2012 +0200
8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
8.3 @@ -1,1 +0,0 @@
8.4 -suite.dir=${basedir}/../../..
9.1 --- a/Libraries/ThirdParty/libs.commons/src/org/netbeans/libs/commons/Bundle.properties Wed Jul 25 13:49:33 2012 +0200
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,2 +0,0 @@
9.4 -OpenIDE-Module-Display-Category=PL/SQL Support
9.5 -OpenIDE-Module-Name=Apache Commons
10.1 --- a/PLSQL/Execution/src/org/netbeans/modules/plsql/execution/PlsqlFileExecutor.java Wed Jul 25 13:49:33 2012 +0200
10.2 +++ b/PLSQL/Execution/src/org/netbeans/modules/plsql/execution/PlsqlFileExecutor.java Thu Jul 26 14:56:51 2012 +0200
10.3 @@ -85,6 +85,7 @@
10.4 import org.netbeans.modules.db.sql.execute.SQLExecutionResults;
10.5 import org.netbeans.modules.db.sql.execute.StatementInfo;
10.6 import org.netbeans.modules.db.sql.history.SQLHistory;
10.7 +import org.netbeans.modules.db.sql.history.SQLHistoryEntry;
10.8 import org.netbeans.modules.db.sql.history.SQLHistoryManager;
10.9 import org.openide.DialogDisplayer;
10.10 import org.openide.NotifyDescriptor;
10.11 @@ -1353,16 +1354,9 @@
10.12 return null;
10.13 }
10.14
10.15 - private void closeExecutionResult() {
10.16 - if (executionResults != null) {
10.17 - executionResults = null;
10.18 - }
10.19 - }
10.20 -
10.21 private final class SQLExecutor implements Runnable, Cancellable {
10.22
10.23 private static final int DEFAULT_PAGE_SIZE = 100;
10.24 - private FileObject USERDIR = FileUtil.getConfigRoot();
10.25 private final DatabaseConnection dbconn;
10.26 private final String sqlStmt;
10.27 private String label;
10.28 @@ -1424,13 +1418,13 @@
10.29 DataView view = DataView.create(conn, sql, DEFAULT_PAGE_SIZE);
10.30
10.31 // Save SQL statements executed for the SQLHistoryManager
10.32 - SQLHistoryManager.getInstance().saveSQL(new SQLHistory(url, sql, new Date()));
10.33 + SQLHistoryManager.getInstance().saveSQL(new SQLHistoryEntry(url, sql, new Date()));
10.34 result = new SQLExecutionResult(info, view);
10.35 results.add(result);
10.36 }
10.37
10.38 // Persist SQL executed
10.39 - SQLHistoryManager.getInstance().save(USERDIR);
10.40 + SQLHistoryManager.getInstance().save();
10.41
10.42 if (!cancelled) {
10.43 return new SQLExecutionResults(results);
11.1 --- a/PLSQL/Utilities/nbproject/project.xml Wed Jul 25 13:49:33 2012 +0200
11.2 +++ b/PLSQL/Utilities/nbproject/project.xml Thu Jul 26 14:56:51 2012 +0200
11.3 @@ -7,6 +7,14 @@
11.4 <suite-component/>
11.5 <module-dependencies>
11.6 <dependency>
11.7 + <code-name-base>org.apache.commons.io</code-name-base>
11.8 + <build-prerequisite/>
11.9 + <compile-dependency/>
11.10 + <run-dependency>
11.11 + <specification-version>1.4</specification-version>
11.12 + </run-dependency>
11.13 + </dependency>
11.14 + <dependency>
11.15 <code-name-base>org.jdesktop.layout</code-name-base>
11.16 <build-prerequisite/>
11.17 <compile-dependency/>
11.18 @@ -25,14 +33,6 @@
11.19 </run-dependency>
11.20 </dependency>
11.21 <dependency>
11.22 - <code-name-base>org.netbeans.libs.commons</code-name-base>
11.23 - <build-prerequisite/>
11.24 - <compile-dependency/>
11.25 - <run-dependency>
11.26 - <specification-version>1.0</specification-version>
11.27 - </run-dependency>
11.28 - </dependency>
11.29 - <dependency>
11.30 <code-name-base>org.netbeans.modules.db</code-name-base>
11.31 <build-prerequisite/>
11.32 <compile-dependency/>
12.1 --- a/nbproject/genfiles.properties Wed Jul 25 13:49:33 2012 +0200
12.2 +++ b/nbproject/genfiles.properties Thu Jul 26 14:56:51 2012 +0200
12.3 @@ -8,4 +8,4 @@
12.4 nbproject/build-impl.xml.stylesheet.CRC32=196c7090
12.5 nbproject/platform.xml.data.CRC32=fd65edd3
12.6 nbproject/platform.xml.script.CRC32=db9e1f43
12.7 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.47.1
12.8 +nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.50.1
13.1 --- a/nbproject/platform.properties Wed Jul 25 13:49:33 2012 +0200
13.2 +++ b/nbproject/platform.properties Thu Jul 26 14:56:51 2012 +0200
13.3 @@ -1,3 +1,5 @@
13.4 +branding.token=plsql_support
13.5 +nbjdk.active=JDK_1.6
13.6 nbplatform.default.netbeans.dest.dir=/hudson/workdir/jobs/plsql-support/workspace/ide/netbeans
13.7 nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness
13.8 cluster.path=\
13.9 @@ -8,6 +10,7 @@
13.10 ${nbplatform.active.dir}/nb:\
13.11 ${nbplatform.active.dir}/platform:\
13.12 ${nbplatform.active.dir}/profiler:\
13.13 + ${nbplatform.active.dir}/webcommon:\
13.14 ${nbplatform.active.dir}/websvccommon
13.15 disabled.modules=\
13.16 org.netbeans.modules.bugzilla.exceptionreporter,\
14.1 --- a/nbproject/project.properties Wed Jul 25 13:49:33 2012 +0200
14.2 +++ b/nbproject/project.properties Thu Jul 26 14:56:51 2012 +0200
14.3 @@ -1,5 +1,5 @@
14.4 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
14.5 -app.name=plsql_support
14.6 +app.name=${branding.token}
14.7 app.title=PL/SQL Support
14.8 auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
14.9 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
14.10 @@ -7,7 +7,6 @@
14.11 auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
14.12 auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
14.13 auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
14.14 -branding.token=${app.name}
14.15 modules=\
14.16 ${project.org.netbeans.modules.plsqlsupport.db}:\
14.17 ${project.org.netbeans.modules.plsql.annotation}:\
14.18 @@ -26,9 +25,7 @@
14.19 ${project.org.netbeans.modules.plsqlsupport.db.project}:\
14.20 ${project.org.netbeans.modules.plsqlsupport.options}:\
14.21 ${project.org.netbeans.modules.plsql.utilities}:\
14.22 - ${project.org.netbeans.modules.plsql.kit}:\
14.23 - ${project.org.netbeans.libs.commons}
14.24 -project.org.netbeans.libs.commons=Libraries/ThirdParty/libs.commons
14.25 + ${project.org.netbeans.modules.plsql.kit}
14.26 project.org.netbeans.modules.plsql.kit=plsql-support.kit
14.27 project.org.netbeans.modules.plsqlsupport.db=Utilities/Oracle
14.28 project.org.netbeans.modules.plsqlsupport.db.project=PLSQL/Project
15.1 --- a/plsql-support.kit/nbproject/genfiles.properties Wed Jul 25 13:49:33 2012 +0200
15.2 +++ b/plsql-support.kit/nbproject/genfiles.properties Thu Jul 26 14:56:51 2012 +0200
15.3 @@ -1,8 +1,8 @@
15.4 -build.xml.data.CRC32=697bae8e
15.5 +build.xml.data.CRC32=45e5f1d3
15.6 build.xml.script.CRC32=8894d7fe
15.7 -build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
15.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.50.1
15.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
15.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
15.11 -nbproject/build-impl.xml.data.CRC32=697bae8e
15.12 +nbproject/build-impl.xml.data.CRC32=45e5f1d3
15.13 nbproject/build-impl.xml.script.CRC32=4cc852db
15.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
15.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
16.1 --- a/plsql-support.kit/nbproject/project.xml Wed Jul 25 13:49:33 2012 +0200
16.2 +++ b/plsql-support.kit/nbproject/project.xml Thu Jul 26 14:56:51 2012 +0200
16.3 @@ -7,14 +7,6 @@
16.4 <suite-component/>
16.5 <module-dependencies>
16.6 <dependency>
16.7 - <code-name-base>org.netbeans.libs.commons</code-name-base>
16.8 - <build-prerequisite/>
16.9 - <compile-dependency/>
16.10 - <run-dependency>
16.11 - <specification-version>1.0.1</specification-version>
16.12 - </run-dependency>
16.13 - </dependency>
16.14 - <dependency>
16.15 <code-name-base>org.netbeans.modules.plsql.annotation</code-name-base>
16.16 <build-prerequisite/>
16.17 <compile-dependency/>