Permalink
Browse files

Add core and ui library wrapper modules. Update module dependencies.

  • Loading branch information...
1 parent 5c635bb commit b5db9996ab1df84aeae0e5dd3a5d2a78f7b88512 @mbastian mbastian committed Oct 12, 2012
Showing with 407 additions and 214 deletions.
  1. +3 −1 .gitignore
  2. +3 −36 modules/CollectionUtils/pom.xml
  3. +126 −0 modules/CoreLibraryWrapper/pom.xml
  4. +2 −0 modules/CoreLibraryWrapper/src/main/nbm/manifest.mf
  5. +9 −0 modules/CoreLibraryWrapper/src/main/nbm/module.xml
  6. +5 −0 modules/CoreLibraryWrapper/src/main/resources/org/gephi/lib/core/Bundle.properties
  7. +12 −0 modules/DBDrivers/pom.xml
  8. +4 −5 modules/DHNSGraph/pom.xml
  9. +2 −3 modules/DataLaboratoryAPI/pom.xml
  10. +7 −14 modules/DataLaboratoryPlugin/pom.xml
  11. +4 −12 modules/DesktopBranding/pom.xml
  12. +4 −5 modules/DesktopClustering/pom.xml
  13. +1 −1 modules/DesktopContext/pom.xml
  14. +4 −0 modules/DesktopDataLaboratory/pom.xml
  15. +4 −0 modules/DesktopHierarchy/pom.xml
  16. +1 −1 modules/DesktopImport/pom.xml
  17. +4 −6 modules/DesktopLayout/pom.xml
  18. +5 −1 modules/DesktopPartition/pom.xml
  19. +8 −0 modules/DesktopPreview/pom.xml
  20. +0 −2 modules/DesktopProject/pom.xml
  21. +4 −0 modules/DesktopRanking/pom.xml
  22. +4 −0 modules/DesktopStatistics/pom.xml
  23. +10 −7 modules/DesktopTimeline/pom.xml
  24. +4 −0 modules/DesktopTools/pom.xml
  25. +5 −6 modules/ExportPlugin/pom.xml
  26. +1 −1 modules/ExportPluginUI/pom.xml
  27. +4 −0 modules/FiltersPluginUI/pom.xml
  28. +1 −1 modules/ImportAPI/pom.xml
  29. +4 −0 modules/ImportPlugin/pom.xml
  30. +4 −5 modules/ImportPluginUI/pom.xml
  31. +4 −5 modules/PartitionAPI/pom.xml
  32. +4 −0 modules/PartitionPluginUI/pom.xml
  33. +4 −29 modules/PreviewAPI/pom.xml
  34. +4 −0 modules/PreviewExport/pom.xml
  35. +5 −1 modules/PreviewExportUI/pom.xml
  36. +5 −1 modules/PreviewPlugin/pom.xml
  37. +1 −1 modules/ProcessorPluginUI/pom.xml
  38. +1 −1 modules/RankingPluginUI/pom.xml
  39. +5 −2 modules/SpigotPlugin/pom.xml
  40. +5 −7 modules/SplineEditor/pom.xml
  41. +1 −2 modules/StatisticsAPI/pom.xml
  42. +1 −1 modules/StatisticsPlugin/pom.xml
  43. +2 −3 modules/StatisticsPluginUI/pom.xml
  44. +3 −42 modules/UIComponents/pom.xml
  45. +78 −0 modules/UILibraryWrapper/pom.xml
  46. +2 −0 modules/UILibraryWrapper/src/main/nbm/manifest.mf
  47. +9 −0 modules/UILibraryWrapper/src/main/nbm/module.xml
  48. +5 −0 modules/UILibraryWrapper/src/main/resources/org/gephi/lib/ui/Bundle.properties
  49. +1 −1 modules/UIUtils/pom.xml
  50. +3 −4 modules/Utils/pom.xml
  51. +4 −0 modules/VisualizationImpl/pom.xml
  52. +5 −1 modules/WelcomeScreen/pom.xml
  53. +2 −2 modules/application/pom.xml
  54. +4 −4 pom.xml
