From fa2247187829d7d0260a789623fedc3731352f3c Mon Sep 17 00:00:00 2001
From: ccancellieri <carlo.cancellieri@geo-solutions.it>
Date: Tue, 11 Oct 2011 15:50:42 +0200
Subject: [PATCH] fix GeoserverRESTPostgisDatastore options pubblication and
 tests

---
 .../rest/encoder/GSPostGISDatastoreEncoder.java       |  1 +
 .../geoserver/rest/encoder/GSResourceEncoder.java     |  4 ++--
 .../rest/GeoserverRESTPostgisDatastoreTest.java       | 11 ++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSPostGISDatastoreEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSPostGISDatastoreEncoder.java
index 92a229d..6cbc336 100644
--- a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSPostGISDatastoreEncoder.java
+++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSPostGISDatastoreEncoder.java
@@ -44,6 +44,7 @@ public class GSPostGISDatastoreEncoder extends PropertyXMLEncoder {
         super("dataStore");
         addType("PostGIS"); // may be overwritten with e.g. "PostGIS (JNDI)"
         addDatabaseType("postgis");
+        addContent(connectionParameters.getRoot());
     }
     
     /**
diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java
index f271b15..811d46d 100644
--- a/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java
+++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java
@@ -48,6 +48,8 @@ import org.jdom.Element;
 public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
 		extends PropertyXMLEncoder {
 
+	final private GSMetadataEncoder<T> metadata = new GSMetadataEncoder<T>();
+	final private Element keywordsListEncoder = new Element("keywords");
 	/**
 	 * @param rootName
 	 *            Actually 'feature' or 'coverage'
@@ -63,13 +65,11 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
 		addContent(keywordsListEncoder);
 	}
 
-	final private GSMetadataEncoder<T> metadata = new GSMetadataEncoder<T>();
 
 	public void addMetadata(String key, T dimensionInfo) {
 		metadata.add(key, dimensionInfo.getRoot());
 	}
 
-	final private Element keywordsListEncoder = new Element("keywords");
 
 	public void addKeyword(String keyword) {
 		final Element el = new Element("string");
diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java
index eff5c46..b6611ca 100644
--- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java
+++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java
@@ -83,8 +83,9 @@ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
         if (!enabled()) {
             return;
         }
-
-        String wsName = "it.geosolutions";
+        deleteAll();
+        
+        String wsName = DEFAULT_WS;
         String datastoreName = "resttestpostgis";
         String description = "description";
         String dsNamespace = "http://www.geo-solutions.it";
@@ -106,7 +107,9 @@ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
         datastoreEncoder.addExposePrimaryKeys(exposePrimaryKeys);
         datastoreEncoder.addValidateConnections(validateConnections);
         datastoreEncoder.addPrimaryKeyMetadataTable(primaryKeyMetadataTable);
-
+        
+        assertTrue(publisher.createWorkspace(wsName));
+        
         // creation test
         boolean created = publisher.createPostGISDatastore(wsName, datastoreEncoder);
 
@@ -125,6 +128,8 @@ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
             assertTrue("PostGIS datastore not removed", removed);
         else if( ! removed )
             LOGGER.error("*** Datastore " + datastoreName + " has not been removed.");
+        
+        assertTrue(publisher.removeWorkspace(wsName));
     }
 
 }