Merge deegree master into latlon master

deegree-client/deegree-jsf-console/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/Config.java

@@ -403,4 +403,5 @@ public void setAutoActivate( boolean autoActivate ) {
     public void setState( ResourceState<?> state ) {
         this.state = state;
     }
-}
+
+}

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/ConfigManager.java

@@ -207,6 +207,7 @@ public List<Config> getAvailableResources() {
             configs.add( new Config( state, this, currentResourceManager.getManager(),
                                      currentResourceManager.getStartView(), true ) );
         }
+        Collections.sort( configs );
         return configs;
     }
 

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/featurestore/FeatureStoreConfig.java

@@ -83,9 +83,14 @@ public class FeatureStoreConfig implements Serializable {
     private String id;
 
     private FeatureStoreManager getFeatureStoreManager() {
+        DeegreeWorkspace ws = getWorkspace();
+        return ws.getSubsystemManager( FeatureStoreManager.class );
+    }
+
+    private DeegreeWorkspace getWorkspace() {
         ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
         DeegreeWorkspace ws = ( (WorkspaceBean) ctx.getApplicationMap().get( "workspace" ) ).getActiveWorkspace();
-        return ws.getSubsystemManager( FeatureStoreManager.class );
+        return ws;
     }
 
     public boolean getSql() {
@@ -104,7 +109,7 @@ public String createTables() {
         SQLFeatureStore fs = (SQLFeatureStore) getFeatureStoreManager().get( getId() );
         String connId = fs.getConnId();
         String[] sql = DDLCreator.newInstance( fs.getSchema(), fs.getDialect() ).getDDL();
-        SQLExecution execution = new SQLExecution( connId, sql, "/console/featurestore/buttons" );
+        SQLExecution execution = new SQLExecution( connId, sql, "/console/featurestore/buttons", getWorkspace() );
 
         FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put( "execution", execution );
         return "/console/generic/sql.jsf?faces-redirect=true";

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/featurestore/MappingWizardSQL.java

@@ -60,6 +60,7 @@
 import org.deegree.client.core.utils.SQLExecution;
 import org.deegree.commons.config.DeegreeWorkspace;
 import org.deegree.commons.config.ResourceState;
+import org.deegree.commons.config.ResourceState.StateType;
 import org.deegree.commons.jdbc.ConnectionManager;
 import org.deegree.commons.jdbc.ConnectionManager.Type;
 import org.deegree.commons.utils.FileUtils;
@@ -133,10 +134,24 @@ public String getFeatureStoreId()
         return mgr.getNewConfigId();
     }
 
+    private DeegreeWorkspace getWorkspace() {
+        ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
+        DeegreeWorkspace ws = ( (WorkspaceBean) ctx.getApplicationMap().get( "workspace" ) ).getActiveWorkspace();
+        return ws;
+    }
+
     public SortedSet<String> getAvailableJdbcConns() {
-        SortedSet<String> conns = new TreeSet<String>( ConnectionManager.getConnectionIds() );
-        // TODO remove this hack
-        conns.remove( "LOCK_DB" );
+        ConnectionManager mgr = getWorkspace().getSubsystemManager( ConnectionManager.class );
+        SortedSet<String> conns = new TreeSet<String>();
+        for ( ResourceState<?> rs : mgr.getStates() ) {
+            // TODO remove this hack
+            if ( rs.getId().equals( "LOCK_DB" ) ) {
+                continue;
+            }
+            if ( rs.getType().equals( StateType.init_ok ) ) {
+                conns.add( rs.getId() );
+            }
+        }
         return conns;
     }
 
@@ -335,7 +350,7 @@ public String createTables() {
         SQLFeatureStore store = (SQLFeatureStore) resourceState.getResource();
         String[] createStmts = DDLCreator.newInstance( store.getSchema(), store.getDialect() ).getDDL();
         resourceState = fsMgr.deactivate( resourceState.getId() );
-        SQLExecution execution = new SQLExecution( jdbcId, createStmts, "/console/featurestore/sql/wizard5" );
+        SQLExecution execution = new SQLExecution( jdbcId, createStmts, "/console/featurestore/sql/wizard5", ws );
         FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put( "execution", execution );
         return "/console/generic/sql.jsf?faces-redirect=true";
     }

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/jdbc/ConnectionTester.java

@@ -41,9 +41,12 @@
 import javax.faces.application.FacesMessage;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.SessionScoped;
+import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 
+import org.deegree.commons.config.DeegreeWorkspace;
 import org.deegree.commons.jdbc.ConnectionManager;
+import org.deegree.console.WorkspaceBean;
 
 /**
  * JSF Bean for testing the availability of connections offered by {@link ConnectionManager}.
@@ -58,10 +61,17 @@
 @SessionScoped
 public class ConnectionTester {
 
+    private DeegreeWorkspace getWorkspace() {
+        ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
+        DeegreeWorkspace ws = ( (WorkspaceBean) ctx.getApplicationMap().get( "workspace" ) ).getActiveWorkspace();
+        return ws;
+    }
+
     public void test() {
         String id = (String) getParam1();
         try {
-            ConnectionManager.getConnection( id ).close();
+            ConnectionManager mgr = getWorkspace().getSubsystemManager( ConnectionManager.class );
+            mgr.get( id ).close();
             FacesMessage fm = new FacesMessage( SEVERITY_INFO, "Connection '" + id + "' ok", null );
             FacesContext.getCurrentInstance().addMessage( null, fm );
         } catch ( Throwable t ) {
@@ -70,11 +80,12 @@ public void test() {
             FacesContext.getCurrentInstance().addMessage( null, fm );
         }
     }
-    
+
     public String testAndSave() {
         String id = (String) getParam1();
         try {
-            ConnectionManager.getConnection( id ).close();
+            ConnectionManager mgr = getWorkspace().getSubsystemManager( ConnectionManager.class );
+            mgr.get( id ).close();
             FacesMessage fm = new FacesMessage( SEVERITY_INFO, "Connection '" + id + "' ok", null );
             FacesContext.getCurrentInstance().addMessage( null, fm );
         } catch ( Throwable t ) {

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/metadatastore/MetadataStoreConfig.java

@@ -75,9 +75,13 @@ public class MetadataStoreConfig implements Serializable {
     private String id;
 
     private MetadataStoreManager getMetadataStoreManager() {
+        return getWorkspace().getSubsystemManager( MetadataStoreManager.class );
+    }
+
+    private DeegreeWorkspace getWorkspace() {
         ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
         DeegreeWorkspace ws = ( (WorkspaceBean) ctx.getApplicationMap().get( "workspace" ) ).getActiveWorkspace();
-        return ws.getSubsystemManager( MetadataStoreManager.class );
+        return ws;
     }
 
     public String getId() {
@@ -109,13 +113,12 @@ public String createTables()
             String[] sql;
             try {
                 String connId = ms.getConnId();
-                ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
-                DeegreeWorkspace ws = ( (WorkspaceBean) ctx.getApplicationMap().get( "workspace" ) ).getActiveWorkspace();
+                DeegreeWorkspace ws = getWorkspace();
                 ConnectionManager connManager = ws.getSubsystemManager( ConnectionManager.class );
 
                 sql = provider.getCreateStatements( connManager.getType( connId ) );
 
-                SQLExecution execution = new SQLExecution( connId, sql, "/console/metadatastore/buttons" );
+                SQLExecution execution = new SQLExecution( connId, sql, "/console/metadatastore/buttons", ws );
 
                 FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put( "execution", execution );
             } catch ( UnsupportedEncodingException e ) {

deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/util/Connection.java

@@ -39,8 +39,12 @@
 
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.RequestScoped;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
 
+import org.deegree.commons.config.DeegreeWorkspace;
 import org.deegree.commons.jdbc.ConnectionManager;
+import org.deegree.console.WorkspaceBean;
 
 /**
  * TODO add class documentation here
@@ -60,6 +64,12 @@ public class Connection implements Serializable {
 
     private String status = "OK";
 
+    private DeegreeWorkspace getWorkspace() {
+        ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
+        DeegreeWorkspace ws = ( (WorkspaceBean) ctx.getApplicationMap().get( "workspace" ) ).getActiveWorkspace();
+        return ws;
+    }
+
     public String getId() {
         return id;
     }
@@ -71,7 +81,8 @@ public String getStatus() {
     Connection( String id ) {
         try {
             this.id = id;
-            ConnectionManager.getConnection( id ).close();
+            ConnectionManager mgr = getWorkspace().getSubsystemManager( ConnectionManager.class );
+            mgr.get( id ).close();
         } catch ( Exception e ) {
             status = "ERROR: " + e.getMessage();
         }

deegree-client/deegree-jsf-console/src/main/webapp/WEB-INF/web.xml

@@ -51,21 +51,6 @@
     <load-on-startup>2</load-on-startup>
   </servlet>
 
-  <servlet>
-    <servlet-name>Jersey Web Application</servlet-name>
-    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-    <init-param>
-      <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>org.deegree.services</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>Jersey Web Application</servlet-name>
-    <url-pattern>/rest/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>services</servlet-name>
     <url-pattern>/services</url-pattern>

deegree-client/deegree-jsf-core/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java

@@ -47,6 +47,7 @@
 import javax.faces.context.FacesContext;
 
 import org.deegree.commons.annotations.LoggingNotes;
+import org.deegree.commons.config.DeegreeWorkspace;
 import org.deegree.commons.jdbc.ConnectionManager;
 import org.deegree.commons.utils.JDBCUtils;
 import org.slf4j.Logger;
@@ -67,10 +68,13 @@ public class SQLExecution implements Serializable {
 
     private String backOutcome;
 
-    public SQLExecution( String connId, String[] sqlStatements, String backOutcome ) {
+    private DeegreeWorkspace workspace;
+
+    public SQLExecution( String connId, String[] sqlStatements, String backOutcome, DeegreeWorkspace workspace ) {
         this.connId = connId;
         this.sqlStatements = sqlStatements;
         this.backOutcome = backOutcome;
+        this.workspace = workspace;
     }
 
     public String getMessage() {
@@ -102,16 +106,18 @@ public String execute() {
         Connection conn = null;
         Statement stmt = null;
         try {
-            conn = ConnectionManager.getConnection( connId );
+            ConnectionManager mgr = workspace.getSubsystemManager( ConnectionManager.class );
+            conn = mgr.get( connId );
             conn.setAutoCommit( false );
             stmt = conn.createStatement();
             for ( String sql : sqlStatements ) {
                 LOG.debug( "Executing: {}", sql );
                 stmt.execute( sql );
             }
             conn.commit();
-            FacesMessage fm = new FacesMessage( SEVERITY_INFO, "Executed " + sqlStatements.length + " statements successfully.", null );
-            FacesContext.getCurrentInstance().addMessage( null, fm );            
+            FacesMessage fm = new FacesMessage( SEVERITY_INFO, "Executed " + sqlStatements.length
+                                                               + " statements successfully.", null );
+            FacesContext.getCurrentInstance().addMessage( null, fm );
         } catch ( Throwable t ) {
             if ( conn != null ) {
                 try {

deegree-client/deegree-sos-webclient/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-client/deegree-wps-webclient/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-client/deegree-wpsprinter-webclient/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-client/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-core/deegree-core-3d/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-core/deegree-core-annotations/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-core/deegree-core-base/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.3-pre1-SNAPSHOT</version>
+    <version>3.3-pre2-SNAPSHOT</version>
   </parent>
 
   <repositories>

deegree-core/deegree-core-base/src/main/java/org/deegree/feature/types/GenericAppSchema.java

@@ -35,8 +35,6 @@
  ----------------------------------------------------------------------------*/
 package org.deegree.feature.types;
 
-import static javax.xml.XMLConstants.NULL_NS_URI;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -193,7 +191,7 @@ public GenericAppSchema( FeatureType[] fts, Map<FeatureType, FeatureType> ftToSu
         // add namespaces of feature types
         for ( FeatureType ft : getFeatureTypes() ) {
             String ns = ft.getName().getNamespaceURI();
-            if ( !( NULL_NS_URI.equals( ns ) ) ) {
+            if ( !( "".equals( ns ) ) ) {
                 if ( !this.prefixToNs.values().contains( ns ) && this.prefixToNs != null ) {
                     String prefix = nsToPrefix.get( ns );
                     if ( prefix == null ) {
@@ -212,7 +210,7 @@ public GenericAppSchema( FeatureType[] fts, Map<FeatureType, FeatureType> ftToSu
             XSNamespaceItemList nsItems = xsModel.getNamespaces();
             for ( int i = 0; i < nsItems.getLength(); i++ ) {
                 String ns = nsItems.item( i ).getSchemaNamespace();
-                if ( !NULL_NS_URI.equals( ns ) && !( CommonNamespaces.isCoreNamespace( ns ) ) ) {
+                if ( !"".equals( ns ) && !( CommonNamespaces.isCoreNamespace( ns ) ) ) {
                     if ( !this.prefixToNs.values().contains( ns ) && this.prefixToNs != null ) {
                         String prefix = nsToPrefix.get( ns );
                         if ( prefix == null ) {