Revision 46106 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/test/java/org/gvsig/fmap/dal/store/jdbc2/AbstractTestUtils.java

View differences:

AbstractTestUtils.java
16 16
import org.apache.commons.lang3.math.NumberUtils;
17 17
import org.gvsig.fmap.dal.DALLocator;
18 18
import org.gvsig.fmap.dal.DataManager;
19
import org.gvsig.fmap.dal.DataServerExplorerParameters;
20 19
import org.gvsig.fmap.dal.DataStore;
21 20
import static org.gvsig.fmap.dal.DataStore.H2SPATIAL_PROVIDER_NAME;
22
import org.gvsig.fmap.dal.DataStoreParameters;
23 21
import org.gvsig.fmap.dal.DatabaseWorkspaceManager;
24
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.FIELD_RESOURCES_NAME;
25
import static org.gvsig.fmap.dal.DatabaseWorkspaceManager.TABLE_RESOURCES_NAME;
26 22
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
27 23
import org.gvsig.fmap.dal.feature.EditableFeature;
28 24
import org.gvsig.fmap.dal.feature.EditableFeatureType;
......
35 31
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
36 32
import org.gvsig.tools.resourcesstorage.ResourcesStorage;
37 33
import org.gvsig.tools.util.HasAFile;
38
import org.hibernate.dialect.H2Dialect;
39 34
import org.slf4j.Logger;
40 35
import org.slf4j.LoggerFactory;
41 36

  
......
137 132
        public boolean stripStart = false;
138 133
        public boolean removeNL = false;
139 134

  
135
        public String startLineComment = "-- ";
136
        
140 137
        private static class CommandLine {
141 138

  
142 139
            private final String[] cmd;
......
170 167
        public void parse(File f) throws Exception {
171 168
            final int SEARCHING_ITEM = 0;
172 169
            final int READING_ITEM = 1;
173
            final String startLineComment = "-- ";
174 170
            boolean localNormaliceSpaces = false;
175 171
            boolean localStripStart = false;
176 172
            boolean localRemoveNL = false;
......
289 285
    public void removeResource(JDBCServerExplorer explorer, String storeName, String resourceName) throws Exception {
290 286
        JDBCStoreParameters storeParams = explorer.get(storeName);
291 287
        ResourcesStorage resourcesStorage = explorer.getResourcesStorage(storeParams);
292
        resourcesStorage.remove(resourceName);
288
        if( resourcesStorage.allowRemove() ) {
289
            resourcesStorage.remove(resourceName);
290
        }
293 291
    }
294 292

  
295 293
    public void info_h2sql(String label, File file) {

Also available in: Unified diff