Merge pull request #18 from deegree/master

Merging deegree master into csw-sorting-bug
lat-lon · Mar 27, 2013 · 91e5cc9 · 91e5cc9
2 parents 374d618 + 543600a
commit 91e5cc9
Show file tree

Hide file tree

Showing 260 changed files with 3,451 additions and 2,921 deletions.
diff --git a/deegree-client/deegree-jsf-console/pom.xml b/deegree-client/deegree-jsf-console/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/ConfigManager.java b/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/ConfigManager.java
@@ -159,9 +159,12 @@ public List<ResourceManagerMetadata2> getProcessManagers() {
     public List<ResourceManagerMetadata2> getConnectionManagers() {
         return getResourceManagers( "connection" );
     }
-    
+
     public List<ResourceManagerMetadata2> getResourceManagers( String category ) {
         List<ResourceManagerMetadata2> rmMetadata = new ArrayList<ResourceManagerMetadata2>();
+        if ( getServiceWorkspace() == null ) {
+            return rmMetadata;
+        }
         for ( ResourceManager mgr : getServiceWorkspace().getResourceManagers() ) {
             ResourceManagerMetadata2 md = ResourceManagerMetadata2.getMetadata( mgr );
             if ( md != null && category.equals( md.getCategory() ) ) {

diff --git a/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/WorkspaceBean.java b/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/WorkspaceBean.java
@@ -93,12 +93,15 @@ public class WorkspaceBean implements Serializable {
 
     public static final String WS_UPLOAD_VIEW = "/console/workspace/upload";
 
-    private static final String WS_DOWNLOAD_BASE_URL = "http://download.deegree.org/deegree3/workspaces/workspaces-";
+    // private static final String WS_DOWNLOAD_BASE_URL = "http://download.deegree.org/deegree3/workspaces/workspaces-";
 
     private static final String[] WS_DOWNLOAD_URLS = { "http://download.occamlabs.de/workspaces/occamlabs-workspaces" };
 
     // only used when no build (Maven) module version information is available
-    private static final String DEFAULT_VERSION = "3.2-pre11-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "3.2-rc2";
+
+    private static final String[] WS_LIST = { "deegree-workspace-csw", "deegree-workspace-inspire",
+                                             "deegree-workspace-utah", "deegree-workspace-wps" };
 
     private final HashMap<String, String> workspaceLocations = new HashMap<String, String>();
 
@@ -164,9 +167,9 @@ public static String getWsUploadView() {
         return WS_UPLOAD_VIEW;
     }
 
-    public static String getWsDownloadBaseUrl() {
-        return WS_DOWNLOAD_BASE_URL;
-    }
+    // public static String getWsDownloadBaseUrl() {
+    // return WS_DOWNLOAD_BASE_URL;
+    // }
 
     public static String[] getWsDownloadUrls() {
         return WS_DOWNLOAD_URLS;
@@ -375,15 +378,20 @@ public List<String> downloadWorkspaceList( String url ) {
 
     public List<String> getRemoteWorkspaces() {
         workspaceLocations.clear();
-        List<String> list = downloadWorkspaceList( getDownloadBaseUrl() );
-        for ( String url : WS_DOWNLOAD_URLS ) {
-            list.addAll( downloadWorkspaceList( url ) );
+        List<String> list = new ArrayList<String>();
+        for ( String wsArtifactName : WS_LIST ) {
+            addWorkspaceLocation( wsArtifactName, list );
         }
         return list;
     }
 
-    private String getDownloadBaseUrl() {
-        return WS_DOWNLOAD_BASE_URL + getVersion();
+    private void addWorkspaceLocation( String wsArtifactName, List<String> list ) {
+        String repo = getVersion().endsWith( "SNAPSHOT" ) ? "snapshots" : "releases";
+        String version = getVersion().endsWith( "SNAPSHOT" ) ? "LATEST" : getVersion();
+        String url = "http://repo.deegree.org/service/local/artifact/maven/redirect?r=" + repo + "&g=org.deegree&a="
+                     + wsArtifactName + "&v=" + version + "&e=deegree-workspace";
+        workspaceLocations.put( wsArtifactName, url );
+        list.add( wsArtifactName );
     }
 
     private String getVersion() {

diff --git a/deegree-client/deegree-jsf-core/pom.xml b/deegree-client/deegree-jsf-core/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/deegree-sos-webclient/pom.xml b/deegree-client/deegree-sos-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/deegree-wps-webclient/pom.xml b/deegree-client/deegree-wps-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/deegree-wpsprinter-webclient/pom.xml b/deegree-client/deegree-wpsprinter-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/pom.xml b/deegree-client/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-3d/pom.xml b/deegree-core/deegree-core-3d/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-annotations/pom.xml b/deegree-core/deegree-core-annotations/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-base/pom.xml b/deegree-core/deegree-core-base/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-base/src/main/java/org/deegree/filter/spatial/Intersects.java b/deegree-core/deegree-core-base/src/main/java/org/deegree/filter/spatial/Intersects.java
@@ -41,6 +41,7 @@
 import org.deegree.filter.Expression;
 import org.deegree.filter.FilterEvaluationException;
 import org.deegree.filter.XPathEvaluator;
+import org.deegree.geometry.Envelope;
 import org.deegree.geometry.Geometry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,15 +87,26 @@ public <T> boolean evaluate( T obj, XPathEvaluator<T> xpathEvaluator )
         } else if ( obj instanceof Feature ) {
             // handle the case where the property name is empty
             Feature f = (Feature) obj;
+            boolean foundGeom = false;
             for ( Property prop : f.getProperties() ) {
                 if ( prop.getValue() instanceof Geometry ) {
+                    foundGeom = true;
                     Geometry geom = (Geometry) prop.getValue();
                     Geometry transformedGeom = getCompatibleGeometry( geometry, geom );
                     if ( transformedGeom.intersects( geometry ) ) {
                         return true;
                     }
                 }
             }
+            if ( !foundGeom ) {
+                Envelope env = f.getEnvelope();
+                if ( env != null ) {
+                    Geometry g = getCompatibleGeometry( geometry, env );
+                    if ( g.intersects( geometry ) ) {
+                        return true;
+                    }
+                }
+            }
             if ( f.getExtraProperties() != null ) {
                 for ( Property prop : f.getExtraProperties().getProperties() ) {
                     if ( prop.getValue() instanceof Geometry ) {

diff --git a/deegree-core/deegree-core-commons/pom.xml b/deegree-core/deegree-core-commons/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.2-pre16-SNAPSHOT</version>
+    <version>3.3-pre1-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/...core/deegree-core-commons/src/main/java/org/deegree/commons/jdbc/LayerDatabaseHelper.java b/...core/deegree-core-commons/src/main/java/org/deegree/commons/jdbc/LayerDatabaseHelper.java