Merge branch 'SL20_development'

# Conflicts:
#	build.gradle
#	pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
#	pdf-as-lib/src/configuration/cfg/advancedconfig.properties
#	pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
#	pdf-as-lib/src/main/resources/config/config.zip
#	pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
#	pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java

1 files changed, 10 insertions, 1 deletions

diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
index 0cee185a..13d874e8 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
@@ -119,7 +119,9 @@ public class JSONAPIServlet extends HttpServlet {
                 connectorEnum = PDFASSignParameters.Connector.MOBILEBKU;
             } else if(PDFASSignParameters.Connector.ONLINEBKU.equalsName(connector)) {
                 connectorEnum = PDFASSignParameters.Connector.ONLINEBKU;
-            }
+            } else if(PDFASSignParameters.Connector.SECLAYER20.equalsName(connector)) {
+                connectorEnum = PDFASSignParameters.Connector.SECLAYER20;
+            } 
 
             if(connectorEnum == null) {
                 throw new ServletException(
@@ -212,6 +214,13 @@ public class JSONAPIServlet extends HttpServlet {
                                     "Invalid connector mobilebku is not supported");
                         }
                     }
+                    
+                    if (PDFASSignParameters.Connector.SECLAYER20.equals(connectorEnum)) {
+                        if (WebConfiguration.getSecurityLayer20URL() == null) {
+                            throw new PdfAsWebException(
+                                    "Invalid connector mobilebku is not supported");
+                        }
+                    }
 
 
                     PdfAsHelper.startSignatureJson(request, response, getServletContext(),