Fixed Bug#405 and added according test case

Fixed Bug#402
Added Feature#403

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@320 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

4 files changed, 59 insertions, 33 deletions

diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java
index bcb96c2f..09b0ebab 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java
@@ -29,6 +29,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;

 

 import at.gv.egiz.bku.conf.Configurator;

+import at.gv.egiz.bku.local.webapp.SpringBKUServlet;

 import at.gv.egiz.bku.slexceptions.SLRuntimeException;

 

 public class SpringConfigurator extends Configurator implements

@@ -72,6 +73,7 @@ public class SpringConfigurator extends Configurator implements
       defaultInit();

     }

     super.configure();

+    SpringBKUServlet.setConfigurator(this);

   }

 

   public void defaultInit() {

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 62705d1e..b39b4d02 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
@@ -33,16 +33,15 @@ import org.apache.commons.logging.LogFactory;
 import at.gv.egiz.bku.binding.BindingProcessorManager;
 import at.gv.egiz.bku.binding.HTTPBindingProcessor;
 import at.gv.egiz.bku.binding.HttpUtil;
+import at.gv.egiz.bku.conf.Configurator;
 import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
 
-public abstract class BKURequestHandler extends HttpServlet {
+public class BKURequestHandler extends SpringBKUServlet {
 
 	public final static String ENCODING = "UTF-8";
 
 	protected Log log = LogFactory.getLog(BKURequestHandler.class);
 
-	protected abstract BindingProcessorManager getBindingProcessorManager();
-
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, java.io.IOException {
 		log.debug("Got new request");
@@ -77,6 +76,22 @@ public abstract class BKURequestHandler extends HttpServlet {
 			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()))) {
+		  resp.setHeader(Configurator.SIGNATURE_LAYOUT, version);
+		} else {
+		  log.debug("Do not set siglayout header");
+		}
+			
+	  if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) {
+      resp.setHeader(HttpUtil.HTTP_HEADER_SERVER, configurator
+          .getProperty(Configurator.USERAGENT_CONFIG_P));
+    } else {
+      resp.setHeader(HttpUtil.HTTP_HEADER_SERVER,
+              Configurator.USERAGENT_DEFAULT);
+    }
+		
 		resp.setContentType(bindingProcessor.getResultContentType());
 		resp.setCharacterEncoding(ENCODING);
 		bindingProcessor.writeResultTo(resp.getOutputStream(), ENCODING);
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java
index c573e52f..3bd50ba7 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/SpringBKUServlet.java
@@ -1,30 +1,39 @@
 /*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package at.gv.egiz.bku.local.webapp;

-

-import at.gv.egiz.bku.binding.BindingProcessorManager;

-

-public class SpringBKUServlet extends BKURequestHandler {

-

-  public final static String BEAN_NAME="bindingProcessorManager";

-  

-  @Override

-  protected BindingProcessorManager getBindingProcessorManager() {

-    return (BindingProcessorManager) getServletContext().getAttribute(BEAN_NAME);

-  }

-

-}

+ * Copyright 2008 Federal Chancellery Austria and
+ * Graz University of Technology
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package at.gv.egiz.bku.local.webapp;
+
+import javax.servlet.http.HttpServlet;
+
+import at.gv.egiz.bku.binding.BindingProcessorManager;
+import at.gv.egiz.bku.conf.Configurator;
+
+public abstract class SpringBKUServlet extends HttpServlet {
+
+  public final static String BEAN_NAME = "bindingProcessorManager";
+
+  protected static Configurator configurator;
+
+  protected BindingProcessorManager getBindingProcessorManager() {
+    return (BindingProcessorManager) getServletContext()
+        .getAttribute(BEAN_NAME);
+  }
+
+  public static void setConfigurator(Configurator conf) {
+    configurator = conf;
+  }
+
+}
diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml
index 36087d17..3b2e7e10 100644
--- a/BKULocal/src/main/webapp/WEB-INF/web.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/web.xml
@@ -34,7 +34,7 @@
   <!--  Begin BKU Config -->

   <servlet>

     <servlet-name>BKUServlet</servlet-name>

-    <servlet-class>at.gv.egiz.bku.local.webapp.SpringBKUServlet</servlet-class>

+    <servlet-class>at.gv.egiz.bku.local.webapp.BKURequestHandler</servlet-class>

   </servlet>

   <servlet>

       <servlet-name>help</servlet-name>