deegree · tfr42 · May 14, 2022 · Dec 2, 2015 · Dec 3, 2015 · Dec 3, 2015
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,8 +6,8 @@ pipeline {
         disableConcurrentBuilds() 
     }
     tools {
-        maven 'maven-3.6'
-        jdk 'adoptopenjdk-jdk8'
+        maven 'maven-3.8'
+        jdk 'adoptopenjdk-jdk11'
     }
     environment {
         MAVEN_OPTS='-Djava.awt.headless=true -Xmx4096m'

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -23,9 +23,6 @@
     <module name='RedundantModifier'>
       <property name="severity" value="warning" />
     </module>
-    <module name='RedundantThrows'>
-      <property name="severity" value="warning" />
-    </module>
   </module>
   <module name='FileLength' />
   <module name='NewlineAtEndOfFile'>

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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>

diff --git a/deegree-client/deegree-wps-webclient/pom.xml b/deegree-client/deegree-wps-webclient/pom.xml
@@ -12,10 +12,14 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.deegree</groupId>
       <artifactId>deegree-protocol-commons</artifactId>

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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <modules>

diff --git a/deegree-core/deegree-connectionprovider-datasource/pom.xml b/deegree-core/deegree-connectionprovider-datasource/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>

diff --git a/...tasource/src/main/java/org/deegree/db/datasource/DataSourceConnectionProviderBuilder.java b/...tasource/src/main/java/org/deegree/db/datasource/DataSourceConnectionProviderBuilder.java
@@ -1,11 +1,13 @@
 /*----------------------------------------------------------------------------
  This file is part of deegree, http://deegree.org/
- Copyright (C) 2001-2014 by:
+ Copyright (C) 2001-2022 by:
  - Department of Geography, University of Bonn -
  and
  - lat/lon GmbH -
  and
  - Occam Labs UG (haftungsbeschränkt) -
+ and
+ - grit graphische Informationstechnik Beratungsgesellschaft mbH -
 
  This library is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the Free
@@ -35,6 +37,11 @@
  Occam Labs UG (haftungsbeschränkt)
  Godesberger Allee 139, 53175 Bonn
  Germany
+
+ grit graphische Informationstechnik Beratungsgesellschaft mbH
+ Landwehrstr. 143, 59368 Werne
+ Germany
+ http://www.grit.de/
 
  e-mail: info@deegree.org
  ----------------------------------------------------------------------------*/
@@ -49,6 +56,7 @@ Occam Labs UG (haftungsbeschränkt)
 import javax.sql.DataSource;
 
 import org.deegree.db.ConnectionProvider;
+import org.deegree.db.dialect.SqlDialectProvider;
 import org.deegree.db.dialect.SqlDialects;
 import org.deegree.sqldialect.SQLDialect;
 import org.deegree.workspace.ResourceBuilder;
@@ -60,6 +68,7 @@ Occam Labs UG (haftungsbeschränkt)
  * {@link ResourceBuilder} for the {@link DataSourceConnectionProvider}.
  * 
  * @author <a href="mailto:schneider@occamlabs.de">Markus Schneider</a>
+ * @author <a href="mailto:reichhelm@grit.de">Stephan Reichhelm</a>
  * 
  * @since 3.4
  */
@@ -85,7 +94,21 @@ public ConnectionProvider build() {
         final DataSource ds = initializeDataSourceInstance();
         final Method destroyMethod = getDestroyMethod( ds, config.getDataSource().getDestroyMethod() );
         final Connection conn = checkConnectivity( ds );
-        final SQLDialect dialect = SqlDialects.lookupSqlDialect( conn, workspace.getModuleClassLoader() );
+        final SQLDialect dialect;
+        if ( config.getDialectProvider() != null ) {
+            String dialectProviderCls = config.getDialectProvider().getJavaClass();
+            try {
+                Class<?> clazz = workspace.getModuleClassLoader().loadClass( dialectProviderCls );
+                SqlDialectProvider prov = clazz.asSubclass( SqlDialectProvider.class ).newInstance();
+                dialect = prov.createDialect( conn );
+            } catch ( Exception ex ) {
+                final String msg = "Configured SQL dialect provider '" + dialectProviderCls + "' failed to initialize: "
+                                   + ex.getLocalizedMessage();
+                throw new ResourceException( msg, ex );
+            }
+        } else {
+            dialect = SqlDialects.lookupSqlDialect( conn, workspace.getModuleClassLoader() );
+        }
         close( conn );
         return new DataSourceConnectionProvider( metadata, ds, dialect, destroyMethod );
     }

diff --git a/...asource/src/main/java/org/deegree/db/datasource/DataSourceConnectionProviderProvider.java b/...asource/src/main/java/org/deegree/db/datasource/DataSourceConnectionProviderProvider.java
@@ -59,7 +59,7 @@ public class DataSourceConnectionProviderProvider extends ConnectionProviderProv
 
     static final String CONFIG_NAMESPACE = "http://www.deegree.org/connectionprovider/datasource";
 
-    static final URL SCHEMA_URL = DataSourceConnectionProviderProvider.class.getResource( "/META-INF/schemas/connectionprovider/datasource/3.4.0/datasource.xsd" );
+    static final URL SCHEMA_URL = DataSourceConnectionProviderProvider.class.getResource( "/META-INF/schemas/connectionprovider/datasource/datasource.xsd" );
 
     @Override
     public String getNamespace() {

diff --git a/...nprovider/datasource/3.4.0/datasource.xsd → ...nectionprovider/datasource/datasource.xsd b/...nprovider/datasource/3.4.0/datasource.xsd → ...nectionprovider/datasource/datasource.xsd
@@ -18,8 +18,8 @@
             <sequence>
               <element name="Argument" minOccurs="0" maxOccurs="unbounded">
                 <complexType>
-                  <attribute name="javaClass" use="required" />                
-                  <attribute name="value" use="required" />                  
+                  <attribute name="javaClass" use="required" />
+                  <attribute name="value" use="required" />
                 </complexType>
               </element>
             </sequence>
@@ -31,11 +31,16 @@
         <element name="Property" minOccurs="0" maxOccurs="unbounded">
           <complexType>
             <attribute name="name" use="required" />
-            <attribute name="value" use="required" />            
+            <attribute name="value" use="required" />
+          </complexType>
+        </element>
+        <element name="DialectProvider" minOccurs="0" maxOccurs="1">
+          <complexType>
+            <attribute name="javaClass" use="required" />
           </complexType>
         </element>
       </sequence>
-      <attribute name="configVersion" use="required" fixed="3.4.0" />
+      <attribute name="configVersion" type="string" use="optional"/>
     </complexType>
   </element>
 </schema>
diff --git a/...r/datasource/3.4.0/example_dbcp_mssql.xml → ...rovider/datasource/example_dbcp_mssql.xml b/...r/datasource/3.4.0/example_dbcp_mssql.xml → ...rovider/datasource/example_dbcp_mssql.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider configVersion="3.4.0"
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/jdbc/datasource/3.4.0/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="org.apache.commons.dbcp.BasicDataSource" />

diff --git a/.../datasource/3.4.0/example_dbcp_oracle.xml → ...ovider/datasource/example_dbcp_oracle.xml b/.../datasource/3.4.0/example_dbcp_oracle.xml → ...ovider/datasource/example_dbcp_oracle.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider configVersion="3.4.0"
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/jdbc/datasource/3.4.0/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="org.apache.commons.dbcp.BasicDataSource" />

diff --git a/...atasource/3.4.0/example_dbcp_postgres.xml → ...ider/datasource/example_dbcp_postgres.xml b/...atasource/3.4.0/example_dbcp_postgres.xml → ...ider/datasource/example_dbcp_postgres.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider configVersion="3.4.0"
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/jdbc/datasource/3.4.0/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="org.apache.commons.dbcp.BasicDataSource" />

diff --git a/...rovider/datasource/3.4.0/example_jndi.xml → ...ctionprovider/datasource/example_jndi.xml b/...rovider/datasource/3.4.0/example_jndi.xml → ...ctionprovider/datasource/example_jndi.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider configVersion="3.4.0"
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/jdbc/datasource/3.4.0/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="org.deegree.db.datasource.JndiLookup" factoryMethod="lookup">

diff --git a/...provider/datasource/3.4.0/example_ucp.xml → ...ectionprovider/datasource/example_ucp.xml b/...provider/datasource/3.4.0/example_ucp.xml → ...ectionprovider/datasource/example_ucp.xml
@@ -1,6 +1,6 @@
 <DataSourceConnectionProvider configVersion="3.4.0"
   xmlns="http://www.deegree.org/connectionprovider/datasource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/jdbc/datasource/3.4.0/datasource.xsd">
+  xsi:schemaLocation="http://www.deegree.org/connectionprovider/datasource http://schemas.deegree.org/3.5/jdbc/datasource/datasource.xsd">
 
   <!-- Creation / lookup of javax.sql.DataSource instance -->
   <DataSource javaClass="oracle.ucp.jdbc.PoolDataSourceFactory" factoryMethod="getPoolDataSource" />

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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>

diff --git a/...ava/org/deegree/rendering/r3d/multiresolution/persistence/BatchedMTFileStoreProvider.java b/...ava/org/deegree/rendering/r3d/multiresolution/persistence/BatchedMTFileStoreProvider.java
@@ -53,7 +53,7 @@ public class BatchedMTFileStoreProvider extends BatchedMTStoreProvider {
 
     private static final String CONFIG_NS = "http://www.deegree.org/datasource/3d/batchedmt/file";
 
-    private static final URL CONFIG_SCHEMA = BatchedMTFileStoreProvider.class.getResource( "/META-INF/schemas/datasource/3d/batchedmt/3.4.0/file.xsd" );
+    private static final URL CONFIG_SCHEMA = BatchedMTFileStoreProvider.class.getResource( "/META-INF/schemas/datasource/3d/batchedmt/file.xsd" );
 
     public String getNamespace() {
         return CONFIG_NS;

diff --git a/...datasource/3d/batchedmt/3.4.0/example.xml → ...hemas/datasource/3d/batchedmt/example.xml b/...datasource/3d/batchedmt/3.4.0/example.xml → ...hemas/datasource/3d/batchedmt/example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <BatchedMTFileStore configVersion="3.4.0" xmlns="http://www.deegree.org/datasource/3d/batchedmt/file"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/batchedmt/file http://schemas.deegree.org/datasource/3d/batchedmt/3.4.0/file.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/batchedmt/file http://schemas.deegree.org/3.5/datasource/3d/batchedmt/file.xsd">
   <Directory>../../../data/batchedmt</Directory>
   <MaxDirectMemory>500048576</MaxDirectMemory>
 </BatchedMTFileStore>
diff --git a/...as/datasource/3d/batchedmt/3.4.0/file.xsd → .../schemas/datasource/3d/batchedmt/file.xsd b/...as/datasource/3d/batchedmt/3.4.0/file.xsd → .../schemas/datasource/3d/batchedmt/file.xsd
@@ -24,14 +24,7 @@
         <element name="Directory" type="string" />
         <element name="MaxDirectMemory" type="positiveInteger" />
       </sequence>
-      <attribute name="configVersion" use="required">
-        <simpleType>
-          <restriction base="string">
-            <enumeration value="3.4.0" />
-            <enumeration value="3.0.0" />
-          </restriction>
-        </simpleType>
-      </attribute>
+      <attribute name="configVersion" type="string" use="optional"/>
       <attribute name="crs" use="optional" default="epsg:25832"/>      
     </complexType>
   </element>

diff --git a/...s/datasource/3d/renderable/3.4.0/file.xsd → ...schemas/datasource/3d/renderable/file.xsd b/...s/datasource/3d/renderable/3.4.0/file.xsd → ...schemas/datasource/3d/renderable/file.xsd
@@ -25,14 +25,7 @@
         <element name="PrototypeFile" type="string" minOccurs="0" />
         <element name="TextureDirectory" type="string" minOccurs="0" maxOccurs="unbounded" />
       </sequence>
-      <attribute name="configVersion" use="required">
-        <simpleType>
-          <restriction base="string">
-            <enumeration value="3.4.0" />
-            <enumeration value="3.0.0" />
-          </restriction>
-        </simpleType>
-      </attribute>
+      <attribute name="configVersion" type="string" use="optional"/>
       <attribute name="isBillboard" type="boolean" use="optional" default="false" />
     </complexType>
   </element>

diff --git a/...urce/3d/renderable/3.4.0/file_example.xml → ...datasource/3d/renderable/file_example.xml b/...urce/3d/renderable/3.4.0/file_example.xml → ...datasource/3d/renderable/file_example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RenderableFileStore configVersion="3.4.0" xmlns="http://www.deegree.org/datasource/3d/renderable/file"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/file http://schemas.deegree.org/datasource/3d/renderable/3.4.0/file.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/file http://schemas.deegree.org/3.5/datasource/3d/renderable/file.xsd">
   <EntityFile>../../../data/renderable/buildings/objects</EntityFile>
   <PrototypeFile>../../../data/renderable/buildings/prototypes</PrototypeFile>
 </RenderableFileStore>
diff --git a/...as/datasource/3d/renderable/3.4.0/sql.xsd → .../schemas/datasource/3d/renderable/sql.xsd b/...as/datasource/3d/renderable/3.4.0/sql.xsd → .../schemas/datasource/3d/renderable/sql.xsd
@@ -26,14 +26,7 @@
         <element name="PrototypeTable" type="string" minOccurs="0" />
         <element name="TextureDirectory" type="string" minOccurs="0" maxOccurs="unbounded" />
       </sequence>
-      <attribute name="configVersion" use="required">
-        <simpleType>
-          <restriction base="string">
-            <enumeration value="3.4.0" />
-            <enumeration value="3.0.0" />
-          </restriction>
-        </simpleType>
-      </attribute>
+      <attribute name="configVersion" type="string" use="optional"/>
       <attribute name="isBillboard" type="boolean" use="optional" default="false" />
     </complexType>
   </element>

diff --git a/...ource/3d/renderable/3.4.0/sql_example.xml → .../datasource/3d/renderable/sql_example.xml b/...ource/3d/renderable/3.4.0/sql_example.xml → .../datasource/3d/renderable/sql_example.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RenderableSQLStore configVersion="3.4.0" xmlns="http://www.deegree.org/datasource/3d/renderable/sql"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/sql http://schemas.deegree.org/datasource/3d/renderable/3.4.0/sql.xsd">
+  xsi:schemaLocation="http://www.deegree.org/datasource/3d/renderable/sql http://schemas.deegree.org/3.5/datasource/3d/renderable/sql.xsd">
   <JDBCConnId>conn1</JDBCConnId>
   <EntityTable>table</EntityTable>
 </RenderableSQLStore>
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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>

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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

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.4.32-SNAPSHOT</version>
+    <version>3.5.0-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -25,6 +25,14 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.deegree</groupId>
       <artifactId>deegree-core-workspace</artifactId>
@@ -94,10 +102,6 @@
       <groupId>org.deegree</groupId>
       <artifactId>deegree-ogcschemas</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>