Revision 44918

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/test/resources/log4j.properties
33 33 
log4j.logger.org.gvsig.oracle.dal=INFO
34 34 
# Exoport providers
35 35 
log4j.logger.org.gvsig.exportto.swing.prov.jdbc=INFO
36 
log4j.logger.org.gvsig.exportto.swing.prov.h2=INFO
36 
log4j.logger.org.gvsig.exportto.swing.prov.mdb=INFO
37 37 
#
38 38 
# shp/dbf driver
39 39 
log4j.logger.org.gvsig.fmap.dal.store.shp=INFO
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/test/java/org/gvsig/fmap/dal/store/mdb/TestCreate.java
281 281 
        createFrom(explorer, sourceStore);
282 282 
        copyFrom(explorer, sourceStore, FeatureStore.MODE_APPEND);
283 283
284 
        FeatureStore h2Store = openTargetStore1(explorer);
284 
        FeatureStore mdbStore = openTargetStore1(explorer);
285 285 
        ExpressionBuilder expbuilder = ExpressionUtils.createExpressionBuilder();
286 286 

  		




  287
  287
  
    
        String filter = expbuilder.or(


  		




  ......




  308
  308
  
    
        ).toString();


  		




  309
  309
  
    
        FeatureQuery query = sourceStore.createFeatureQuery();


  		




  310
  310
  
    
        query.addFilter(filter);


  		




  311
  
  
    
        List<Feature> features = h2Store.getFeatures(query);


  		




  
  311
  
    
        List<Feature> features = mdbStore.getFeatures(query);


  		




  312
  312
  
    
        int sz = features.size();


  		




  313
  313
  
    
    }


  		




  314
  314
  
    

  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/resources/META-INF/services/org.gvsig.tools.library.Library
    
  





  1
  
  
    
org.gvsig.fmap.dal.store.mdb.MDBSpatialLibrary


  		




  
  1
  
    
org.gvsig.fmap.dal.store.mdb.MDBLibrary


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/resources/org/gvsig/fmap/dal/store/mdb/MDBMetadata.xml
    
  





  2
  2
  
    
<definitions>


  		




  3
  3
  
    
  <version>1.0.0</version>


  		




  4
  4
  
    
  <classes>


  		




  5
  
  
    
    <class name="H2Spatial" namespace="Metadata">


  		




  
  5
  
    
    <class name="MDB" namespace="Metadata">


  		




  6
  6
  
    
      <extends>


  		




  7
  7
  
    
      	<class name="JDBC2" namespace="Metadata"/>


  		




  8
  8
  
    
      </extends>


  		




  9
  
  
    
      <description>Metadata of a H2 store</description>


  		




  
  9
  
    
      <description>Metadata of a MDB store</description>


  		




  10
  10
  
    
      <fields>


  		




  11
  11
  
    
      </fields>


  		




  12
  12
  
    
    </class>


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/resources/org/gvsig/fmap/dal/store/mdb/MDBParameters.xml
    
  





  2
  2
  
    
<definitions>


  		




  3
  3
  
    
  <version>1.0.0</version>


  		




  4
  4
  
    
  <classes>


  		




  5
  
  
    
    <class name="H2SpatialResourceParameters">


  		




  
  5
  
    
    <class name="MDBResourceParameters">


  		




  6
  6
  
    
      <extends>


  		




  7
  7
  
    
        <class>JDBC2ResourceParameters</class>


  		




  8
  8
  
    
      </extends>


  		




  9
  
  
    
      <description>_H2_Spatial_loading_parameters</description>


  		




  
  9
  
    
      <description>_MDB_loading_parameters</description>


  		




  10
  10
  
    
      <fields>


  		




  11
  
  
    
        <field name="JDBCDriverClass" type="string" mandatory="true"


  		




  
  11
  
    
