1 files changed, 33 insertions, 2 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
index e8443d7..82aad9a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
@@ -18,6 +18,7 @@
 package at.knowcenter.wag.egov.egiz.web;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.Properties;
@@ -25,6 +26,9 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import at.knowcenter.wag.egov.egiz.exceptions.ConnectorFactoryException;
 import at.knowcenter.wag.egov.egiz.exceptions.NormalizeException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
@@ -38,6 +42,7 @@ import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
 import at.knowcenter.wag.egov.egiz.sig.signatureobject.SignatureObjectHelper;
 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;
+import at.knowcenter.wag.egov.egiz.web.servlets.SignServlet;
 
 /**
  * Contains commonly used helper functions for the local request procedure.
@@ -60,6 +65,8 @@ public abstract class LocalRequestHelper
    * The resource of the redirect refresh page jsp.
    */
   public static final String REDIRECT_REFRESH_PAGE_JSP = "/jsp/redirect_refresh_page.jsp";
+  
+  private static Log log = LogFactory.getLog(LocalRequestHelper.class);
 
   /**
    * Sets up the local sign procedure.
@@ -77,7 +84,7 @@ public abstract class LocalRequestHelper
     String host = request.getServerName(); // "129.27.153.77"
     URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");
     String loc_ref_url = response.encodeURL(loc_ref_URL.toString());
-
+    
     LocalConnector c = ConnectorChooser.chooseLocalConnectorForSign(si.connector, si.type, loc_ref_url);
     String sign_request = c.prepareSignRequest(si.iui.signature_data);
 
@@ -94,6 +101,11 @@ public abstract class LocalRequestHelper
 
     request.setAttribute("local_request_url", local_request_url);
     request.setAttribute("data_url", data_url);
+    
+    URL local_server = new URL(request.getScheme(), host, request.getServerPort(),null);
+    String loc_server = response.encodeURL(local_server.toString());
+    
+    request.setAttribute("loc_server", loc_server);
 
     return NULL_REQUEST_PAGE_JSP;
     
@@ -203,9 +215,13 @@ public abstract class LocalRequestHelper
 
     URL data_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/DataURL");
     String data_url = response.encodeURL(data_URL.toString());
-
+    
+    //URL local_server_url = new URL(request.getScheme(), host, request.getServerPort(), "/");
+    //String loc_server_url = response.encodeURL(local_server_url.toString());
+    
     request.setAttribute("local_request_url", local_request_url);
     request.setAttribute("data_url", data_url);
+    //request.setAttribute("loc_server_url", loc_server_url);
 
     return NULL_REQUEST_PAGE_JSP;
 
@@ -326,4 +342,19 @@ public abstract class LocalRequestHelper
     output = output.replaceAll(">", "&gt;");
     return output;
   }
+  
+  public static String getLocalServerAddress(HttpServletRequest request, HttpServletResponse response)
+  {
+	String host = request.getServerName();
+	URL local_server = null;
+	try {
+		local_server = new URL(request.getScheme(), host, request.getServerPort(), "/");
+	} catch (MalformedURLException e) {
+		// TODO Auto-generated catch block
+		e.printStackTrace();
+	}
+	String loc_server = response.encodeURL(local_server.toString());
+	    
+	return loc_server;  
+  }
 }