diff options
6 files changed, 19 insertions, 15 deletions
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java index be37488b..98be4047 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/BKURequestHandler.java @@ -81,12 +81,12 @@ public class BKURequestHandler extends SpringBKUServlet { String header = it.next(); resp.setHeader(header, bindingProcessor.getResponseHeaders().get(header)); } - String sigLayout=""; String version = configurator.getProperty(Configurator.SIGNATURE_LAYOUT); if ((version != null) && (!"".equals(version.trim()))) { + log.debug("setting SignatureLayout header to " + version); resp.setHeader(Configurator.SIGNATURE_LAYOUT, version); } else { - log.debug("Do not set siglayout header"); + log.debug("do not set SignatureLayout header"); } if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) { diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java index e9d9a38a..9c2ec8bf 100644 --- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java +++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java @@ -82,9 +82,10 @@ public class ResultServlet extends SpringBKUServlet { throws ServletException, java.io.IOException { String version = configurator.getProperty(Configurator.SIGNATURE_LAYOUT); if ((version != null) && (!"".equals(version.trim()))) { + log.debug("setting SignatureLayout header to " + version); resp.setHeader(Configurator.SIGNATURE_LAYOUT, version); } else { - log.debug("Do not set siglayout header"); + log.debug("do not set SignatureLayout header"); } if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) { diff --git a/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF b/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF index ca7c7604..ae3f7b68 100644 --- a/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF +++ b/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ -Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-Built-By: wbauer
-Build-Jdk: 1.6.0_10-beta
-Implementation-Build: 1.0-SNAPSHOT-r31
\ No newline at end of file +Manifest-Version: 1.0 +Archiver-Version: Plexus Archiver +Created-By: Apache Maven +Built-By: clemens +Build-Jdk: 1.6.0_10 +Implementation-Build: 1.1.1-SNAPSHOT-r1 diff --git a/bkucommon/src/main/java/META-INF/MANIFEST.MF b/bkucommon/src/main/java/META-INF/MANIFEST.MF index 5e949512..46e7dd84 100644 --- a/bkucommon/src/main/java/META-INF/MANIFEST.MF +++ b/bkucommon/src/main/java/META-INF/MANIFEST.MF @@ -1,3 +1,6 @@ Manifest-Version: 1.0
-Class-Path:
-
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: clemens
+Build-Jdk: 1.6.0_10
+SignatureLayout: 1.0
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java index c8bddbbd..4f2d2e00 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlConnectionImpl.java @@ -227,12 +227,12 @@ public class DataUrlConnectionImpl implements DataUrlConnectionSPI { requestHttpHeaders = new HashMap<String, String>(); if (config != null) { - String sigLayout=""; String version = config.getProperty(Configurator.SIGNATURE_LAYOUT); if ((version != null) && (!"".equals(version.trim()))) { + log.debug("setting SignatureLayout header to " + version); requestHttpHeaders.put(Configurator.SIGNATURE_LAYOUT, version); } else { - log.debug("Do not set siglayout header"); + log.debug("do not set SignatureLayout header"); } String userAgent = config.getProperty(Configurator.USERAGENT_CONFIG_P, Configurator.USERAGENT_DEFAULT); requestHttpHeaders.put(HttpUtil.HTTP_HEADER_USER_AGENT, userAgent); diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java index f5110799..a3e07cda 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java @@ -213,10 +213,10 @@ public abstract class Configurator { layout = att.getValue(SIGNATURE_LAYOUT);
}
if (layout != null) {
- log.info("Setting signature layout to: " + layout);
+ log.info("setting SignatureLayout header to " + layout);
properties.put(SIGNATURE_LAYOUT, layout);
} else {
- log.warn("No signature layout version defined");
+ log.warn("no SignatureLayout version defined");
}
} catch (Exception ex) {
log.warn("Cannot read manifest", ex);
|