<!--        <field name="JDBCDriverClass" type="string" mandatory="true"


  		




  12
  12
  
    
               defaultValue="org.h2.Driver" group="Advanced">


  		




  13
  13
  
    
          <description>JDBC Driver class</description>


  		




  14
  
  
    
        </field>


  		




  
  14
  
    
        </field>-->


  		




  15
  15
  
    
        <field name="port" type="integer" mandatory="false" defaultValue="9123" group="Connection">


  		




  16
  16
  
    
          <description></description>


  		




  17
  17
  
    
        </field>


  		




  ......




  69
  69
  
    
      </fields>


  		




  70
  70
  
    
    </class>


  		




  71
  71
  
    

  		




  72
  
  
    
    <class name="H2SpatialStoreParameters">


  		




  
  72
  
    
    <class name="MDBStoreParameters">


  		




  73
  73
  
    
      <extends>


  		




  74
  74
  
    
        <class>JDBC2StoreParameters</class>


  		




  75
  
  
    
        <class>H2SpatialResourceParameters</class>


  		




  
  75
  
    
        <class>MDBResourceParameters</class>


  		




  76
  76
  
    
      </extends>


  		




  77
  77
  
    
      <fields/>


  		




  78
  78
  
    
    </class>


  		




  79
  79
  
    

  		




  80
  
  
    
    <class name="H2SpatialNewStoreParameters">


  		




  
  80
  
    
    <class name="MDBNewStoreParameters">


  		




  81
  81
  
    
      <extends>


  		




  82
  82
  
    
        <class>JDBC2NewStoreParameters</class>


  		




  83
  
  
    
        <class>H2SpatialResourceParameters</class>


  		




  
  83
  
    
        <class>MDBResourceParameters</class>


  		




  84
  84
  
    
      </extends>


  		




  85
  85
  
    
      <fields/>


  		




  86
  86
  
    
    </class>


  		




  87
  87
  
    

  		




  88
  88
  
    

  		




  89
  
  
    
    <class name="H2SpatialServerExplorerParameters">


  		




  
  89
  
    
    <class name="MDBServerExplorerParameters">


  		




  90
  90
  
    
      <extends>


  		




  91
  
  
    
        <class>H2SpatialResourceParameters</class>


  		




  
  91
  
    
        <class>MDBResourceParameters</class>


  		




  92
  92
  
    
        <class>JDBC2ServerExplorerParameters</class>


  		




  93
  93
  
    
      </extends>


  		




  94
  94
  
    
      <fields/>


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/java/org/gvsig/fmap/dal/store/mdb/MDBHelper.java
    
  





  53
  53
  
    

  		




  54
  54
  
    
    static final Logger LOGGER = LoggerFactory.getLogger(MDBHelper.class);


  		




  55
  55
  
    

  		




  56
  
  
    
    public static final String MDBSPATIAL_JDBC_DRIVER = "org.mdb.Driver";


  		




  57
  
  
    
    


  		




  
  56
  
    
    public static final String MDB_JDBC_DRIVER = "net.ucanaccess.jdbc.UcanaccessDriver";


  		




  
  57
  
    

  		




  58
  58
  
    
    public static String getConnectionURL(MDBConnectionParameters params) {


  		




  59
  59
  
    
        String connectionURL;


  		




  60
  60
  
    
        String dbfilename = params.getFile().getAbsolutePath().replace("\\","/");


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/java/org/gvsig/fmap/dal/store/mdb/operations/MDBFetchFeatureTypeOperation.java
    
  





  31
  31
  
    
@SuppressWarnings("UseSpecificCatch")


  		




  32
  32
  
    
public class MDBFetchFeatureTypeOperation extends FetchFeatureTypeOperation {


  		




  33
  33
  
    

  		




  34
  
  
    
    private static Map<String,GeometryType>h2spatialGeometryTypes = null;


  		




  
  34
  
    
    private static Map<String,GeometryType>mdbGeometryTypes = null;


  		




  35
  35
  
    
    private Map<String,GeometryColumnInfo> geometry_column;


  		




  36
  36
  
    
    


  		




  37
  37
  
    
    private static class GeometryColumnInfo {


  		




  ......




  179
  179
  
    
    }


  		




  180
  180
  
    

  		




  181
  181
  
    
    private GeometryType getGeometryTypeFromMDBSpatialType(String typeName) {


  		




  182
  
  
    
        if( h2spatialGeometryTypes==null ) {


  		




  
  182
  
    
        if( mdbGeometryTypes==null ) {


  		




  183
  183
  
    
            //


  		




  184
  184
  
    
            // https://github.com/orbisgis/h2gis/wiki/1.-Spatial-data#geometry-columns-view


  		




  185
  185
  
    
            //


  		




  186
  186
  
    
            GeometryManager manager = GeometryLocator.getGeometryManager();


  		




  187
  
  
    
            h2spatialGeometryTypes = new HashMap<>();


  		




  188
  
  
    
            h2spatialGeometryTypes.put("POINT", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM2D));


  		




  189
  
  
    
            h2spatialGeometryTypes.put("POINTZ", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM3D));


  		




  
  187
  
    
            mdbGeometryTypes = new HashMap<>();


  		




  
  188
  
    
            mdbGeometryTypes.put("POINT", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM2D));


  		




  
  189
  
    
            mdbGeometryTypes.put("POINTZ", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM3D));


  		




  190
  190
  
    
            


  		




  191
  
  
    
            h2spatialGeometryTypes.put("LINESTRING", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM2D));


  		




  192
  
  
    
            h2spatialGeometryTypes.put("LINESTRINGZ", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM3D));


  		




  
  191
  
    
            mdbGeometryTypes.put("LINESTRING", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM2D));


  		




  
  192
  
    
            mdbGeometryTypes.put("LINESTRINGZ", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM3D));


  		




  193
  193
  
    
            


  		




  194
  
  
    
            h2spatialGeometryTypes.put("POLYGON", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  195
  
  
    
            h2spatialGeometryTypes.put("POLYGONZ", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  
  194
  
    
            mdbGeometryTypes.put("POLYGON", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  
  195
  
    
            mdbGeometryTypes.put("POLYGONZ", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  196
  196
  
    

  		




  197
  
  
    
            h2spatialGeometryTypes.put("MULTIPOINT", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM2D));


  		




  198
  
  
    
            h2spatialGeometryTypes.put("MULTIPOINTZ", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM3D));


  		




  
  197
  
    
            mdbGeometryTypes.put("MULTIPOINT", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM2D));


  		




  
  198
  
    
            mdbGeometryTypes.put("MULTIPOINTZ", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM3D));


  		




  199
  199
  
    

  		




  200
  
  
    
            h2spatialGeometryTypes.put("MULTILINESTRING", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM2D));


  		




  201
  
  
    
            h2spatialGeometryTypes.put("MULTILINESTRINGZ", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM3D));


  		




  
  200
  
    
            mdbGeometryTypes.put("MULTILINESTRING", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM2D));


  		




  
  201
  
    
            mdbGeometryTypes.put("MULTILINESTRINGZ", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM3D));


  		




  202
  202
  
    

  		




  203
  
  
    
            h2spatialGeometryTypes.put("MULTIPOLYGON", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  204
  
  
    
            h2spatialGeometryTypes.put("MULTIPOLYGONZ", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  
  203
  
    
            mdbGeometryTypes.put("MULTIPOLYGON", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  
  204
  
    
            mdbGeometryTypes.put("MULTIPOLYGONZ", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  205
  205
  
    

  		




  206
  
  
    
            h2spatialGeometryTypes.put("GEOMETRY", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  207
  
  
    
            h2spatialGeometryTypes.put("GEOMETRYZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  
  206
  
    
            mdbGeometryTypes.put("GEOMETRY", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  
  207
  
    
            mdbGeometryTypes.put("GEOMETRYZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  208
  208
  
    

  		




  209
  
  
    
            h2spatialGeometryTypes.put("GEOMCOLLECTION", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  210
  
  
    
            h2spatialGeometryTypes.put("GEOMCOLLECTIONZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  
  209
  
    
            mdbGeometryTypes.put("GEOMCOLLECTION", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  
  210
  
    
            mdbGeometryTypes.put("GEOMCOLLECTIONZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  211
  211
  
    
        }


  		




  212
  
  
    
        return h2spatialGeometryTypes.get(typeName);


  		




  
  212
  
    
        return mdbGeometryTypes.get(typeName);


  		




  213
  213
  
    
    }


  		




  214
  214
  
    

  		




  215
  215
  
    
    @Override


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/java/org/gvsig/fmap/dal/store/mdb/MDBConnectionParametersHelper.java
    
  





  31
  31
  
    
    public void validate() throws ValidateDataParametersException {


  		




  32
  32
  
    
        if( this.getDynValue(JDBCConnectionParameters.JDBC_DRIVER_CLASS_PARAMTER_NAME) == null ) {


  		




  33
  33
  
    
            this.setDynValue(JDBCConnectionParameters.JDBC_DRIVER_CLASS_PARAMTER_NAME,


  		




  34
  
  
    
                MDBHelper.MDBSPATIAL_JDBC_DRIVER


  		




  
  34
  
    
                MDBHelper.MDB_JDBC_DRIVER


  		




  35
  35
  
    
            );


  		




  36
  36
  
    
        }


  		




  37
  37
  
    
        if( getFile() == null ) {


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/java/org/gvsig/fmap/dal/store/mdb/MDBLibrary.java
    
  





  54
  54
  
    
                (DataManagerProviderServices) DALLocator.getDataManager();


  		




  55
  55
  
    

  		




  56
  56
  
    
        try {


  		




  57
  
  
    
            Class.forName(MDBHelper.MDBSPATIAL_JDBC_DRIVER);


  		




  
  57
  
    
            Class.forName(MDBHelper.MDB_JDBC_DRIVER);


  		




  58
  58
  
    
        } catch(Throwable th) {


  		




  59
  59
  
    
            MDBHelper.LOGGER.warn("Can't load MDBSpatial JDBC Driver.",th);


  		




  60
  60
  
    
        }


  		












  

    
      trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/pom.xml
    
  





  12
  12
  
    
    </parent>  


  		




  13
  13
  
    
    <dependencies>


  		




  14
  14
  
    
        <dependency>


  		




  15
  
  
    
        <groupId>net.sf.ucanaccess</groupId>


  		




  16
  
  
    
        <artifactId>ucanaccess</artifactId>


  		




  17
  
  
    
        <version>5.0.0</version>


  		




  
  15
  
    
            <groupId>net.sf.ucanaccess</groupId>


  		




  
  16
  
    
            <artifactId>ucanaccess</artifactId>


  		




  
  17
  
    
            <version>5.0.0</version>


  		




  
  18
  
    
            <scope>compile</scope>


  		




  18
  19
  
    
        </dependency>


  		




  19
  20
  
    
        <dependency>


  		




  20
  21
  
    
            <groupId>org.gvsig</groupId>


  		




  ......




  75
  76
  
    
            <scope>compile</scope>


  		




  76
  77
  
    
        </dependency>


  		




  77
  78
  
    
        <dependency>


  		




  78
  
  
    
          <groupId>org.apache.commons</groupId>


  		




  79
  
  
    
          <artifactId>commons-lang3</artifactId>


  		




  80
  
  
    
          <scope>compile</scope>


  		




  
  79
  
    
            <groupId>org.apache.commons</groupId>


  		




  
  80
  
    
            <artifactId>commons-lang3</artifactId>


  		




  
  81
  
    
            <scope>compile</scope>


  		




  81
  82
  
    
        </dependency>


  		




  82
  83
  
    
        


  		




  83
  84
  
    
        


  		












Also available in:  Unified diff