no more java 7...

B3Partners · Nov 4, 2019 · cebae46 · cebae46
1 parent 374a23b
commit cebae46
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/brmo-service/nb-configuration.xml b/brmo-service/nb-configuration.xml
@@ -22,7 +22,6 @@ Any value defined here will override the pom.xml file value but is only applicab
         <org-netbeans-modules-css-prep.sass_2e_mappings>/scss:/css</org-netbeans-modules-css-prep.sass_2e_mappings>
         <org-netbeans-modules-css-prep.sass_2e_enabled>false</org-netbeans-modules-css-prep.sass_2e_enabled>
         <org-netbeans-modules-css-prep.less_2e_compiler_2e_options/>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
         <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>
diff --git a/brmo-service/src/main/java/nl/b3p/brmo/service/stripes/ControleActionBean.java b/brmo-service/src/main/java/nl/b3p/brmo/service/stripes/ControleActionBean.java
@@ -116,7 +116,7 @@ public void stream(HttpServletResponse response) throws Exception {
                 response.delete();
             }
         } catch (IOException | BrmoException ex) {
-            LOG.error("Error reading afgiftelijst: " + ex.getLocalizedMessage(), ex);
+            LOG.error("Fout tijdens lezen afgiftelijst: " + ex.getLocalizedMessage(), ex);
             context.getValidationErrors().addGlobalError(new SimpleError("Kan afgiftelijst niet verwerken: " + ex.getLocalizedMessage()));
         }finally{
             if (brmo != null) {

diff --git a/brmo-service/src/main/webapp/META-INF/context.xml b/brmo-service/src/main/webapp/META-INF/context.xml
@@ -102,7 +102,7 @@
     </Server>
     -->
   <ResourceLink global="mail/session" name="mail/session" type="javax.mail.Session"/>
-    <Realm allRolesMode="authOnly" className="org.apache.catalina.realm.DataSourceRealm" dataSourceName="jdbc/brmo/staging" digest="SHA-1" roleNameCol="groep_" userCredCol="wachtwoord" userNameCol="gebruikersnaam" userRoleTable="gebruiker_groepen" userTable="gebruiker_">
-        <CredentialHandler algorithm="SHA-1" className="org.apache.catalina.realm.MessageDigestCredentialHandler"/>
-    </Realm>
+  <Realm allRolesMode="authOnly" className="org.apache.catalina.realm.DataSourceRealm" dataSourceName="jdbc/brmo/staging" digest="SHA-1" roleNameCol="groep_" userCredCol="wachtwoord" userNameCol="gebruikersnaam" userRoleTable="gebruiker_groepen" userTable="gebruiker_">
+    <CredentialHandler algorithm="SHA-1" className="org.apache.catalina.realm.MessageDigestCredentialHandler"/>
+  </Realm>
 </Context>
diff --git a/datamodel/generated_scripts/datamodel.xml b/datamodel/generated_scripts/datamodel.xml
@@ -5258,6 +5258,7 @@
       <script>119_reisdocumentsoort.sql</script>
       <script>120_increase_identifsize.sql</script>
       <script>121_insert_nation.sql</script>
+      <script>122_idx_gebr_doel.sql</script>
       <script>206_bag_views.sql</script>
       <script>207_brk_views.sql</script>
    </extra-scripts>