From b1380253d105fd0fe4f3e034d18208a0e7036341 Mon Sep 17 00:00:00 2001 From: Andrea Antonello Date: Sat, 25 Feb 2017 08:16:56 +0100 Subject: [PATCH] fixes for library conflicts in export --- org.jgrasstools.gvsig/mvninstall.sh | 2 + .../org.jgrasstools.gvsig.base/pom.xml | 28 +- .../main/assembly/gvsig-plugin-package.xml | 382 ++++++++---------- .../src/main/resources-plugin/config.xml | 1 + .../org.jgrasstools.gvsig.epanet/pom.xml | 12 + .../pom.xml | 98 +++-- .../geopaparazzi/GeopaparazziLayerWizard.java | 5 +- .../GeopaparazziPanelController.java | 40 +- .../src/main/resources-plugin/config.xml | 16 +- .../org.jgrasstools.gvsig.simpletools/pom.xml | 12 + .../pom.xml | 12 + org.jgrasstools.gvsig/pom.xml | 10 + 12 files changed, 335 insertions(+), 283 deletions(-) diff --git a/org.jgrasstools.gvsig/mvninstall.sh b/org.jgrasstools.gvsig/mvninstall.sh index 384184c..7899f50 100755 --- a/org.jgrasstools.gvsig/mvninstall.sh +++ b/org.jgrasstools.gvsig/mvninstall.sh @@ -1,2 +1,4 @@ cp gvsig-devel.properties ~/.gvsig-devel.properties mvn install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Danimal.sniffer.skip=true -Dsource.skip=true + +cp ~/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar ~/SOFTWARE/GVSIG/LATEST/gvSIG/extensiones/org.jgrasstools.gvsig.base/lib/ diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/pom.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/pom.xml index 8e2b614..825cea1 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/pom.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/pom.xml @@ -12,6 +12,18 @@ 0.1.0 + + org.slf4j + slf4j-api + 1.5.5 + provided + + + org.slf4j + slf4j-log4j12 + 1.5.5 + provided + jfree jcommon @@ -33,6 +45,12 @@ org.gvsig org.gvsig.tools.lib compile + + + jfree + jcommon + + org.gvsig @@ -40,8 +58,8 @@ compile - org.jfree - jfreechart + jfree + jcommon @@ -75,6 +93,10 @@ org.geotools gt2-coverage + + jfree + jcommon + @@ -86,6 +108,8 @@ org.gvsig org.gvsig.fmap.mapcontext.api compile + + org.gvsig diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/assembly/gvsig-plugin-package.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/assembly/gvsig-plugin-package.xml index 08b26c3..14ff81a 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/assembly/gvsig-plugin-package.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/assembly/gvsig-plugin-package.xml @@ -50,215 +50,185 @@ lib - - antlr:antlr:jar - com.google.guava:guava:jar - com.googlecode.efficient-java-matrix-library:core:jar - - com.googlecode.json-simple:json-simple:jar - com.h2database:h2:jar - com.jgoodies:forms:jar - com.metsci.ext.com.kitfox.svg:svg-salamander:jar - com.miglayout:miglayout:jar - com.vividsolutions:jts:jar - commons-beanutils:commons-beanutils:jar - commons-codec:commons-codec:jar - commons-collections:commons-collections:jar - commons-dbcp:commons-dbcp:jar - commons-fileupload:commons-fileupload:jar - commons-httpclient:commons-httpclient:jar - commons-io:commons-io:jar - commons-lang:commons-lang:jar - commons-logging:commons-logging:jar - commons-pool:commons-pool:jar - gov.nasa:worldwind:jar - it.geosolutions.imageio-ext:imageio-ext-arcgrid:jar - - it.geosolutions.imageio-ext:imageio-ext-gdal-bindings:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalarcbinarygrid:jar - - it.geosolutions.imageio-ext:imageio-ext-gdaldted:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalecw:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalecwjp2:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalehdr:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalenvihdr:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalerdasimg:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalframework:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalgeotiff:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalidrisi:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalkakadujp2:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalmrsid:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalmrsidjp2:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalnitf:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalrpftoc:jar - - it.geosolutions.imageio-ext:imageio-ext-gdalvrt:jar - - it.geosolutions.imageio-ext:imageio-ext-geocore:jar - - it.geosolutions.imageio-ext:imageio-ext-imagereadmt:jar - - it.geosolutions.imageio-ext:imageio-ext-streams:jar - - it.geosolutions.imageio-ext:imageio-ext-tiff:jar - it.geosolutions.imageio-ext:imageio-ext-utilities:jar - - it.geosolutions.jaiext.affine:jt-affine:jar - it.geosolutions.jaiext.algebra:jt-algebra:jar - it.geosolutions.jaiext.bandcombine:jt-bandcombine:jar - - it.geosolutions.jaiext.bandmerge:jt-bandmerge:jar - it.geosolutions.jaiext.bandselect:jt-bandselect:jar - - it.geosolutions.jaiext.binarize:jt-binarize:jar - it.geosolutions.jaiext.border:jt-border:jar - it.geosolutions.jaiext.buffer:jt-buffer:jar - it.geosolutions.jaiext.classifier:jt-classifier:jar - - it.geosolutions.jaiext.colorconvert:jt-colorconvert:jar - - it.geosolutions.jaiext.colorindexer:jt-colorindexer:jar - - it.geosolutions.jaiext.crop:jt-crop:jar - it.geosolutions.jaiext.errordiffusion:jt-errordiffusion:jar - - it.geosolutions.jaiext.format:jt-format:jar - it.geosolutions.jaiext.imagefunction:jt-imagefunction:jar - - it.geosolutions.jaiext.iterators:jt-iterators:jar - it.geosolutions.jaiext.lookup:jt-lookup:jar - it.geosolutions.jaiext.mosaic:jt-mosaic:jar - it.geosolutions.jaiext.nullop:jt-nullop:jar - it.geosolutions.jaiext.orderdither:jt-orderdither:jar - - it.geosolutions.jaiext.piecewise:jt-piecewise:jar - it.geosolutions.jaiext.rescale:jt-rescale:jar - it.geosolutions.jaiext.rlookup:jt-rlookup:jar - it.geosolutions.jaiext.scale:jt-scale:jar - it.geosolutions.jaiext.stats:jt-stats:jar - it.geosolutions.jaiext.translate:jt-translate:jar - it.geosolutions.jaiext.utilities:jt-utilities:jar - it.geosolutions.jaiext.vectorbin:jt-vectorbin:jar - it.geosolutions.jaiext.warp:jt-warp:jar - it.geosolutions.jaiext.zonal:jt-zonal:jar - javax.annotation:javax.annotation-api:jar - javax.media:jai_codec:jar - javax.media:jai_core:jar - javax.media:jai_imageio:jar - javax.servlet:javax.servlet-api:jar - jgridshift:jgridshift:jar - jline:jline:jar - joda-time:joda-time:jar - jstl:jstl:jar - log4j:log4j:jar - net.java.dev.jna:jna:jar - net.java.dev.jsr-275:jsr-275:jar - net.sf.ehcache:ehcache:jar - net.sf.geographiclib:GeographicLib-Java:jar - net.sf.kxml:kxml2:jar - org.antlr:antlr-runtime:jar - org.antlr:antlr:jar - org.antlr:stringtemplate:jar - org.apache.commons:commons-math3:jar - org.apache.xml:xml-commons-resolver:jar - org.codehaus.groovy:groovy-all:jar - org.codehaus.janino:janino:jar - org.eclipse.jdt.core.compiler:ecj:jar - org.eclipse.jetty.toolchain:jetty-schemas:jar - org.eclipse.jetty:apache-jsp:jar - org.eclipse.jetty:jetty-annotations:jar - org.eclipse.jetty:jetty-http:jar - org.eclipse.jetty:jetty-io:jar - org.eclipse.jetty:jetty-jndi:jar - org.eclipse.jetty:jetty-plus:jar - org.eclipse.jetty:jetty-security:jar - org.eclipse.jetty:jetty-server:jar - org.eclipse.jetty:jetty-servlet:jar - org.eclipse.jetty:jetty-util:jar - org.eclipse.jetty:jetty-webapp:jar - org.eclipse.jetty:jetty-xml:jar - org.fusesource.jansi:jansi:jar - org.geotools.jdbc:gt-jdbc-h2:jar - org.geotools:gt-api:jar - org.geotools:gt-arcgrid:jar - org.geotools:gt-coverage:jar - org.geotools:gt-cql:jar - org.geotools:gt-data:jar - org.geotools:gt-epsg-extension:jar - org.geotools:gt-epsg-hsql:jar - org.geotools:gt-geojson:jar - org.geotools:gt-geotiff:jar - org.geotools:gt-graph:jar - org.geotools:gt-grassraster:jar - org.geotools:gt-grid:jar - org.geotools:gt-image:jar - org.geotools:gt-imageio-ext-gdal:jar - org.geotools:gt-imagemosaic:jar - org.geotools:gt-jdbc:jar - org.geotools:gt-main:jar - org.geotools:gt-metadata:jar - org.geotools:gt-opengis:jar - org.geotools:gt-process:jar - org.geotools:gt-property:jar - org.geotools:gt-referencing:jar - org.geotools:gt-render:jar - org.geotools:gt-shapefile:jar - org.geotools:gt-swing:jar - org.geotools:gt-transform:jar - org.geotools:gt-wms:jar - org.geotools:gt-xml:jar - org.hsqldb:hsqldb:jar - org.jaitools:jt-all:jar - org.jaitools:jt-jiffle-language:jar - org.jaitools:jt-utils:jar - org.jaitools:jt-vectorbinarize:jar - org.javassist:javassist:jar - org.jdom:jdom:jar - org.jfree:jcommon:jar - org.jfree:jfreechart:jar - org.jgrasstools:jgt-apps:jar - org.jgrasstools:jgt-dbs:jar - org.jgrasstools:jgt-gui:jar - org.jgrasstools:jgt-hortonmachine:jar - org.jgrasstools:jgt-jgrassgears:jar - org.jgrasstools:jgt-lesto:jar - org.jgrasstools:jgt-modules:jar - org.jgrasstools:jgt-oms3:jar - org.jgrasstools:jgt-server:jar - org.jogamp.gluegen:gluegen-rt-main:jar - org.jogamp.gluegen:gluegen-rt:jar - org.jogamp.jogl:jogl-all:jar - org.json:json:jar - org.mapsforge:mapsforge-core:jar - org.mapsforge:mapsforge-map-awt:jar - org.mapsforge:mapsforge-map-reader:jar - org.mapsforge:mapsforge-map:jar - org.mapsforge:mapsforge-themes:jar - org.mortbay.jasper:apache-el:jar - org.mortbay.jasper:apache-jsp:jar - org.opengeo:geodb:jar - org.ow2.asm:asm-commons:jar - org.ow2.asm:asm-tree:jar - org.ow2.asm:asm:jar - org.scannotation:scannotation:jar - org.xerial:sqlite-jdbc:jar +antlr:antlr:jar +com.google.guava:guava:jar +com.googlecode.efficient-java-matrix-library:core:jar +com.googlecode.json-simple:json-simple:jar +com.h2database:h2:jar +com.jgoodies:forms:jar +com.metsci.ext.com.kitfox.svg:svg-salamander:jar +com.miglayout:miglayout:jar +com.vividsolutions:jts:jar +commons-beanutils:commons-beanutils:jar +commons-codec:commons-codec:jar +commons-collections:commons-collections:jar +commons-dbcp:commons-dbcp:jar +commons-fileupload:commons-fileupload:jar +commons-httpclient:commons-httpclient:jar +commons-io:commons-io:jar +commons-lang:commons-lang:jar +commons-logging:commons-logging:jar +commons-pool:commons-pool:jar +gov.nasa:worldwind:jar +it.geosolutions.imageio-ext:imageio-ext-arcgrid:jar +it.geosolutions.imageio-ext:imageio-ext-gdalarcbinarygrid:jar +it.geosolutions.imageio-ext:imageio-ext-gdal-bindings:jar +it.geosolutions.imageio-ext:imageio-ext-gdaldted:jar +it.geosolutions.imageio-ext:imageio-ext-gdalecw:jar +it.geosolutions.imageio-ext:imageio-ext-gdalecwjp2:jar +it.geosolutions.imageio-ext:imageio-ext-gdalehdr:jar +it.geosolutions.imageio-ext:imageio-ext-gdalenvihdr:jar +it.geosolutions.imageio-ext:imageio-ext-gdalerdasimg:jar +it.geosolutions.imageio-ext:imageio-ext-gdalframework:jar +it.geosolutions.imageio-ext:imageio-ext-gdalgeotiff:jar +it.geosolutions.imageio-ext:imageio-ext-gdalidrisi:jar +it.geosolutions.imageio-ext:imageio-ext-gdalkakadujp2:jar +it.geosolutions.imageio-ext:imageio-ext-gdalmrsid:jar +it.geosolutions.imageio-ext:imageio-ext-gdalmrsidjp2:jar +it.geosolutions.imageio-ext:imageio-ext-gdalnitf:jar +it.geosolutions.imageio-ext:imageio-ext-gdalrpftoc:jar +it.geosolutions.imageio-ext:imageio-ext-gdalvrt:jar +it.geosolutions.imageio-ext:imageio-ext-geocore:jar +it.geosolutions.imageio-ext:imageio-ext-imagereadmt:jar +it.geosolutions.imageio-ext:imageio-ext-streams:jar +it.geosolutions.imageio-ext:imageio-ext-tiff:jar +it.geosolutions.imageio-ext:imageio-ext-utilities:jar +it.geosolutions.jaiext.affine:jt-affine:jar +it.geosolutions.jaiext.algebra:jt-algebra:jar +it.geosolutions.jaiext.bandcombine:jt-bandcombine:jar +it.geosolutions.jaiext.bandmerge:jt-bandmerge:jar +it.geosolutions.jaiext.bandselect:jt-bandselect:jar +it.geosolutions.jaiext.binarize:jt-binarize:jar +it.geosolutions.jaiext.border:jt-border:jar +it.geosolutions.jaiext.buffer:jt-buffer:jar +it.geosolutions.jaiext.classifier:jt-classifier:jar +it.geosolutions.jaiext.colorconvert:jt-colorconvert:jar +it.geosolutions.jaiext.colorindexer:jt-colorindexer:jar +it.geosolutions.jaiext.crop:jt-crop:jar +it.geosolutions.jaiext.errordiffusion:jt-errordiffusion:jar +it.geosolutions.jaiext.format:jt-format:jar +it.geosolutions.jaiext.imagefunction:jt-imagefunction:jar +it.geosolutions.jaiext.iterators:jt-iterators:jar +it.geosolutions.jaiext.lookup:jt-lookup:jar +it.geosolutions.jaiext.mosaic:jt-mosaic:jar +it.geosolutions.jaiext.nullop:jt-nullop:jar +it.geosolutions.jaiext.orderdither:jt-orderdither:jar +it.geosolutions.jaiext.piecewise:jt-piecewise:jar +it.geosolutions.jaiext.rescale:jt-rescale:jar +it.geosolutions.jaiext.rlookup:jt-rlookup:jar +it.geosolutions.jaiext.scale:jt-scale:jar +it.geosolutions.jaiext.stats:jt-stats:jar +it.geosolutions.jaiext.translate:jt-translate:jar +it.geosolutions.jaiext.utilities:jt-utilities:jar +it.geosolutions.jaiext.vectorbin:jt-vectorbin:jar +it.geosolutions.jaiext.warp:jt-warp:jar +it.geosolutions.jaiext.zonal:jt-zonal:jar +javax.annotation:javax.annotation-api:jar +javax.media:jai_codec:jar +javax.media:jai_core:jar +javax.media:jai_imageio:jar +javax.servlet:javax.servlet-api:jar +jgridshift:jgridshift:jar +jline:jline:jar +joda-time:joda-time:jar +jstl:jstl:jar +net.java.dev.jna:jna:jar +net.java.dev.jsr-275:jsr-275:jar +net.sf.ehcache:ehcache:jar +net.sf.geographiclib:GeographicLib-Java:jar +net.sf.kxml:kxml2:jar +org.antlr:antlr-runtime:jar +org.antlr:antlr:jar +org.antlr:stringtemplate:jar +org.apache.commons:commons-math3:jar +org.apache.xml:xml-commons-resolver:jar +org.codehaus.groovy:groovy-all:jar +org.codehaus.janino:janino:jar +org.eclipse.jdt.core.compiler:ecj:jar +org.eclipse.jetty.toolchain:jetty-schemas:jar +org.eclipse.jetty:apache-jsp:jar +org.eclipse.jetty:jetty-annotations:jar +org.eclipse.jetty:jetty-http:jar +org.eclipse.jetty:jetty-io:jar +org.eclipse.jetty:jetty-jndi:jar +org.eclipse.jetty:jetty-plus:jar +org.eclipse.jetty:jetty-security:jar +org.eclipse.jetty:jetty-server:jar +org.eclipse.jetty:jetty-servlet:jar +org.eclipse.jetty:jetty-util:jar +org.eclipse.jetty:jetty-webapp:jar +org.eclipse.jetty:jetty-xml:jar +org.fusesource.jansi:jansi:jar +org.geotools.jdbc:gt-jdbc-h2:jar +org.geotools:gt-api:jar +org.geotools:gt-arcgrid:jar +org.geotools:gt-coverage:jar +org.geotools:gt-cql:jar +org.geotools:gt-data:jar +org.geotools:gt-epsg-extension:jar +org.geotools:gt-epsg-hsql:jar +org.geotools:gt-geojson:jar +org.geotools:gt-geotiff:jar +org.geotools:gt-graph:jar +org.geotools:gt-grassraster:jar +org.geotools:gt-grid:jar +org.geotools:gt-image:jar +org.geotools:gt-imageio-ext-gdal:jar +org.geotools:gt-imagemosaic:jar +org.geotools:gt-jdbc:jar +org.geotools:gt-main:jar +org.geotools:gt-metadata:jar +org.geotools:gt-opengis:jar +org.geotools:gt-process:jar +org.geotools:gt-property:jar +org.geotools:gt-referencing:jar +org.geotools:gt-render:jar +org.geotools:gt-shapefile:jar +org.geotools:gt-swing:jar +org.geotools:gt-transform:jar +org.geotools:gt-wms:jar +org.geotools:gt-xml:jar +org.hsqldb:hsqldb:jar +org.jaitools:jt-all:jar +org.jaitools:jt-jiffle-language:jar +org.jaitools:jt-utils:jar +org.jaitools:jt-vectorbinarize:jar +org.javassist:javassist:jar +org.jdom:jdom:jar +org.jfree:jcommon:jar +org.jfree:jfreechart:jar +org.jgrasstools:jgt-apps:jar +org.jgrasstools:jgt-dbs:jar +org.jgrasstools:jgt-gui:jar +org.jgrasstools:jgt-hortonmachine:jar +org.jgrasstools:jgt-jgrassgears:jar +org.jgrasstools:jgt-lesto:jar +org.jgrasstools:jgt-modules:jar +org.jgrasstools:jgt-oms3:jar +org.jgrasstools:jgt-server:jar +org.jogamp.gluegen:gluegen-rt-main:jar +org.jogamp.gluegen:gluegen-rt:jar +org.jogamp.jogl:jogl-all:jar +org.json:json:jar +org.mapsforge:mapsforge-core:jar +org.mapsforge:mapsforge-map-awt:jar +org.mapsforge:mapsforge-map-reader:jar +org.mapsforge:mapsforge-map:jar +org.mapsforge:mapsforge-themes:jar +org.mortbay.jasper:apache-el:jar +org.mortbay.jasper:apache-jsp:jar +org.opengeo:geodb:jar +org.ow2.asm:asm-commons:jar +org.ow2.asm:asm-tree:jar +org.ow2.asm:asm:jar +org.scannotation:scannotation:jar +org.slf4j:slf4j-api:jar +org.slf4j:slf4j-simple:jar +org.xerial:sqlite-jdbc:jar + diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/resources-plugin/config.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/resources-plugin/config.xml index 28d2347..aefcdc4 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/resources-plugin/config.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.base/src/main/resources-plugin/config.xml @@ -3,6 +3,7 @@ + diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.epanet/pom.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.epanet/pom.xml index 3dcfa77..f90bb83 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.epanet/pom.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.epanet/pom.xml @@ -12,6 +12,18 @@ 0.1.0 + + org.slf4j + slf4j-api + 1.5.5 + provided + + + org.slf4j + slf4j-log4j12 + 1.5.5 + provided + org.gvsig org.gvsig.tools.lib diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/pom.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/pom.xml index c4c1e15..dba723b 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/pom.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/pom.xml @@ -1,39 +1,64 @@ - - - 4.0.0 - org.jgrasstools.gvsig.geopaparazzi - jar - org.jgrasstools.gvsig.geopaparazzi - Geopaparazzi support - - org.jgrasstools - org.jgrasstools.gvsig - 0.1.0 - - - - - org.gvsig - org.gvsig.tools.lib - compile - - - org.gvsig - org.gvsig.andami - compile - - - - org.jgrasstools - org.jgrasstools.gvsig.base - compile - - - - - + + + 4.0.0 + org.jgrasstools.gvsig.geopaparazzi + jar + org.jgrasstools.gvsig.geopaparazzi + Geopaparazzi support + + org.jgrasstools + org.jgrasstools.gvsig + 0.1.0 + + + + + org.slf4j + slf4j-api + 1.5.5 + provided + + + org.slf4j + slf4j-log4j12 + 1.5.5 + provided + + + org.gvsig + org.gvsig.tools.lib + compile + + + org.gvsig + org.gvsig.andami + compile + + + + org.jgrasstools + org.jgrasstools.gvsig.base + compile + + + + + org.gvsig + org.gvsig.view3d.lib.api + compile + + + org.gvsig + org.gvsig.view3d.swing.api + compile + + + + + ${project.artifactId} ${project.name} ${project.description} @@ -53,8 +78,9 @@ https://github.com/moovida/hydrologis4gvsig https://github.com/moovida/hydrologis4gvsig - required: org.jgrasstools.gvsig.base -ge 0.1.0 + required: org.jgrasstools.gvsig.base + -ge 0.1.0 - + diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziLayerWizard.java b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziLayerWizard.java index 54d9bf4..38793cc 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziLayerWizard.java +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziLayerWizard.java @@ -28,7 +28,6 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.io.File; -import java.sql.Connection; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; @@ -46,6 +45,7 @@ import org.gvsig.tools.swing.api.ToolsSwingLocator; import org.gvsig.tools.swing.api.windowmanager.WindowManager; import org.gvsig.tools.swing.api.windowmanager.WindowManager.MODE; +import org.jgrasstools.dbs.compat.IJGTConnection; import org.jgrasstools.gears.io.geopaparazzi.geopap4.DaoGpsLog.GpsLog; import org.jgrasstools.gears.io.vectorwriter.OmsVectorWriter; import org.jgrasstools.gears.libs.monitor.IJGTProgressMonitor; @@ -53,7 +53,6 @@ import org.jgrasstools.gears.utils.files.FileUtilities; import org.jgrasstools.gvsig.base.DataUtilities; import org.jgrasstools.gvsig.base.GtGvsigConversionUtilities; -import org.jgrasstools.gvsig.base.JGTUtilities; import org.jgrasstools.gvsig.base.ProjectUtilities; import org.jgrasstools.gvsig.base.StyleUtilities; import org.jgrasstools.gvsig.base.utils.console.LogConsoleController; @@ -116,7 +115,7 @@ public void run() { } private void loadLayers( IJGTProgressMonitor pm ) throws Exception { - Connection connection = controller.getDatabaseConnection(); + IJGTConnection connection = controller.getDatabaseConnection(); File pluginFolder = ProjectUtilities.getPluginFolder(GenerateTilesExtension.class); doExportShps = controller.doExportShps(); mapContextManager = MapContextLocator.getMapContextManager(); diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziPanelController.java b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziPanelController.java index 1ecfd1d..f7e5580 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziPanelController.java +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/java/org/jgrasstools/gvsig/geopaparazzi/GeopaparazziPanelController.java @@ -15,6 +15,9 @@ import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager; import org.gvsig.tools.swing.api.windowmanager.WindowManager; import org.gvsig.tools.swing.api.windowmanager.WindowManager.MODE; +import org.jgrasstools.dbs.compat.IJGTConnection; +import org.jgrasstools.dbs.spatialite.jgt.SqliteDb; +import org.jgrasstools.gears.io.geopaparazzi.GeopaparazziUtilities; import org.jgrasstools.gears.io.geopaparazzi.OmsGeopaparazzi4Converter; import org.jgrasstools.gears.libs.exceptions.ModelsIllegalargumentException; import org.jgrasstools.gears.libs.monitor.IJGTProgressMonitor; @@ -32,34 +35,21 @@ public class GeopaparazziPanelController extends GeopaparazziPanelView { private static final long serialVersionUID = 1L; - private static boolean hasDriver = false; - - static { - try { - // make sure sqlite driver are there - Class.forName("org.sqlite.JDBC"); - hasDriver = true; - } catch (Exception e) { - } - } - private ThreadSafeDialogsManager dialogManager; - private Connection databaseConnection; + private IJGTConnection databaseConnection; private File geopapDatabaseFile; public GeopaparazziPanelController() { dialogManager = ToolsSwingLocator.getThreadSafeDialogsManager(); - if (!hasDriver) { - dialogManager.messageDialog("Can't find any sqlite driver to open the database. Check your settings.", "ERROR", - JOptionPane.ERROR_MESSAGE); - // throw new ModelsIllegalargumentException("Can't find any sqlite driver. Check your - // settings.", this); - } else { - init(); - } + // dialogManager.messageDialog("Can't find any sqlite driver to open the database. Check + // your settings.", "ERROR", + // JOptionPane.ERROR_MESSAGE); + // throw new ModelsIllegalargumentException("Can't find any sqlite driver. Check your + // settings.", this); + init(); } private void init() { @@ -109,14 +99,16 @@ private void openDatabaseFile( File geopapDatabaseFile ) throws Exception { "The geopaparazzi database file (*.gpap) is missing. Check the inserted path.", this); } - databaseConnection = DriverManager.getConnection("jdbc:sqlite:" + geopapDatabaseFile.getAbsolutePath()); - LinkedHashMap metadataMap = OmsGeopaparazzi4Converter.getMetadataMap(databaseConnection); + SqliteDb db = new SqliteDb(); + db.open(geopapDatabaseFile.getAbsolutePath()); + databaseConnection = db.getConnection(); + LinkedHashMap metadataMap = GeopaparazziUtilities.getProjectMetadata(databaseConnection); GeopaparazziMetadata model = new GeopaparazziMetadata(metadataMap); descriptionTable.setModel(model); LogProgressMonitor pm = new LogProgressMonitor(); pm.beginTask("Request layers...", IJGTProgressMonitor.UNKNOWN); - List layerNamesList = OmsGeopaparazzi4Converter.getLayerNamesList(databaseConnection); + List layerNamesList = GeopaparazziUtilities.getLayerNamesList(databaseConnection); DefaultListModel layersModel = new DefaultListModel(); for( String layerName : layerNamesList ) { layersModel.addElement(layerName); @@ -125,7 +117,7 @@ private void openDatabaseFile( File geopapDatabaseFile ) throws Exception { geopaparazziLayersList.setModel(layersModel); } - public Connection getDatabaseConnection() { + public IJGTConnection getDatabaseConnection() { return databaseConnection; } diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/resources-plugin/config.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/resources-plugin/config.xml index 9fb9f13..78ab33d 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/resources-plugin/config.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.geopaparazzi/src/main/resources-plugin/config.xml @@ -2,6 +2,7 @@ + - - + + - + --> @@ -59,10 +55,6 @@ - - diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.simpletools/pom.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.simpletools/pom.xml index dbef7b2..ad94a5f 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.simpletools/pom.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.simpletools/pom.xml @@ -14,6 +14,18 @@ + + org.slf4j + slf4j-api + 1.5.5 + provided + + + org.slf4j + slf4j-log4j12 + 1.5.5 + provided + org.gvsig org.gvsig.tools.lib diff --git a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.spatialtoolbox/pom.xml b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.spatialtoolbox/pom.xml index 8d72266..5079764 100644 --- a/org.jgrasstools.gvsig/org.jgrasstools.gvsig.spatialtoolbox/pom.xml +++ b/org.jgrasstools.gvsig/org.jgrasstools.gvsig.spatialtoolbox/pom.xml @@ -14,6 +14,18 @@ + + org.slf4j + slf4j-api + 1.5.5 + provided + + + org.slf4j + slf4j-log4j12 + 1.5.5 + provided + org.gvsig org.gvsig.tools.lib diff --git a/org.jgrasstools.gvsig/pom.xml b/org.jgrasstools.gvsig/pom.xml index 1eefe9a..6205751 100644 --- a/org.jgrasstools.gvsig/pom.xml +++ b/org.jgrasstools.gvsig/pom.xml @@ -173,6 +173,16 @@ org.jgrasstools.gvsig.base 0.1.0 + + org.gvsig + org.gvsig.view3d.lib.api + 1.0.23 + + + org.gvsig + org.gvsig.view3d.swing.api + 1.0.23 + org.gvsig org.gvsig.projection.jcrs.lib