aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web/src/main/java/at
diff options
context:
space:
mode:
Diffstat (limited to 'pdf-as-web/src/main/java/at')
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java74
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java8
2 files changed, 77 insertions, 5 deletions
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
index 3a64c422..6306852e 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
@@ -33,9 +33,15 @@ import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class WebConfiguration {
+import at.gv.egiz.pdfas.lib.api.IConfigurationConstants;
+import at.gv.egiz.pdfas.web.helper.PdfAsHelper;
+
+public class WebConfiguration implements IConfigurationConstants {
public static final String PUBLIC_URL = "public.url";
+ public static final String LOCAL_BKU_ENABLED = "bku.sign.enabled";
+ public static final String ONLINE_BKU_ENABLED = "moc.sign.enabled";
+ public static final String MOBILE_BKU_ENABLED = "mobile.sign.enabled";
public static final String LOCAL_BKU_URL = "bku.local.url";
public static final String ONLINE_BKU_URL = "bku.online.url";
public static final String MOBILE_BKU_URL = "bku.mobile.url";
@@ -151,15 +157,45 @@ public class WebConfiguration {
}
public static String getLocalBKUURL() {
- return properties.getProperty(LOCAL_BKU_URL);
+ if(!getLocalBKUEnabled()) {
+ String overwrite = properties.getProperty(CONFIG_BKU_URL);
+ if(overwrite == null) {
+ overwrite = properties.getProperty(LOCAL_BKU_URL);
+ if(overwrite == null) {
+ overwrite = PdfAsHelper.getPdfAsConfig().getValue(CONFIG_BKU_URL);
+ }
+ }
+ return overwrite;
+ }
+ return null;
}
public static String getOnlineBKUURL() {
- return properties.getProperty(ONLINE_BKU_URL);
+ if(!getOnlineBKUEnabled()) {
+ String overwrite = properties.getProperty(MOC_SIGN_URL);
+ if(overwrite == null) {
+ overwrite = properties.getProperty(ONLINE_BKU_URL);
+ if(overwrite == null) {
+ overwrite = PdfAsHelper.getPdfAsConfig().getValue(MOC_SIGN_URL);
+ }
+ }
+ return overwrite;
+ }
+ return null;
}
public static String getHandyBKUURL() {
- return properties.getProperty(MOBILE_BKU_URL);
+ if(!getMobileBKUEnabled()) {
+ String overwrite = properties.getProperty(MOBILE_SIGN_URL);
+ if(overwrite == null) {
+ overwrite = properties.getProperty(MOBILE_BKU_URL);
+ if(overwrite == null) {
+ overwrite = PdfAsHelper.getPdfAsConfig().getValue(MOBILE_SIGN_URL);
+ }
+ }
+ return overwrite;
+ }
+ return null;
}
public static String getPdfASDir() {
@@ -206,6 +242,36 @@ public class WebConfiguration {
return false;
}
+ public static boolean getLocalBKUEnabled() {
+ String value = properties.getProperty(LOCAL_BKU_ENABLED);
+ if (value != null) {
+ if (value.equals("true")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean getOnlineBKUEnabled() {
+ String value = properties.getProperty(ONLINE_BKU_ENABLED);
+ if (value != null) {
+ if (value.equals("true")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean getMobileBKUEnabled() {
+ String value = properties.getProperty(MOBILE_BKU_ENABLED);
+ if (value != null) {
+ if (value.equals("true")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static boolean getSoapSignEnabled() {
String value = properties.getProperty(SOAP_SIGN_ENABLED);
if (value != null) {
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
index 6b63255f..83dd2610 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
@@ -118,7 +118,8 @@ public class PdfAsHelper {
private static PdfAs pdfAs;
private static ObjectFactory of = new ObjectFactory();
-
+ private static Configuration pdfAsConfig;
+
static {
reloadConfig();
}
@@ -131,9 +132,14 @@ public class PdfAsHelper {
logger.info("Creating PDF-AS");
pdfAs = PdfAsFactory.createPdfAs(new File(WebConfiguration
.getPdfASDir()));
+ pdfAsConfig = pdfAs.getConfiguration();
logger.info("Creating PDF-AS done");
}
+ public static Configuration getPdfAsConfig() {
+ return pdfAsConfig;
+ }
+
private static void validatePdfSize(HttpServletRequest request,
HttpServletResponse response, byte[] pdfData)
throws PdfAsWebException {