aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web/src/main/webapp
diff options
context:
space:
mode:
authoremusic <emina.music@egiz.gv.at>2018-11-22 13:14:28 +0100
committeremusic <emina.music@egiz.gv.at>2018-11-22 13:14:28 +0100
commitf76f559c8c1437a152a4f51b441e4cebe25430f1 (patch)
tree8930f89863cdc7e564f6a97ac777c133384a8730 /pdf-as-web/src/main/webapp
parentcd6ff625d48a63e024b05ed1a253be3551e41599 (diff)
parentc87c82009fb07e285d6c9acfd4686efc2cbf21c9 (diff)
downloadpdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.gz
pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.bz2
pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.zip
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
Diffstat (limited to 'pdf-as-web/src/main/webapp')
-rw-r--r--pdf-as-web/src/main/webapp/WEB-INF/web.xml10
-rw-r--r--pdf-as-web/src/main/webapp/index.jsp11
2 files changed, 21 insertions, 0 deletions
diff --git a/pdf-as-web/src/main/webapp/WEB-INF/web.xml b/pdf-as-web/src/main/webapp/WEB-INF/web.xml
index a7bb5f74..9b69c983 100644
--- a/pdf-as-web/src/main/webapp/WEB-INF/web.xml
+++ b/pdf-as-web/src/main/webapp/WEB-INF/web.xml
@@ -85,6 +85,12 @@
<description></description>
<servlet-class>at.gv.egiz.pdfas.web.servlets.DataURLServlet</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>SLDataURLServlet</servlet-name>
+ <display-name>SLDataURLServlet</display-name>
+ <description></description>
+ <servlet-class>at.gv.egiz.pdfas.web.servlets.SLDataURLServlet</servlet-class>
+ </servlet>
<servlet>
<servlet-name>VisBlockServlet</servlet-name>
<display-name>VisBlockServlet</display-name>
@@ -185,6 +191,10 @@
<url-pattern>/DataURL</url-pattern>
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>SLDataURLServlet</servlet-name>
+ <url-pattern>/DataURLSL20</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
<servlet-name>VerifyServlet</servlet-name>
<url-pattern>/Verify</url-pattern>
</servlet-mapping>
diff --git a/pdf-as-web/src/main/webapp/index.jsp b/pdf-as-web/src/main/webapp/index.jsp
index de41028b..c07b2cc0 100644
--- a/pdf-as-web/src/main/webapp/index.jsp
+++ b/pdf-as-web/src/main/webapp/index.jsp
@@ -37,6 +37,17 @@
<%
}
%>
+
+ <%
+ if (WebConfiguration.getSecurityLayer20URL() != null) {
+ %>
+ <button type="submit" value="sl20" name="connector" id="sl20backend">SL2.0 Interface</button>
+ <label for="placeholder_web_id">Placeholder ID</label>
+ <input type="text" id="placeholder_web_id" name="placeholder_web_id">
+ <%
+ }
+ %>
+
<%
if (WebConfiguration.getKeystoreDefaultEnabled()) {
%>