synched with trunk release701
authorChristian L?vsund <chrislovsund@netbeans.org>
Fri, 23 Sep 2011 10:16:43 +0200
branchrelease701
changeset 25507670718d81
parent 24 0fe2f4b9dd06
parent 21 61fd4349e32e
child 28 431314cb731e
synched with trunk
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/Libraries/ThirdParty/libs.commons/build.xml	Fri Sep 23 10:16:43 2011 +0200
     1.3 @@ -0,0 +1,18 @@
     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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/Libraries/ThirdParty/libs.commons/manifest.mf	Fri Sep 23 10:16:43 2011 +0200
     2.3 @@ -0,0 +1,5 @@
     2.4 +Manifest-Version: 1.0
     2.5 +OpenIDE-Module: org.netbeans.libs.commons
     2.6 +OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/commons/Bundle.properties
     2.7 +OpenIDE-Module-Specification-Version: 1.0
     2.8 +
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/build-impl.xml	Fri Sep 23 10:16:43 2011 +0200
     3.3 @@ -0,0 +1,45 @@
     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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/genfiles.properties	Fri Sep 23 10:16:43 2011 +0200
     4.3 @@ -0,0 +1,8 @@
     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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/platform.properties	Fri Sep 23 10:16:43 2011 +0200
     5.3 @@ -0,0 +1,18 @@
     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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/project.properties	Fri Sep 23 10:16:43 2011 +0200
     6.3 @@ -0,0 +1,1 @@
     6.4 +is.autoload=true
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/project.xml	Fri Sep 23 10:16:43 2011 +0200
     7.3 @@ -0,0 +1,22 @@
     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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/Libraries/ThirdParty/libs.commons/nbproject/suite.properties	Fri Sep 23 10:16:43 2011 +0200
     8.3 @@ -0,0 +1,1 @@
     8.4 +suite.dir=${basedir}/../../..
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/Libraries/ThirdParty/libs.commons/src/org/netbeans/libs/commons/Bundle.properties	Fri Sep 23 10:16:43 2011 +0200
     9.3 @@ -0,0 +1,2 @@
     9.4 +OpenIDE-Module-Display-Category=PL/SQL Support
     9.5 +OpenIDE-Module-Name=Apache Commons
    10.1 --- a/PLSQL/FileType/nbproject/project.xml	Thu Sep 22 15:51:51 2011 +0200
    10.2 +++ b/PLSQL/FileType/nbproject/project.xml	Fri Sep 23 10:16:43 2011 +0200
    10.3 @@ -130,7 +130,7 @@
    10.4                      <build-prerequisite/>
    10.5                      <compile-dependency/>
    10.6                      <run-dependency>
    10.7 -                        <specification-version>7.29</specification-version>
    10.8 +                        <specification-version>7.2.1</specification-version>
    10.9                      </run-dependency>
   10.10                  </dependency>
   10.11                  <dependency>
    11.1 --- a/PLSQL/Utilities/nbproject/project.xml	Thu Sep 22 15:51:51 2011 +0200
    11.2 +++ b/PLSQL/Utilities/nbproject/project.xml	Fri Sep 23 10:16:43 2011 +0200
    11.3 @@ -7,14 +7,6 @@
    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 @@ -33,6 +25,14 @@
   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/build.xml	Thu Sep 22 15:51:51 2011 +0200
    12.2 +++ b/build.xml	Fri Sep 23 10:16:43 2011 +0200
    12.3 @@ -104,7 +104,7 @@
    12.4      
    12.5      <target name="daily" depends="update-binaries,build">
    12.6          <mkdir dir="dist"/>
    12.7 -        <zip destfile="dist/netbeans-trunk-${build.id}-plsql.zip" duplicate="add">
    12.8 +        <zip destfile="dist/netbeans-701-${build.id}-plsql.zip" duplicate="add">
    12.9              <zipfileset dir="build/cluster" prefix="netbeans/extra"/>
   12.10              <zipfileset dir="ide/netbeans" prefix="netbeans"/>
   12.11          </zip>
    13.1 --- a/nbproject/project.properties	Thu Sep 22 15:51:51 2011 +0200
    13.2 +++ b/nbproject/project.properties	Fri Sep 23 10:16:43 2011 +0200
    13.3 @@ -26,7 +26,9 @@
    13.4      ${project.org.netbeans.modules.plsqlsupport.db.project}:\
    13.5      ${project.org.netbeans.modules.plsqlsupport.options}:\
    13.6      ${project.org.netbeans.modules.plsql.utilities}:\
    13.7 -    ${project.org.netbeans.modules.plsql.kit}
    13.8 +    ${project.org.netbeans.modules.plsql.kit}:\
    13.9 +    ${project.org.netbeans.libs.commons}
   13.10 +project.org.netbeans.libs.commons=Libraries/ThirdParty/libs.commons
   13.11  project.org.netbeans.modules.plsql.kit=plsql-support.kit
   13.12  project.org.netbeans.modules.plsqlsupport.db=Utilities/Oracle
   13.13  project.org.netbeans.modules.plsqlsupport.db.project=PLSQL/Project