Revision 620
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleExplorerFactory.java | ||
|---|---|---|
| 5 | 5 |
import org.gvsig.fmap.dal.exception.InitializeException; |
| 6 | 6 |
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices; |
| 7 | 7 |
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters; |
| 8 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
|
| 8 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParametersBase;
|
|
| 9 | 9 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper; |
| 10 | 10 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer; |
| 11 | 11 |
import org.gvsig.fmap.dal.store.jdbc2.impl.JDBCServerExplorerFactory; |
| ... | ... | |
| 26 | 26 |
DataServerExplorerProviderServices providerServices |
| 27 | 27 |
) throws InitializeException {
|
| 28 | 28 |
JDBCHelper helper = new OracleHelper((JDBCConnectionParameters) parameters); |
| 29 |
JDBCServerExplorer server = helper.createServerExplorer( |
|
| 30 |
(JDBCServerExplorerParameters) parameters, |
|
| 29 |
JDBCServerExplorer server = helper.createServerExplorer((JDBCServerExplorerParametersBase) parameters, |
|
| 31 | 30 |
providerServices |
| 32 | 31 |
); |
| 33 | 32 |
return server; |
| ... | ... | |
| 35 | 34 |
|
| 36 | 35 |
|
| 37 | 36 |
@Override |
| 38 |
public JDBCServerExplorerParameters createParameters() {
|
|
| 39 |
JDBCServerExplorerParameters params = new OracleExplorerParameters(); |
|
| 37 |
public JDBCServerExplorerParametersBase createParameters() {
|
|
| 38 |
JDBCServerExplorerParametersBase params = new OracleExplorerParameters();
|
|
| 40 | 39 |
return params; |
| 41 | 40 |
} |
| 42 | 41 |
|
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleNewStoreParameters.java | ||
|---|---|---|
| 22 | 22 |
package org.gvsig.oracle.dal; |
| 23 | 23 |
|
| 24 | 24 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 25 |
import org.gvsig.fmap.dal.store.jdbc.JDBCNewStoreParameters; |
|
| 25 |
import org.gvsig.fmap.dal.store.jdbc.JDBCNewStoreParametersBase;
|
|
| 26 | 26 |
|
| 27 | 27 |
public class OracleNewStoreParameters |
| 28 | 28 |
extends |
| 29 |
JDBCNewStoreParameters |
|
| 29 |
JDBCNewStoreParametersBase
|
|
| 30 | 30 |
implements |
| 31 | 31 |
OracleConnectionParameters |
| 32 | 32 |
{
|
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleStoreProviderFactory.java | ||
|---|---|---|
| 5 | 5 |
import org.gvsig.fmap.dal.exception.InitializeException; |
| 6 | 6 |
import org.gvsig.fmap.dal.spi.DataStoreProviderServices; |
| 7 | 7 |
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters; |
| 8 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
|
| 8 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParametersBase;
|
|
| 9 | 9 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper; |
| 10 | 10 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCStoreProvider; |
| 11 |
import org.gvsig.fmap.dal.store.jdbc2.impl.JDBCStoreProviderFactory; |
|
| 11 |
import org.gvsig.fmap.dal.store.jdbc2.impl.JDBCStoreProviderFactoryBase;
|
|
| 12 | 12 |
import org.slf4j.Logger; |
| 13 | 13 |
import org.slf4j.LoggerFactory; |
| 14 | 14 |
|
| 15 | 15 |
|
| 16 |
public class OracleStoreProviderFactory extends JDBCStoreProviderFactory {
|
|
| 16 |
public class OracleStoreProviderFactory extends JDBCStoreProviderFactoryBase {
|
|
| 17 | 17 |
|
| 18 | 18 |
private static final Logger LOGGER = LoggerFactory.getLogger(OracleStoreProviderFactory.class); |
| 19 | 19 |
|
| ... | ... | |
| 32 | 32 |
JDBCHelper helper = new OracleHelper((JDBCConnectionParameters) parameters); |
| 33 | 33 |
JDBCStoreProvider provider = null; |
| 34 | 34 |
try {
|
| 35 |
provider = helper.createProvider( |
|
| 36 |
(JDBCStoreParameters) parameters, |
|
| 35 |
provider = helper.createProvider((JDBCStoreParametersBase) parameters, |
|
| 37 | 36 |
providerServices |
| 38 | 37 |
); |
| 39 | 38 |
} |
| ... | ... | |
| 44 | 43 |
} |
| 45 | 44 |
|
| 46 | 45 |
@Override |
| 47 |
public JDBCStoreParameters createParameters() {
|
|
| 48 |
JDBCStoreParameters params = new OracleStoreParameters(); |
|
| 46 |
public JDBCStoreParametersBase createParameters() {
|
|
| 47 |
JDBCStoreParametersBase params = new OracleStoreParameters();
|
|
| 49 | 48 |
return params; |
| 50 | 49 |
} |
| 51 | 50 |
|
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/operations/OracleListTablesOperation.java | ||
|---|---|---|
| 10 | 10 |
import org.cresques.cts.IProjection; |
| 11 | 11 |
import org.gvsig.fmap.crs.CRSFactory; |
| 12 | 12 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
| 13 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParametersBase; |
|
| 13 | 14 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
| 15 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParametersBase; |
|
| 14 | 16 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCConnection; |
| 15 | 17 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper; |
| 16 | 18 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer; |
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/operations/OracleOperationsFactory.java | ||
|---|---|---|
| 4 | 4 |
import java.util.Iterator; |
| 5 | 5 |
import java.util.List; |
| 6 | 6 |
import org.apache.commons.lang3.tuple.Pair; |
| 7 |
|
|
| 8 | 7 |
import org.cresques.cts.IProjection; |
| 9 | 8 |
import org.gvsig.fmap.dal.SQLBuilder; |
| 10 | 9 |
import org.gvsig.fmap.dal.exception.DataException; |
| 11 | 10 |
import org.gvsig.fmap.dal.feature.EditableFeatureType; |
| 12 | 11 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| 13 | 12 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
| 14 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
|
| 15 | 13 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper; |
| 16 | 14 |
import org.gvsig.fmap.dal.store.jdbc2.spi.operations.AppendOperation; |
| 17 | 15 |
import org.gvsig.fmap.dal.store.jdbc2.spi.operations.CalculateEnvelopeOfColumnOperation; |
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleHelper.java | ||
|---|---|---|
| 11 | 11 |
import java.util.HashMap; |
| 12 | 12 |
import java.util.List; |
| 13 | 13 |
import java.util.Map; |
| 14 |
import java.util.logging.Level; |
|
| 15 | 14 |
import oracle.jdbc.OracleConnection; |
| 16 |
|
|
| 17 | 15 |
import org.apache.commons.dbcp.BasicDataSource; |
| 18 | 16 |
import org.apache.commons.lang3.StringUtils; |
| 19 | 17 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| ... | ... | |
| 28 | 26 |
import org.gvsig.fmap.dal.spi.DataTransactionServices; |
| 29 | 27 |
import org.gvsig.fmap.dal.store.db.DBHelper; |
| 30 | 28 |
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters; |
| 31 |
import org.gvsig.fmap.dal.store.jdbc.JDBCLibrary; |
|
| 32 | 29 |
import org.gvsig.fmap.dal.store.jdbc.JDBCNewStoreParameters; |
| 33 | 30 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
| 31 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParametersBase; |
|
| 34 | 32 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
| 33 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParametersBase; |
|
| 35 | 34 |
import org.gvsig.fmap.dal.store.jdbc.exception.JDBCCantFetchValueException; |
| 36 | 35 |
import org.gvsig.fmap.dal.store.jdbc.exception.JDBCDriverClassNotFoundException; |
| 37 | 36 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCConnection; |
| 37 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCLibrary; |
|
| 38 | 38 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCStoreProvider; |
| 39 | 39 |
import org.gvsig.fmap.dal.store.jdbc2.JDBCUtils; |
| 40 | 40 |
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory; |
| ... | ... | |
| 498 | 498 |
} |
| 499 | 499 |
} |
| 500 | 500 |
|
| 501 |
@Override
|
|
| 501 |
@Override |
|
| 502 | 502 |
public JDBCStoreParameters createOpenStoreParameters(JDBCServerExplorerParameters parameters) {
|
| 503 | 503 |
OracleStoreParameters params = (OracleStoreParameters) super.createOpenStoreParameters(parameters); |
| 504 | 504 |
params.setMode(((OracleExplorerParameters)parameters).getMode()); |
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleStoreParameters.java | ||
|---|---|---|
| 22 | 22 |
package org.gvsig.oracle.dal; |
| 23 | 23 |
|
| 24 | 24 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 25 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters; |
|
| 25 |
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParametersBase;
|
|
| 26 | 26 |
|
| 27 |
public class OracleStoreParameters extends JDBCStoreParameters implements OracleConnectionParameters {
|
|
| 27 |
public class OracleStoreParameters extends JDBCStoreParametersBase implements OracleConnectionParameters {
|
|
| 28 | 28 |
|
| 29 | 29 |
private final OracleConnectionParametersHelper helper; |
| 30 | 30 |
|
| org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleExplorerParameters.java | ||
|---|---|---|
| 25 | 25 |
package org.gvsig.oracle.dal; |
| 26 | 26 |
|
| 27 | 27 |
import org.gvsig.fmap.dal.exception.ValidateDataParametersException; |
| 28 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
|
| 28 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParametersBase;
|
|
| 29 | 29 |
|
| 30 | 30 |
public class OracleExplorerParameters extends |
| 31 |
JDBCServerExplorerParameters |
|
| 31 |
JDBCServerExplorerParametersBase
|
|
| 32 | 32 |
implements |
| 33 | 33 |
OracleConnectionParameters |
| 34 | 34 |
{
|
Also available in: Unified diff