Removed references to GEOS-5113, which turned out to be nonsense

This commit is contained in:
Oscar Fonts 2012-05-20 12:28:16 +02:00
parent 42c3094d9e
commit d1352fb470
2 changed files with 3 additions and 6 deletions

View File

@ -984,7 +984,7 @@ public class GeoServerRESTPublisher {
return createStore( return createStore(
workspace, DataStoreType.datastores, workspace, DataStoreType.datastores,
storeName, method, storeName, method,
DataStoreExtension.shp, // TODO if GEOS-5113 is accepted, change to DataStoreExtension.shpdir DataStoreExtension.shp,
mime, resource, mime, resource,
ParameterConfigure.ALL, ParameterConfigure.ALL,
new NameValuePair[0]); new NameValuePair[0]);
@ -1252,7 +1252,7 @@ public class GeoServerRESTPublisher {
* *
*/ */
public enum DataStoreExtension { public enum DataStoreExtension {
shp, /*shpdir,*/ properties, h2, spatialite // TODO uncomment if GEOS-5113 is accepted shp, properties, h2, spatialite
} }
/** /**

View File

@ -70,11 +70,8 @@ public class GeoserverRESTPublishShpCollectionTest extends GeoserverRESTTest {
// Publish shp collection // Publish shp collection
assertTrue(publisher.publishShpCollection(workspace, storeName, location)); assertTrue(publisher.publishShpCollection(workspace, storeName, location));
// Test store type */
/* TODO uncomment if GEOS-5113 is accepted
String storeType = reader.getDatastore(workspace, storeName).getStoreType(); String storeType = reader.getDatastore(workspace, storeName).getStoreType();
assertEquals(storeType, "Directory of spatial files (shapefiles)"); assertEquals(storeType, "Shapefile");
*/
// Test published layer names // Test published layer names
List<String> layers = reader.getLayers().getNames(); List<String> layers = reader.getLayers().getNames();