use OSGi org.apache.commons.io instead of wrapping jar
authorJiri Rechtacek <jrechtacek@netbeans.org>
Thu, 08 Sep 2011 15:39:01 +0200
changeset 175dad9ee14765
parent 16 108e3e22cd40
child 18 718df9e6e612
use OSGi org.apache.commons.io instead of wrapping jar
Libraries/ThirdParty/libs.commons/build.xml
Libraries/ThirdParty/libs.commons/manifest.mf
Libraries/ThirdParty/libs.commons/nbproject/build-impl.xml
Libraries/ThirdParty/libs.commons/nbproject/genfiles.properties
Libraries/ThirdParty/libs.commons/nbproject/project.properties
Libraries/ThirdParty/libs.commons/nbproject/project.xml
Libraries/ThirdParty/libs.commons/nbproject/suite.properties
Libraries/ThirdParty/libs.commons/src/org/netbeans/libs/commons/Bundle.properties
PLSQL/FileType/nbproject/project.xml
PLSQL/Utilities/nbproject/project.xml
nbproject/project.properties
     1.1 --- a/Libraries/ThirdParty/libs.commons/build.xml	Wed Sep 07 11:42:45 2011 +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 Sep 07 11:42:45 2011 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,5 +0,0 @@
     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 --- a/Libraries/ThirdParty/libs.commons/nbproject/build-impl.xml	Wed Sep 07 11:42:45 2011 +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 Sep 07 11:42:45 2011 +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.1
     5.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/project.properties	Wed Sep 07 11:42:45 2011 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,1 +0,0 @@
     5.4 -is.autoload=true
     6.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/project.xml	Wed Sep 07 11:42:45 2011 +0200
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,22 +0,0 @@
     6.4 -<?xml version="1.0" encoding="UTF-8"?>
     6.5 -<project xmlns="http://www.netbeans.org/ns/project/1">
     6.6 -    <type>org.netbeans.modules.apisupport.project</type>
     6.7 -    <configuration>
     6.8 -        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
     6.9 -            <code-name-base>org.netbeans.libs.commons</code-name-base>
    6.10 -            <suite-component/>
    6.11 -            <module-dependencies/>
    6.12 -            <public-packages>
    6.13 -                <package>org.apache.commons.io</package>
    6.14 -                <package>org.apache.commons.io.comparator</package>
    6.15 -                <package>org.apache.commons.io.filefilter</package>
    6.16 -                <package>org.apache.commons.io.input</package>
    6.17 -                <package>org.apache.commons.io.output</package>
    6.18 -            </public-packages>
    6.19 -            <class-path-extension>
    6.20 -                <runtime-relative-path>ext/commons-io-1.4.jar</runtime-relative-path>
    6.21 -                <binary-origin>release/modules/ext/commons-io-1.4.jar</binary-origin>
    6.22 -            </class-path-extension>
    6.23 -        </data>
    6.24 -    </configuration>
    6.25 -</project>
     7.1 --- a/Libraries/ThirdParty/libs.commons/nbproject/suite.properties	Wed Sep 07 11:42:45 2011 +0200
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,1 +0,0 @@
     7.4 -suite.dir=${basedir}/../../..
     8.1 --- a/Libraries/ThirdParty/libs.commons/src/org/netbeans/libs/commons/Bundle.properties	Wed Sep 07 11:42:45 2011 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,2 +0,0 @@
     8.4 -OpenIDE-Module-Display-Category=PL/SQL Support
     8.5 -OpenIDE-Module-Name=Apache Commons
     9.1 --- a/PLSQL/FileType/nbproject/project.xml	Wed Sep 07 11:42:45 2011 +0200
     9.2 +++ b/PLSQL/FileType/nbproject/project.xml	Thu Sep 08 15:39:01 2011 +0200
     9.3 @@ -7,46 +7,6 @@
     9.4              <suite-component/>
     9.5              <module-dependencies>
     9.6                  <dependency>
     9.7 -                    <code-name-base>org.netbeans.modules.plsqlsupport.db</code-name-base>
     9.8 -                    <build-prerequisite/>
     9.9 -                    <compile-dependency/>
    9.10 -                    <run-dependency>
    9.11 -                        <specification-version>1.1.1</specification-version>
    9.12 -                    </run-dependency>
    9.13 -                </dependency>
    9.14 -                <dependency>
    9.15 -                    <code-name-base>org.netbeans.modules.plsqlsupport.options</code-name-base>
    9.16 -                    <build-prerequisite/>
    9.17 -                    <compile-dependency/>
    9.18 -                    <run-dependency>
    9.19 -                        <specification-version>1.0.1</specification-version>
    9.20 -                    </run-dependency>
    9.21 -                </dependency>
    9.22 -                <dependency>
    9.23 -                    <code-name-base>org.netbeans.modules.plsql.annotation</code-name-base>
    9.24 -                    <build-prerequisite/>
    9.25 -                    <compile-dependency/>
    9.26 -                    <run-dependency>
    9.27 -                        <specification-version>1.0</specification-version>
    9.28 -                    </run-dependency>
    9.29 -                </dependency>
    9.30 -                <dependency>
    9.31 -                    <code-name-base>org.netbeans.modules.plsql.lexer</code-name-base>
    9.32 -                    <build-prerequisite/>
    9.33 -                    <compile-dependency/>
    9.34 -                    <run-dependency>
    9.35 -                        <specification-version>1.0</specification-version>
    9.36 -                    </run-dependency>
    9.37 -                </dependency>
    9.38 -                <dependency>
    9.39 -                    <code-name-base>org.netbeans.modules.plsql.utilities</code-name-base>
    9.40 -                    <build-prerequisite/>
    9.41 -                    <compile-dependency/>
    9.42 -                    <run-dependency>
    9.43 -                        <specification-version>1.7.11</specification-version>
    9.44 -                    </run-dependency>
    9.45 -                </dependency>
    9.46 -                <dependency>
    9.47                      <code-name-base>org.netbeans.modules.db</code-name-base>
    9.48                      <build-prerequisite/>
    9.49                      <compile-dependency/>
    9.50 @@ -92,6 +52,46 @@
    9.51                      </run-dependency>
    9.52                  </dependency>
    9.53                  <dependency>
    9.54 +                    <code-name-base>org.netbeans.modules.plsql.annotation</code-name-base>
    9.55 +                    <build-prerequisite/>
    9.56 +                    <compile-dependency/>
    9.57 +                    <run-dependency>
    9.58 +                        <specification-version>1.0</specification-version>
    9.59 +                    </run-dependency>
    9.60 +                </dependency>
    9.61 +                <dependency>
    9.62 +                    <code-name-base>org.netbeans.modules.plsql.lexer</code-name-base>
    9.63 +                    <build-prerequisite/>
    9.64 +                    <compile-dependency/>
    9.65 +                    <run-dependency>
    9.66 +                        <specification-version>1.0</specification-version>
    9.67 +                    </run-dependency>
    9.68 +                </dependency>
    9.69 +                <dependency>
    9.70 +                    <code-name-base>org.netbeans.modules.plsql.utilities</code-name-base>
    9.71 +                    <build-prerequisite/>
    9.72 +                    <compile-dependency/>
    9.73 +                    <run-dependency>
    9.74 +                        <specification-version>1.7.11</specification-version>
    9.75 +                    </run-dependency>
    9.76 +                </dependency>
    9.77 +                <dependency>
    9.78 +                    <code-name-base>org.netbeans.modules.plsqlsupport.db</code-name-base>
    9.79 +                    <build-prerequisite/>
    9.80 +                    <compile-dependency/>
    9.81 +                    <run-dependency>
    9.82 +                        <specification-version>1.1.1</specification-version>
    9.83 +                    </run-dependency>
    9.84 +                </dependency>
    9.85 +                <dependency>
    9.86 +                    <code-name-base>org.netbeans.modules.plsqlsupport.options</code-name-base>
    9.87 +                    <build-prerequisite/>
    9.88 +                    <compile-dependency/>
    9.89 +                    <run-dependency>
    9.90 +                        <specification-version>1.0.1</specification-version>
    9.91 +                    </run-dependency>
    9.92 +                </dependency>
    9.93 +                <dependency>
    9.94                      <code-name-base>org.netbeans.modules.projectapi</code-name-base>
    9.95                      <build-prerequisite/>
    9.96                      <compile-dependency/>
    9.97 @@ -130,7 +130,7 @@
    9.98                      <build-prerequisite/>
    9.99                      <compile-dependency/>
   9.100                      <run-dependency>
   9.101 -                        <specification-version>7.2.1</specification-version>
   9.102 +                        <specification-version>7.29</specification-version>
   9.103                      </run-dependency>
   9.104                  </dependency>
   9.105                  <dependency>
    10.1 --- a/PLSQL/Utilities/nbproject/project.xml	Wed Sep 07 11:42:45 2011 +0200
    10.2 +++ b/PLSQL/Utilities/nbproject/project.xml	Thu Sep 08 15:39:01 2011 +0200
    10.3 @@ -7,6 +7,14 @@
    10.4              <suite-component/>
    10.5              <module-dependencies>
    10.6                  <dependency>
    10.7 +                    <code-name-base>org.apache.commons.io</code-name-base>
    10.8 +                    <build-prerequisite/>
    10.9 +                    <compile-dependency/>
   10.10 +                    <run-dependency>
   10.11 +                        <specification-version>1.4</specification-version>
   10.12 +                    </run-dependency>
   10.13 +                </dependency>
   10.14 +                <dependency>
   10.15                      <code-name-base>org.jdesktop.layout</code-name-base>
   10.16                      <build-prerequisite/>
   10.17                      <compile-dependency/>
   10.18 @@ -25,14 +33,6 @@
   10.19                      </run-dependency>
   10.20                  </dependency>
   10.21                  <dependency>
   10.22 -                    <code-name-base>org.netbeans.libs.commons</code-name-base>
   10.23 -                    <build-prerequisite/>
   10.24 -                    <compile-dependency/>
   10.25 -                    <run-dependency>
   10.26 -                        <specification-version>1.0</specification-version>
   10.27 -                    </run-dependency>
   10.28 -                </dependency>
   10.29 -                <dependency>
   10.30                      <code-name-base>org.netbeans.modules.db</code-name-base>
   10.31                      <build-prerequisite/>
   10.32                      <compile-dependency/>
    11.1 --- a/nbproject/project.properties	Wed Sep 07 11:42:45 2011 +0200
    11.2 +++ b/nbproject/project.properties	Thu Sep 08 15:39:01 2011 +0200
    11.3 @@ -26,9 +26,7 @@
    11.4      ${project.org.netbeans.modules.plsqlsupport.db.project}:\
    11.5      ${project.org.netbeans.modules.plsqlsupport.options}:\
    11.6      ${project.org.netbeans.modules.plsql.utilities}:\
    11.7 -    ${project.org.netbeans.libs.commons}:\
    11.8      ${project.org.netbeans.modules.plsql.kit}
    11.9 -project.org.netbeans.libs.commons=Libraries/ThirdParty/libs.commons
   11.10  project.org.netbeans.modules.plsql.kit=plsql-support.kit
   11.11  project.org.netbeans.modules.plsqlsupport.db=Utilities/Oracle
   11.12  project.org.netbeans.modules.plsqlsupport.db.project=PLSQL/Project