View
@@ -92,4 +92,6 @@ keystore.ks
/modules/WelcomeScreen/target/
/modules/WorkspaceUI/target/
/modules/JFreeChartWrapper/target/
-/modules/CommonsWrapper/target/
+/modules/CommonsWrapper/target/
+/modules/CoreLibraryWrapper/target/
+/modules/UILibraryWrapper/target/
@@ -5,7 +5,7 @@
<artifactId>gephi-parent</artifactId>
<groupId>org.gephi</groupId>
<version>0.8.2-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.gephi</groupId>
@@ -17,14 +17,8 @@
<dependencies>
<dependency>
- <groupId>gnu.trove</groupId>
- <artifactId>trove</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-library-wrapper</artifactId>
</dependency>
</dependencies>
@@ -35,37 +29,10 @@
<artifactId>nbm-maven-plugin</artifactId>
<configuration>
<publicPackages>
- <publicPackage>com.google.common.annotations</publicPackage>
- <publicPackage>com.google.common.base</publicPackage>
- <publicPackage>com.google.common.base.internal</publicPackage>
- <publicPackage>com.google.common.collect</publicPackage>
- <publicPackage>gnu.trove</publicPackage>
- <publicPackage>gnu.trove.decorator</publicPackage>
<publicPackage>org.gephi.utils.collection.avl</publicPackage>
</publicPackages>
</configuration>
</plugin>
-
- <plugin>
- <!-- NetBeans 6.9+ requires JDK 6 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <!-- to have the jar plugin pickup the nbm generated manifest -->
- <useDefaultManifestFile>true</useDefaultManifestFile>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>gephi-parent</artifactId>
+ <groupId>org.gephi</groupId>
+ <version>0.8.2-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+ <groupId>org.gephi</groupId>
+ <artifactId>core-library-wrapper</artifactId>
+ <version>0.8.2-SNAPSHOT</version>
+ <packaging>nbm</packaging>
+
+ <name>CoreLibraryWrapper</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>snapshot-20100402</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.13</version>
+ </dependency>
+ <dependency>
+ <groupId>gnu.trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.javacsv</groupId>
+ <artifactId>javacsv</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
+ <artifactId>xml-apis-ext</artifactId>
+ <groupId>xml-apis</groupId>
+ <type>jar</type>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-js</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.processing</groupId>
+ <artifactId>core</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <configuration>
+ <publicPackages>
+ <publicPackage>org.joda.time.*</publicPackage>
+ <publicPackage>org.apache.commons.codec.*</publicPackage>
+ <publicPackage>org.apache.commons.compress.*</publicPackage>
+ <publicPackage>org.jfree.*</publicPackage>
+ <publicPackage>com.google.common.annotations</publicPackage>
+ <publicPackage>com.google.common.base</publicPackage>
+ <publicPackage>com.google.common.base.internal</publicPackage>
+ <publicPackage>com.google.common.collect</publicPackage>
+ <publicPackage>gnu.trove</publicPackage>
+ <publicPackage>gnu.trove.decorator</publicPackage>
+ <publicPackage>com.csvreader</publicPackage>
+ <publicPackage>javax.xml.*</publicPackage>
+ <publicPackage>org.w3c.*</publicPackage>
+ <publicPackage>com.itextpdf.text.*</publicPackage>
+ <publicPackage>processing.*</publicPackage>
+ <publicPackage>org.apache.batik.*</publicPackage>
+ <publicPackage>org.apache.xpath.*</publicPackage>
+ <publicPackage>org.apache.xalan.*</publicPackage>
+ <publicPackage>org.apache.xml.*</publicPackage>
+ <publicPackage>org.xml.sax.*</publicPackage>
+ <publicPackage>javanet.staxutils.*</publicPackage>
+ </publicPackages>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Localizing-Bundle: org/gephi/lib/core/Bundle.properties
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+ <!--
+ <moduleType>autoload</moduleType>
+ <codeNameBase>org.gephi.lib.core/1</codeNameBase>
+ <licenseName>Apache License, Version 2.0</licenseName>
+ <licenseFile>license.txt</licenseFile>
+ -->
+</nbm>
@@ -0,0 +1,5 @@
+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+#OpenIDE-Module-Display-Category=
@@ -41,6 +41,18 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>com.teradata</groupId>
+ <artifactId>teradata-jdbc</artifactId>
+ <version>14.00.00.21</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.teradata</groupId>
+ <artifactId>teradata-config</artifactId>
+ <version>14.00.00.21</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
</dependency>
@@ -33,18 +33,17 @@
<artifactId>project-api</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-library-wrapper</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
</dependency>
- <dependency>
- <groupId>net.java.dev</groupId>
- <artifactId>stax-utils</artifactId>
- <version>snapshot-20100402</version>
- </dependency>
</dependencies>
<build>
@@ -33,9 +33,8 @@
<artifactId>attributes-api</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge.javacsv</groupId>
- <artifactId>javacsv</artifactId>
- <version>2.0</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-library-wrapper</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -5,7 +5,7 @@
<artifactId>gephi-parent</artifactId>
<groupId>org.gephi</groupId>
<version>0.8.2-SNAPSHOT</version>
- <relativePath>../..</relativePath>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.gephi</groupId>
@@ -29,9 +29,8 @@
<artifactId>graph-api</artifactId>
</dependency>
<dependency>
- <groupId>net.sourceforge.javacsv</groupId>
- <artifactId>javacsv</artifactId>
- <version>2.0</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-library-wrapper</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -47,6 +46,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>ui-library-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>ui-components</artifactId>
</dependency>
<dependency>
@@ -71,19 +74,9 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jfreechart-wrapper</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>visualization-impl</artifactId>
</dependency>
<dependency>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- <type>jar</type>
- <version>1.3.04</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validation-api</artifactId>
</dependency>
@@ -33,6 +33,10 @@
<artifactId>import-api</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-library-wrapper</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
</dependency>
@@ -72,18 +76,6 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-nodes</artifactId>
</dependency>
- <dependency>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- <type>jar</type>
- <version>1.3.04</version>
- </dependency>
- <dependency>
- <artifactId>xml-apis-ext</artifactId>
- <groupId>xml-apis</groupId>
- <type>jar</type>
- <version>1.3.04</version>
- </dependency>
</dependencies>
<build>
@@ -38,6 +38,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>ui-library-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>utils-longtask</artifactId>
</dependency>
<dependency>
@@ -69,11 +73,6 @@
<artifactId>org-openide-nodes</artifactId>
</dependency>
<dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>swingx</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-explorer</artifactId>
</dependency>
@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>jfreechart-wrapper</artifactId>
+ <artifactId>core-library-wrapper</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
@@ -54,6 +54,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>ui-library-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>utils</artifactId>
</dependency>
<dependency>
Oops, something went wrong.

0 comments on commit b5db999

Please sign in to comment.