deegree · diegomigliavacca · May 28, 2013 · Jun 2, 2013 · Jun 3, 2013 · Jun 3, 2013
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.3.1-SNAPSHOT</version>
+    <version>3.3.8-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/.../deegree-jsf-console/src/main/java/org/deegree/console/featurestore/MappingWizardSQL.java b/.../deegree-jsf-console/src/main/java/org/deegree/console/featurestore/MappingWizardSQL.java
@@ -36,6 +36,7 @@
 package org.deegree.console.featurestore;
 
 import static javax.faces.application.FacesMessage.SEVERITY_ERROR;
+import static org.deegree.feature.types.property.GeometryPropertyType.CoordinateDimension.DIM_2;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,7 +79,6 @@
 import org.deegree.feature.persistence.sql.ddl.DDLCreator;
 import org.deegree.feature.persistence.sql.mapper.AppSchemaMapper;
 import org.deegree.feature.types.AppSchema;
-import org.deegree.feature.types.property.GeometryPropertyType.CoordinateDimension;
 import org.deegree.gml.schema.GMLAppSchemaReader;
 import org.deegree.sqldialect.SQLDialect;
 import org.deegree.sqldialect.SQLDialectManager;
@@ -115,7 +115,6 @@ public class MappingWizardSQL {
 
     private String storageCrs = "EPSG:4326";
 
-    // TODO
     private String storageSrid = "-1";
 
     private Integer columnNameLength = 16;
@@ -171,6 +170,7 @@ public void setSelectedJdbcConn( String jdbcId ) {
                 SQLDialect dialect = dialectMgr.create( jdbcId );
                 columnNameLength = dialect.getMaxColumnNameLength();
                 tableNameLength = dialect.getMaxTableNameLength();
+                storageSrid = dialect.getUndefinedSrid();
             } catch ( Throwable t ) {
                 FacesMessage fm = new FacesMessage( SEVERITY_ERROR, "SQLDialect error: " + t.getMessage(), null );
                 FacesContext.getCurrentInstance().addMessage( null, fm );
@@ -296,8 +296,7 @@ public String generateConfig() {
             CRSRef storageCrs = CRSManager.getCRSRef( this.storageCrs );
             boolean createBlobMapping = storageMode.equals( "hybrid" ) || storageMode.equals( "blob" );
             boolean createRelationalMapping = storageMode.equals( "hybrid" ) || storageMode.equals( "relational" );
-            GeometryStorageParams geometryParams = new GeometryStorageParams( storageCrs, storageSrid,
-                                                                              CoordinateDimension.DIM_2 );
+            GeometryStorageParams geometryParams = new GeometryStorageParams( storageCrs, storageSrid, DIM_2 );
             AppSchemaMapper mapper = new AppSchemaMapper( appSchema, createBlobMapping, createRelationalMapping,
                                                           geometryParams,
                                                           Math.min( tableNameLength, columnNameLength ), true, false );

diff --git a/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/util/RequestBean.java b/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/util/RequestBean.java
@@ -315,8 +315,14 @@ public void init() {
 
     public void addRequest() {
         String subdir = new File( selectedRequest ).getParentFile().getParentFile().getName();
+        File saveRequest;
+        try {
+            saveRequest = new File( saveRequestName );
+        } catch (Exception e) {
+            return;
+        }
         File file = new File( requestsBaseDir, selectedService + separator + selectedReqProfile + separator + subdir
-                                               + separator + "xml" + separator + saveRequestName + ".xml" );
+                                               + separator + "xml" + separator + saveRequest.getName() + ".xml" );
         FileOutputStream out = null;
         try {
             out = new FileOutputStream( file );

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.3.1-SNAPSHOT</version>
+    <version>3.3.8-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.3.1-SNAPSHOT</version>
+    <version>3.3.8-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.3.1-SNAPSHOT</version>
+    <version>3.3.8-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.3.1-SNAPSHOT</version>
+    <version>3.3.8-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.3.1-SNAPSHOT</version>
+    <version>3.3.8-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.3.1-SNAPSHOT</version>
+    <version>3.3.8-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.3.1-SNAPSHOT</version>
+    <version>3.3.8-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-base/src/main/java/org/deegree/gml/feature/GMLFeatureWriter.java b/deegree-core/deegree-core-base/src/main/java/org/deegree/gml/feature/GMLFeatureWriter.java
@@ -306,6 +306,9 @@ private void export( Property property, GmlXlinkOptions resolveState )
                 writeEmptyElementWithNS( propName.getNamespaceURI(), propName.getLocalPart() );
                 writeAttributeWithNS( XSINS, "nil", "true" );
                 endEmptyElement();
+            } else if ( value == null ) {
+                writeEmptyElementWithNS( propName.getNamespaceURI(), propName.getLocalPart() );
+                endEmptyElement();
             } else {
                 Geometry gValue = (Geometry) value;
                 if ( !exportSf && gValue.getId() != null && referenceExportStrategy.isObjectExported( gValue.getId() ) ) {

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.3.1-SNAPSHOT</version>
+    <version>3.3.8-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/...re/deegree-core-commons/src/main/java/org/deegree/commons/ows/exception/OWSException.java b/...re/deegree-core-commons/src/main/java/org/deegree/commons/ows/exception/OWSException.java
@@ -60,7 +60,12 @@ public class OWSException extends Exception {
      * a required parameter is missing
      */
     public static final String MISSING_PARAMETER_VALUE = "MissingParameterValue";
-
+
+    /**
+     * Server processing failed
+     */
+    public static final String OPERATION_PROCESSING_FAILED = "OperationProcessingFailed";
+
     /**
      * the parameter value is invalid
      */

diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/utils/JDBCUtils.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/utils/JDBCUtils.java
@@ -158,7 +158,7 @@ public static void close( ResultSet rs, Statement stmt, Connection conn, Logger
     }
 
     public static String determinePostGISVersion( Connection conn, Logger log ) {
-        String version = "1.0";
+        String version = null;
         Statement stmt = null;
         ResultSet rs = null;
         try {
@@ -169,7 +169,7 @@ public static String determinePostGISVersion( Connection conn, Logger log ) {
             version = postGISVersion.split( " " )[0];
             log.debug( "PostGIS version: {}", version );
         } catch ( Throwable t ) {
-            log.warn( "Could not determine PostGIS version: {} -- defaulting to 1.0.0", t.getMessage() );
+            log.warn( "Could not determine PostGIS version." );
         }
         return version;
     }
@@ -244,8 +244,8 @@ public ResultSet call()
         }
     }
 
-    public static void rollbackQuietly(Connection conn) {
-        if (conn != null) {
+    public static void rollbackQuietly( Connection conn ) {
+        if ( conn != null ) {
             try {
                 conn.rollback();
             } catch ( SQLException e ) {

diff --git a/deegree-core/deegree-core-coverage/pom.xml b/deegree-core/deegree-core-coverage/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.3.8-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-cs/pom.xml b/deegree-core/deegree-core-cs/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.3.8-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/...s/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/CoordinateSystemParser.java b/...s/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/CoordinateSystemParser.java
@@ -144,13 +144,13 @@ public ICRS getCRSForId( String crsId )
                 if ( result != null ) {
                     getStore().addIdToCache( result, false );
                 }
-                while ( result != null && !result.hasId( tmpCRSId, false, true ) ) {
+                while ( result != null ) {
                     result = parseCoordinateSystem( configReader );
                     if ( result != null ) {
                         getStore().addIdToCache( result, false );
                     }
                 }
-
+                return getStore().getCachedIdentifiable( CRS.class, tmpCRSId );
             } catch ( XMLStreamException e ) {
                 throw new CRSConfigurationException( e );
             }
@@ -385,7 +385,8 @@ protected CRS parseCompoundCRS( XMLStreamReader reader )
         try {
             usedCRS = getRequiredText( reader, new QName( CRS_NS, "UsedCRS" ), true );
         } catch ( XMLParsingException e ) {
-            throw new CRSConfigurationException( Messages.getMessage( "CRS_CONFIG_PARSE_ERROR", "usedCRS",
+            throw new CRSConfigurationException( Messages.getMessage( "CRS_CONFIG_PARSE_ERROR",
+                                                                      "usedCRS",
                                                                       ( ( reader == null ) ? "null"
                                                                                           : reader.getLocalName() ),
                                                                       e.getMessage() ), e );
@@ -407,8 +408,8 @@ protected CRS parseCompoundCRS( XMLStreamReader reader )
                                                                       e.getLocalizedMessage() ), e );
         }
 
-        double defaultHeight = XMLStreamUtils.getElementTextAsDouble( reader, new QName( CRS_NS, "DefaultHeight" ),
-                                                                         0, true );
+        double defaultHeight = XMLStreamUtils.getElementTextAsDouble( reader, new QName( CRS_NS, "DefaultHeight" ), 0,
+                                                                      true );
         // adding to cache will be done in AbstractCRSProvider.
         return new CompoundCRS( heightAxis, usedCoordinateSystem, defaultHeight, id );
     }

diff --git a/...gree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DatumParser.java b/...gree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DatumParser.java
@@ -38,6 +38,7 @@
 
 package org.deegree.cs.persistence.deegree.d3.parsers;
 
+import static org.deegree.commons.xml.stax.XMLStreamUtils.moveReaderToFirstMatch;
 import static org.deegree.commons.xml.stax.XMLStreamUtils.nextElement;
 import static org.deegree.cs.persistence.deegree.d3.DeegreeCRSStore.CRS_NS;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -121,7 +122,7 @@ public GeodeticDatum getGeodeticDatumForId( String datumID )
      */
     protected GeodeticDatum parseDatum( XMLStreamReader reader )
                             throws XMLStreamException {
-        if ( reader == null || !super.moveReaderToNextIdentifiable( reader, DATUM_ELEM ) ) {
+        if ( reader == null || !moveReaderToFirstMatch( reader, DATUM_ELEM ) ) {
             LOG.debug( "Could not get datum, no more definitions left." );
             return null;
         }
@@ -138,8 +139,8 @@ protected GeodeticDatum parseDatum( XMLStreamReader reader )
         IEllipsoid ellipsoid = new EllipsoidRef( store.getResolver( RESOURCETYPE.ELLIPSOID ), '#' + ellipsID, null );
 
         // get the primemeridian if any.
-        String pMeridianID = XMLStreamUtils.getText( getConfigReader(), new QName( CRS_NS, "UsedPrimeMeridian" ),
-                                                        null, true );
+        String pMeridianID = XMLStreamUtils.getText( getConfigReader(), new QName( CRS_NS, "UsedPrimeMeridian" ), null,
+                                                     true );
         IPrimeMeridian pMeridian = null;
         if ( pMeridianID != null && pMeridianID.trim().length() > 0 ) {
             pMeridian = new PrimeMeridianRef( store.getResolver( RESOURCETYPE.PM ), '#' + pMeridianID, null );

diff --git a/...core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DefinitionParser.java b/...core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/DefinitionParser.java
@@ -39,7 +39,6 @@
 package org.deegree.cs.persistence.deegree.d3.parsers;
 
 import static org.deegree.commons.xml.stax.XMLStreamUtils.getSimpleUnboundedAsStrings;
-import static org.deegree.commons.xml.stax.XMLStreamUtils.moveReaderToFirstMatch;
 import static org.deegree.commons.xml.stax.XMLStreamUtils.nextElement;
 import static org.deegree.cs.persistence.deegree.d3.DeegreeCRSStore.CRS_NS;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -273,20 +272,6 @@ public DeegreeCRSStore getStore() {
         return store;
     }
 
-    /**
-     * Forwards the stream
-     * 
-     * @param reader
-     *            to forward
-     * @param elementName
-     * @return true if the stream is pointing to an element with the given qname.
-     * @throws XMLStreamException
-     */
-    public boolean moveReaderToNextIdentifiable( XMLStreamReader reader, QName elementName )
-                            throws XMLStreamException {
-        return moveReaderToFirstMatch( reader, elementName );
-    }
-
     /**
      * Post: reader will be at {@link XMLStreamConstants#START_ELEMENT} of the next element.
      * 

diff --git a/...-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/EllipsoidParser.java b/...-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/EllipsoidParser.java
@@ -40,6 +40,7 @@
 
 import static org.deegree.commons.xml.stax.XMLStreamUtils.getElementTextAsDouble;
 import static org.deegree.commons.xml.stax.XMLStreamUtils.getRequiredElementTextAsDouble;
+import static org.deegree.commons.xml.stax.XMLStreamUtils.moveReaderToFirstMatch;
 import static org.deegree.commons.xml.stax.XMLStreamUtils.nextElement;
 import static org.deegree.cs.persistence.deegree.d3.DeegreeCRSStore.CRS_NS;
 import static org.slf4j.LoggerFactory.getLogger;
@@ -121,7 +122,7 @@ public Ellipsoid getEllipsoidForId( String ellipsoidID )
      */
     protected Ellipsoid parseEllipsoid( XMLStreamReader reader )
                             throws XMLStreamException {
-        if ( reader == null || !super.moveReaderToNextIdentifiable( reader, ELLIPS_ELEM ) ) {
+        if ( reader == null || !moveReaderToFirstMatch( reader, ELLIPS_ELEM ) ) {
             LOG.debug( "Could not get ellipsoid no more definitions found." );
             return null;
         }

diff --git a/...e-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/PrimemeridianParser.java b/...e-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/parsers/PrimemeridianParser.java
@@ -38,6 +38,7 @@
 
 package org.deegree.cs.persistence.deegree.d3.parsers;
 
+import static org.deegree.commons.xml.stax.XMLStreamUtils.moveReaderToFirstMatch;
 import static org.deegree.cs.persistence.deegree.d3.DeegreeCRSStore.CRS_NS;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -115,7 +116,7 @@ public PrimeMeridian getPrimeMeridianForId( String meridianId )
      */
     protected PrimeMeridian parsePrimeMeridian( XMLStreamReader reader )
                             throws XMLStreamException {
-        if ( reader == null || !super.moveReaderToNextIdentifiable( reader, PM_ELEMENT ) ) {
+        if ( reader == null || !moveReaderToFirstMatch( reader, PM_ELEMENT ) ) {
             LOG.debug( "Could not get prime meridian no more definitions found." );
             return null;
         }

diff --git a/...re-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml b/...re-cs/src/main/resources/org/deegree/cs/persistence/deegree/d3/config/crs-definitions.xml
@@ -68244,5 +68244,49 @@
                         <crs:AxisOrientation>up</crs:AxisOrientation>
                 </crs:HeightAxis>
                 <crs:DefaultHeight>0.0</crs:DefaultHeight>
-        </crs:CompoundCRS>       
+        </crs:CompoundCRS>
+        <crs:GeographicCRS>
+                <crs:Id>epsg:4761</crs:Id>
+                <crs:Id>http://www.opengis.net/gml/srs/epsg.xml#4761</crs:Id>
+                <crs:Id>urn:ogc:def:crs:epsg::4761</crs:Id>
+                <crs:Id>urn:opengis:def:crs:epsg::4761</crs:Id>
+                <crs:Name>HTRS96</crs:Name>
+                <crs:Version>2013-10-18T17:47</crs:Version>
+                <crs:Description>Handmade proj4 geographic crs definition (parsed from nad/epsg).</crs:Description>
+                <crs:AreaOfUse>-180.0,-90.0,180.0,90.0</crs:AreaOfUse>
+                <crs:AreaOfUse>Not specified.</crs:AreaOfUse>
+                <crs:Axis>
+                        <crs:Name>longitude</crs:Name>
+                        <crs:Units>degree</crs:Units>
+                        <crs:AxisOrientation>east</crs:AxisOrientation>
+                </crs:Axis>
+                <crs:Axis>
+                        <crs:Name>latitude</crs:Name>
+                        <crs:Units>degree</crs:Units>
+                        <crs:AxisOrientation>north</crs:AxisOrientation>
+                </crs:Axis>
+                <crs:UsedDatum>epsg:6761</crs:UsedDatum>
+        </crs:GeographicCRS>
+        <crs:ProjectedCRS>
+                <crs:Id>epsg:3765</crs:Id>
+                <crs:Id>http://www.opengis.net/gml/srs/epsg.xml#3765</crs:Id>
+                <crs:Id>urn:ogc:def:crs:epsg::3765</crs:Id>
+                <crs:Id>urn:opengis:def:crs:epsg::3765</crs:Id>
+                <crs:Name>HTRS96 / Croatia TM</crs:Name>
+                <crs:Version>2013-10-18T17:47</crs:Version>
+                <crs:AreaOfUse>13.01,41.62,19.43,46.54</crs:AreaOfUse>
+                <crs:AreaOfUse>Croatia - onshore and offshore.</crs:AreaOfUse>
+                <crs:Axis>
+                        <crs:Name>x</crs:Name>
+                        <crs:Units>metre</crs:Units>
+                        <crs:AxisOrientation>east</crs:AxisOrientation>
+                </crs:Axis>
+                <crs:Axis>
+                        <crs:Name>y</crs:Name>
+                        <crs:Units>metre</crs:Units>
+                        <crs:AxisOrientation>north</crs:AxisOrientation>
+                </crs:Axis>
+                <crs:UsedGeographicCRS>epsg:4761</crs:UsedGeographicCRS>
+                <crs:UsedProjection>epsg:19851</crs:UsedProjection>
+        </crs:ProjectedCRS>                       
 </crs:CRSDefinitions>