gephi.team team mailing list archive
-
gephi.team team
-
Mailing list archive
-
Message #02044
[Merge] lp:~rockclimb/gephi/commons-compress into lp:gephi
Andrew Ross has proposed merging lp:~rockclimb/gephi/commons-compress into lp:gephi.
Requested reviews:
Gephi Team (gephi.team)
For more details, see:
https://code.launchpad.net/~rockclimb/gephi/commons-compress/+merge/55025
The compression libraries in Apache commons-compress (http://commons.apache.org/compress/) are based around the ant compression libraries, but are more designed around the end user. For example, you don't need to skip over the "BZ" yourself.
In this posting a committer to both projects suggests commons-compress might be better for downstream use:
http://ant.1045680.n5.nabble.com/status-of-org-apache-tools-bzip2-tar-td3204506.html
It can also handle a variety of archive formats (ar, cpio, tar, zip, jar) and can automatically identify the use of gzip/bzip2. Because it supports gzip and bzip2 it should be possible to reduce the code required to support both.
For now, this branch just replaces BZIP2Wrapper with CommonsCodecWrapper and makes a couple of source changes to support this, but the remaining compression infrastructure you've put in place is intact.
--
https://code.launchpad.net/~rockclimb/gephi/commons-compress/+merge/55025
Your team Gephi Team is requested to review the proposed merge of lp:~rockclimb/gephi/commons-compress into lp:gephi.
=== removed directory 'BZIP2Wrapper'
=== removed file 'BZIP2Wrapper/APACHE-LICENSE-1.1'
--- BZIP2Wrapper/APACHE-LICENSE-1.1 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/APACHE-LICENSE-1.1 1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@xxxxxxxxxx.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
=== removed file 'BZIP2Wrapper/build.xml'
--- BZIP2Wrapper/build.xml 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/build.xml 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.apache.tools.bzip2" default="netbeans" basedir=".">
- <description>Builds, tests, and runs the project org.apache.tools.bzip2.</description>
- <import file="nbproject/build-impl.xml"/>
-</project>
=== removed file 'BZIP2Wrapper/manifest.mf'
--- BZIP2Wrapper/manifest.mf 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/manifest.mf 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.apache.tools.bzip2
-OpenIDE-Module-Localizing-Bundle: org/apache/tools/bzip2/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
=== removed directory 'BZIP2Wrapper/nbproject'
=== removed file 'BZIP2Wrapper/nbproject/build-impl.xml'
--- BZIP2Wrapper/nbproject/build-impl.xml 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/nbproject/build-impl.xml 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
--->
-<project name="org.apache.tools.bzip2-impl" basedir="..">
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <property file="nbproject/private/suite-private.properties"/>
- <property file="nbproject/suite.properties"/>
- <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
- <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
- <property file="${suite.dir}/nbproject/platform.properties"/>
- <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2";>
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2";>
- <attribute name="property"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{property}" value="@{value}"/>
- </sequential>
- </macrodef>
- <property file="${user.properties.file}"/>
- <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
- <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
- <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
- <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
- <condition>
- <not>
- <contains string="${cluster.path.evaluated}" substring="platform"/>
- </not>
- </condition>
- </fail>
- <import file="${harness.dir}/build.xml"/>
-</project>
=== removed file 'BZIP2Wrapper/nbproject/genfiles.properties'
--- BZIP2Wrapper/nbproject/genfiles.properties 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/nbproject/genfiles.properties 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=92b8ba7d
-build.xml.script.CRC32=07479512
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=92b8ba7d
-nbproject/build-impl.xml.script.CRC32=87bcdd04
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
=== removed file 'BZIP2Wrapper/nbproject/project.properties'
--- BZIP2Wrapper/nbproject/project.properties 2010-12-13 06:23:52 +0000
+++ BZIP2Wrapper/nbproject/project.properties 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-is.autoload=true
-license.file=${basedir}/APACHE-LICENSE-1.1
-keystore=nbproject/private/keystore.ks
-nbm_alias=gephi
\ No newline at end of file
=== removed file 'BZIP2Wrapper/nbproject/project.xml'
--- BZIP2Wrapper/nbproject/project.xml 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/nbproject/project.xml 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1";>
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3";>
- <code-name-base>org.apache.tools.bzip2</code-name-base>
- <suite-component/>
- <module-dependencies/>
- <public-packages>
- <package>org.apache.tools.bzip2</package>
- </public-packages>
- <class-path-extension>
- <runtime-relative-path>ext/bzip2.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/bzip2.jar</binary-origin>
- </class-path-extension>
- </data>
- </configuration>
-</project>
=== removed file 'BZIP2Wrapper/nbproject/suite.properties'
--- BZIP2Wrapper/nbproject/suite.properties 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/nbproject/suite.properties 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-suite.dir=${basedir}/..
=== removed directory 'BZIP2Wrapper/release'
=== removed directory 'BZIP2Wrapper/release/modules'
=== removed directory 'BZIP2Wrapper/release/modules/ext'
=== removed file 'BZIP2Wrapper/release/modules/ext/bzip2.jar'
Binary files BZIP2Wrapper/release/modules/ext/bzip2.jar 2010-12-09 08:11:13 +0000 and BZIP2Wrapper/release/modules/ext/bzip2.jar 1970-01-01 00:00:00 +0000 differ
=== removed directory 'BZIP2Wrapper/src'
=== removed directory 'BZIP2Wrapper/src/org'
=== removed directory 'BZIP2Wrapper/src/org/apache'
=== removed directory 'BZIP2Wrapper/src/org/apache/tools'
=== removed directory 'BZIP2Wrapper/src/org/apache/tools/bzip2'
=== removed file 'BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle.properties'
--- BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle.properties 2010-12-09 08:11:13 +0000
+++ BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle.properties 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-OpenIDE-Module-Display-Category=Libraries
-OpenIDE-Module-Long-Description=\
- More info: http://www.kohsuke.org/bzip2/
-OpenIDE-Module-Name=BZIP2Wrapper
-OpenIDE-Module-Short-Description=bzip2 library from Apache Ant
=== removed file 'BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle_es.properties'
--- BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle_es.properties 2011-03-13 13:34:53 +0000
+++ BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle_es.properties 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Spanish translation for gephi
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the gephi package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-!=Project-Id-Version\: gephi\nReport-Msgid-Bugs-To\: FULL NAME <EMAIL@ADDRESS>\nPOT-Creation-Date\: 2010-04-07 13\:16+0200\nPO-Revision-Date\: 2011-03-01 19\:56+0000\nLast-Translator\: Eduardo Ramos <Unknown>\nLanguage-Team\: Spanish <es@xxxxxx>\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nX-Launchpad-Export-Date\: 2011-03-13 04\:49+0000\nX-Generator\: Launchpad (build 12559)\n
-
-OpenIDE-Module-Long-Description=M\u00e1s informaci\u00f3n\: http\://www.kohsuke.org/bzip2/
-
-OpenIDE-Module-Short-Description=Librer\u00eda bzip2 de Apache Ant
=== removed file 'BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle_fr.properties'
--- BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle_fr.properties 2011-03-13 13:34:53 +0000
+++ BZIP2Wrapper/src/org/apache/tools/bzip2/Bundle_fr.properties 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# French translation for gephi
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the gephi package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-!=Project-Id-Version\: gephi\nReport-Msgid-Bugs-To\: FULL NAME <EMAIL@ADDRESS>\nPOT-Creation-Date\: 2010-04-07 13\:16+0200\nPO-Revision-Date\: 2011-03-12 21\:21+0000\nLast-Translator\: S\u00e9bastien Heymann <Unknown>\nLanguage-Team\: French <fr@xxxxxx>\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nX-Launchpad-Export-Date\: 2011-03-13 04\:49+0000\nX-Generator\: Launchpad (build 12559)\n
-
-OpenIDE-Module-Long-Description=More info\: http\://www.kohsuke.org/bzip2/
-
-OpenIDE-Module-Short-Description=Biblioth\u00e8que Bzip2 de Apache Ant
=== removed file 'BZIP2Wrapper/src/org/apache/tools/bzip2/es.po'
--- BZIP2Wrapper/src/org/apache/tools/bzip2/es.po 2011-03-13 04:49:36 +0000
+++ BZIP2Wrapper/src/org/apache/tools/bzip2/es.po 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# Spanish translation for gephi
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the gephi package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gephi\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-07 13:16+0200\n"
-"PO-Revision-Date: 2011-03-01 19:56+0000\n"
-"Last-Translator: Eduardo Ramos <Unknown>\n"
-"Language-Team: Spanish <es@xxxxxx>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-13 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-msgid "OpenIDE-Module-Long-Description"
-msgstr "Más información: http://www.kohsuke.org/bzip2/";
-
-msgid "OpenIDE-Module-Short-Description"
-msgstr "LibrerÃa bzip2 de Apache Ant"
=== removed file 'BZIP2Wrapper/src/org/apache/tools/bzip2/fr.po'
--- BZIP2Wrapper/src/org/apache/tools/bzip2/fr.po 2011-03-13 04:49:36 +0000
+++ BZIP2Wrapper/src/org/apache/tools/bzip2/fr.po 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# French translation for gephi
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the gephi package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gephi\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-07 13:16+0200\n"
-"PO-Revision-Date: 2011-03-12 21:21+0000\n"
-"Last-Translator: Sébastien Heymann <Unknown>\n"
-"Language-Team: French <fr@xxxxxx>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-13 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-msgid "OpenIDE-Module-Long-Description"
-msgstr "More info: http://www.kohsuke.org/bzip2/";
-
-msgid "OpenIDE-Module-Short-Description"
-msgstr "Bibliothèque Bzip2 de Apache Ant"
=== removed file 'BZIP2Wrapper/src/org/apache/tools/bzip2/org-apache-tools-bzip2.pot'
--- BZIP2Wrapper/src/org/apache/tools/bzip2/org-apache-tools-bzip2.pot 2010-12-25 14:59:37 +0000
+++ BZIP2Wrapper/src/org/apache/tools/bzip2/org-apache-tools-bzip2.pot 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# English (en) translation for Gephi.
-# Copyright (C) 2010 Gephi contributors.
-# This file is distributed under the same license as the Gephi package.
-# Gephi Team <gephi.team@xxxxxxxxxxxxxxxxxxx>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Gephi 0.7\n"
-"Report-Msgid-Bugs-To: gephi.team@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-04-07 13:16+0200\n"
-"PO-Revision-Date: 2010-04-07 13:16+0200\n"
-"Last-Translator: Mathieu Bastian <gephi.team@xxxxxxxxxxxxxxxxxxx>\n"
-"Language-Team: English <https://launchpad.net/~gephi.team>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "OpenIDE-Module-Long-Description"
-msgstr "More info: http://www.kohsuke.org/bzip2/";
-
-msgid "OpenIDE-Module-Short-Description"
-msgstr "bzip2 library from Apache Ant"
=== added directory 'CommonsCompressWrapper'
=== added file 'CommonsCompressWrapper/LICENSE.txt'
--- CommonsCompressWrapper/LICENSE.txt 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/LICENSE.txt 2011-03-27 21:41:03 +0000
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
=== added file 'CommonsCompressWrapper/build.xml'
--- CommonsCompressWrapper/build.xml 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/build.xml 2011-03-27 21:41:03 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.gephi.lib.commonscompress" default="netbeans" basedir=".">
+ <description>Builds, tests, and runs the project org.gephi.lib.commonscompress.</description>
+ <import file="nbproject/build-impl.xml"/>
+</project>
=== added file 'CommonsCompressWrapper/manifest.mf'
--- CommonsCompressWrapper/manifest.mf 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/manifest.mf 2011-03-27 21:41:03 +0000
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.gephi.lib.commonscompress
+OpenIDE-Module-Localizing-Bundle: org/gephi/lib/commonscompress/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
=== added directory 'CommonsCompressWrapper/nbproject'
=== added file 'CommonsCompressWrapper/nbproject/build-impl.xml'
--- CommonsCompressWrapper/nbproject/build-impl.xml 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/nbproject/build-impl.xml 2011-03-27 21:41:03 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT ***
+*** EDIT ../build.xml INSTEAD ***
+-->
+<project name="org.gephi.lib.commonscompress-impl" basedir="..">
+ <fail message="Please build using Ant 1.7.1 or higher.">
+ <condition>
+ <not>
+ <antversion atleast="1.7.1"/>
+ </not>
+ </condition>
+ </fail>
+ <property file="nbproject/private/suite-private.properties"/>
+ <property file="nbproject/suite.properties"/>
+ <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+ <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+ <property file="${suite.dir}/nbproject/platform.properties"/>
+ <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2";>
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{name}" value="${@{value}}"/>
+ </sequential>
+ </macrodef>
+ <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2";>
+ <attribute name="property"/>
+ <attribute name="value"/>
+ <sequential>
+ <property name="@{property}" value="@{value}"/>
+ </sequential>
+ </macrodef>
+ <property file="${user.properties.file}"/>
+ <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+ <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+ <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+ <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+ <condition>
+ <not>
+ <contains string="${cluster.path.evaluated}" substring="platform"/>
+ </not>
+ </condition>
+ </fail>
+ <import file="${harness.dir}/build.xml"/>
+</project>
=== added file 'CommonsCompressWrapper/nbproject/genfiles.properties'
--- CommonsCompressWrapper/nbproject/genfiles.properties 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/nbproject/genfiles.properties 2011-03-27 21:41:03 +0000
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=79bdd3d3
+build.xml.script.CRC32=fbd248d3
+build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=79bdd3d3
+nbproject/build-impl.xml.script.CRC32=5f0db784
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1
=== added file 'CommonsCompressWrapper/nbproject/project.properties'
--- CommonsCompressWrapper/nbproject/project.properties 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/nbproject/project.properties 2011-03-27 21:41:03 +0000
@@ -0,0 +1,2 @@
+is.autoload=true
+license.file=${basedir}/LICENSE.txt
=== added file 'CommonsCompressWrapper/nbproject/project.xml'
--- CommonsCompressWrapper/nbproject/project.xml 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/nbproject/project.xml 2011-03-27 21:41:03 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1";>
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3";>
+ <code-name-base>org.gephi.lib.commonscompress</code-name-base>
+ <suite-component/>
+ <module-dependencies/>
+ <public-packages>
+ <package>org.apache.commons.compress.archivers</package>
+ <package>org.apache.commons.compress.archivers.ar</package>
+ <package>org.apache.commons.compress.archivers.cpio</package>
+ <package>org.apache.commons.compress.archivers.jar</package>
+ <package>org.apache.commons.compress.archivers.tar</package>
+ <package>org.apache.commons.compress.archivers.zip</package>
+ <package>org.apache.commons.compress.changes</package>
+ <package>org.apache.commons.compress.compressors</package>
+ <package>org.apache.commons.compress.compressors.bzip2</package>
+ <package>org.apache.commons.compress.compressors.gzip</package>
+ <package>org.apache.commons.compress.utils</package>
+ </public-packages>
+ <class-path-extension>
+ <runtime-relative-path>ext/commons-compress-1.1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/commons-compress-1.1.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
=== added file 'CommonsCompressWrapper/nbproject/suite.properties'
--- CommonsCompressWrapper/nbproject/suite.properties 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/nbproject/suite.properties 2011-03-27 21:41:03 +0000
@@ -0,0 +1,1 @@
+suite.dir=${basedir}/..
=== added directory 'CommonsCompressWrapper/release'
=== added directory 'CommonsCompressWrapper/release/modules'
=== added directory 'CommonsCompressWrapper/release/modules/ext'
=== added file 'CommonsCompressWrapper/release/modules/ext/commons-compress-1.1.jar'
Binary files CommonsCompressWrapper/release/modules/ext/commons-compress-1.1.jar 1970-01-01 00:00:00 +0000 and CommonsCompressWrapper/release/modules/ext/commons-compress-1.1.jar 2011-03-27 21:41:03 +0000 differ
=== added directory 'CommonsCompressWrapper/src'
=== added directory 'CommonsCompressWrapper/src/org'
=== added directory 'CommonsCompressWrapper/src/org/gephi'
=== added directory 'CommonsCompressWrapper/src/org/gephi/lib'
=== added directory 'CommonsCompressWrapper/src/org/gephi/lib/commonscompress'
=== added file 'CommonsCompressWrapper/src/org/gephi/lib/commonscompress/Bundle.properties'
--- CommonsCompressWrapper/src/org/gephi/lib/commonscompress/Bundle.properties 1970-01-01 00:00:00 +0000
+++ CommonsCompressWrapper/src/org/gephi/lib/commonscompress/Bundle.properties 2011-03-27 21:41:03 +0000
@@ -0,0 +1,5 @@
+OpenIDE-Module-Display-Category=Libraries
+OpenIDE-Module-Long-Description=\
+ Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files.
+OpenIDE-Module-Name=CommonsCompress Wrapper
+OpenIDE-Module-Short-Description=Compression Utility Classes
=== modified file 'DesktopImport/nbproject/genfiles.properties'
--- DesktopImport/nbproject/genfiles.properties 2010-11-27 23:34:52 +0000
+++ DesktopImport/nbproject/genfiles.properties 2011-03-27 21:41:03 +0000
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=7d31807e
+build.xml.data.CRC32=d67981a3
build.xml.script.CRC32=ebb9659e
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7d31807e
+nbproject/build-impl.xml.data.CRC32=d67981a3
nbproject/build-impl.xml.script.CRC32=76f916b1
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1
=== modified file 'DesktopImport/nbproject/project.xml'
--- DesktopImport/nbproject/project.xml 2010-11-27 23:34:52 +0000
+++ DesktopImport/nbproject/project.xml 2011-03-27 21:41:03 +0000
@@ -7,14 +7,6 @@
<suite-component/>
<module-dependencies>
<dependency>
- <code-name-base>org.apache.tools.bzip2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.gephi.desktop.mrufiles.api</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -39,6 +31,14 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.gephi.lib.commonscompress</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.gephi.lib.validation</code-name-base>
<build-prerequisite/>
<compile-dependency/>
=== modified file 'DesktopImport/src/org/gephi/desktop/importer/DesktopImportControllerUI.java'
--- DesktopImport/src/org/gephi/desktop/importer/DesktopImportControllerUI.java 2011-02-16 04:51:24 +0000
+++ DesktopImport/src/org/gephi/desktop/importer/DesktopImportControllerUI.java 2011-03-27 21:41:03 +0000
@@ -35,7 +35,7 @@
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import org.apache.tools.bzip2.CBZip2InputStream;
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.gephi.desktop.importer.api.ImportControllerUI;
import org.gephi.desktop.mrufiles.api.MostRecentFiles;
import org.gephi.desktop.project.api.ProjectControllerUI;
@@ -588,14 +588,12 @@
final int BUFF_SIZE = 8192;
final byte[] buffer = new byte[BUFF_SIZE];
- CBZip2InputStream inputStream = null;
+ BZip2CompressorInputStream inputStream = null;
FileOutputStream outStream = null;
try {
FileInputStream is = new FileInputStream(in.getPath());
- is.read(); // 'B'
- is.read(); // 'Z'
- inputStream = new CBZip2InputStream(is);
+ inputStream = new BZip2CompressorInputStream(is);
outStream = new FileOutputStream(out.getAbsolutePath());
if (isTar) {
=== modified file 'DesktopRecentFiles/nbproject/genfiles.properties'
--- DesktopRecentFiles/nbproject/genfiles.properties 2011-03-13 01:18:25 +0000
+++ DesktopRecentFiles/nbproject/genfiles.properties 2011-03-27 21:41:03 +0000
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9412fa29
+build.xml.data.CRC32=cbf82cd7
build.xml.script.CRC32=d11e6704
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=9412fa29
+nbproject/build-impl.xml.data.CRC32=cbf82cd7
nbproject/build-impl.xml.script.CRC32=d3095729
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1
=== modified file 'DesktopRecentFiles/nbproject/project.xml'
--- DesktopRecentFiles/nbproject/project.xml 2011-03-13 01:18:25 +0000
+++ DesktopRecentFiles/nbproject/project.xml 2011-03-27 21:41:03 +0000
@@ -35,7 +35,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>7.38.2</specification-version>
+ <specification-version>7.32.1.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
=== modified file 'ImportAPI/nbproject/genfiles.properties'
--- ImportAPI/nbproject/genfiles.properties 2010-11-27 23:34:52 +0000
+++ ImportAPI/nbproject/genfiles.properties 2011-03-27 21:41:03 +0000
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=7579a21f
+build.xml.data.CRC32=a93b69f0
build.xml.script.CRC32=b4f97337
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
+build.xml.stylesheet.CRC32=a56c6a5b@1.42.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7579a21f
+nbproject/build-impl.xml.data.CRC32=a93b69f0
nbproject/build-impl.xml.script.CRC32=e4520cda
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.1
=== modified file 'ImportAPI/nbproject/project.xml'
--- ImportAPI/nbproject/project.xml 2010-11-27 23:34:52 +0000
+++ ImportAPI/nbproject/project.xml 2011-03-27 21:41:03 +0000
@@ -7,14 +7,6 @@
<suite-component/>
<module-dependencies>
<dependency>
- <code-name-base>org.apache.tools.bzip2</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.gephi.data.attributes.api</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -47,6 +39,14 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.gephi.lib.commonscompress</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.gephi.project.api</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -59,7 +59,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>0.7</specification-version>
+ <specification-version>0.7.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
=== modified file 'ImportAPI/src/org/gephi/io/importer/api/ImportUtils.java'
--- ImportAPI/src/org/gephi/io/importer/api/ImportUtils.java 2010-11-29 01:14:45 +0000
+++ ImportAPI/src/org/gephi/io/importer/api/ImportUtils.java 2011-03-27 21:41:03 +0000
@@ -38,7 +38,7 @@
import javax.xml.stream.XMLReporter;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tools.bzip2.CBZip2InputStream;
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.gephi.utils.CharsetToolkit;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -167,14 +167,12 @@
final int BUFF_SIZE = 8192;
final byte[] buffer = new byte[BUFF_SIZE];
- CBZip2InputStream inputStream = null;
+ BZip2CompressorInputStream inputStream = null;
FileOutputStream outStream = null;
try {
FileInputStream is = new FileInputStream(in.getPath());
- is.read(); // 'B'
- is.read(); // 'Z'
- inputStream = new CBZip2InputStream(is);
+ inputStream = new BZip2CompressorInputStream(is);
outStream = new FileOutputStream(out.getAbsolutePath());
if (isTar) {
=== modified file 'nbproject/private/private.xml'
--- nbproject/private/private.xml 2011-03-27 03:04:12 +0000
+++ nbproject/private/private.xml 2011-03-27 21:41:03 +0000
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1";>
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
- <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1";>
- <file>file:/Users/mbastian/dev/gephi/build.xml</file>
- </open-files>
</project-private>
=== modified file 'nbproject/project.properties'
--- nbproject/project.properties 2011-03-27 03:04:12 +0000
+++ nbproject/project.properties 2011-03-27 21:41:03 +0000
@@ -7,7 +7,6 @@
auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
auxiliary.org-netbeans-modules-apisupport-installer.os-windows=false
auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
-project.org.apache.tools.bzip2=BZIP2Wrapper
project.org.gephi.algorithms=Algorithms
project.org.gephi.clustering.api=ClusteringAPI
project.org.gephi.clustering.plugin=ClusteringPlugin
@@ -55,6 +54,7 @@
project.org.gephi.desktop.generate=DesktopGenerate
project.org.gephi.lib.beansbinding=BeansBindingWrapper
project.org.gephi.lib.commons.codec=CommonsCodec
+project.org.gephi.lib.commonscompress=CommonsCompressWrapper
project.org.gephi.lib.flamingo=FlamingoWrapper
project.org.gephi.lib.itext=iTextWrapper
project.org.gephi.lib.javacsv=JavaCSVWrapper
@@ -195,10 +195,10 @@
${project.org.gephi.datalab.api}:\
${project.org.gephi.datalab.plugin}:\
${project.org.gephi.desktop.datalab}:\
- ${project.org.apache.tools.bzip2}:\
${project.org.gephi.desktop.recentfiles}:\
${project.org.gephi.lib.javamail}:\
- ${project.org.gephi.lib.jcalendar}
+ ${project.org.gephi.lib.jcalendar}:\
+ ${project.org.gephi.lib.commonscompress}
project.org.gephi.branding.desktop=DesktopBranding
project.org.gephi.data.attributes=AttributesImpl
project.org.gephi.data.attributes.api=AttributesAPI
Follow ups
