Strabon

changeset 516:6e9ac9b3a9e9

silly commit to catch it up from home
author Babis Nikolaou <charnik@di.uoa.gr>
date Fri Jul 27 20:10:23 2012 +0300 (2012-07-27)
parents 16fcc4747487
children 7ac79e2d67c9
files endpoint/WebContent/WEB-INF/beans.xml endpoint/WebContent/WEB-INF/web.xml endpoint/WebContent/describe.jsp endpoint/WebContent/store.jsp endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/Common.java
line diff
     1.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Fri Jul 27 13:04:03 2012 +0300
     1.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Fri Jul 27 20:10:23 2012 +0300
     1.3 @@ -362,4 +362,6 @@
     1.4              </list>
     1.5           </constructor-arg>
     1.6      </bean>
     1.7 +    
     1.8 +    <bean id="commonBean" class="eu.earthobservatory.org.StrabonEndpoint.Common" scope="singleton"/>
     1.9  </beans>
     2.1 --- a/endpoint/WebContent/WEB-INF/web.xml	Fri Jul 27 13:04:03 2012 +0300
     2.2 +++ b/endpoint/WebContent/WEB-INF/web.xml	Fri Jul 27 20:10:23 2012 +0300
     2.3 @@ -89,6 +89,11 @@
     2.4  		<welcome-file>query.jsp</welcome-file>
     2.5  	</welcome-file-list>
     2.6  	
     2.7 +	<!-- Listener for instantiating the Common bean that is used in .jsp files -->
     2.8 +	<listener>
     2.9 +		<listener-class>eu.earthobservatory.org.StrabonEndpoint.ConfigureCommon</listener-class>
    2.10 +  	</listener>
    2.11 +  
    2.12  <!-- 	<servlet> -->
    2.13  <!-- 		<display-name>QueryServlet</display-name> -->
    2.14  <!-- 		<servlet-name>QueryServlet</servlet-name> -->
     3.1 --- a/endpoint/WebContent/describe.jsp	Fri Jul 27 13:04:03 2012 +0300
     3.2 +++ b/endpoint/WebContent/describe.jsp	Fri Jul 27 20:10:23 2012 +0300
     3.3 @@ -1,6 +1,5 @@
     3.4  <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
     3.5  <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
     3.6 -<jsp:useBean id="commonBean" class="eu.earthobservatory.org.StrabonEndpoint.Common" scope="application"/>
     3.7  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
     3.8  <html>
     3.9  	<head>
     4.1 --- a/endpoint/WebContent/store.jsp	Fri Jul 27 13:04:03 2012 +0300
     4.2 +++ b/endpoint/WebContent/store.jsp	Fri Jul 27 20:10:23 2012 +0300
     4.3 @@ -1,6 +1,5 @@
     4.4  <jsp:directive.page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"/>
     4.5  <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
     4.6 -<jsp:useBean id="commonBean" class="eu.earthobservatory.org.StrabonEndpoint.Common" scope="application"/>
     4.7  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
     4.8  <html>
     4.9  	<head>
     5.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/Common.java	Fri Jul 27 13:04:03 2012 +0300
     5.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/Common.java	Fri Jul 27 20:10:23 2012 +0300
     5.3 @@ -10,16 +10,18 @@
     5.4  
     5.5  /**
     5.6   * Keeps common variables shared by beans and .jsp pages.
     5.7 - *  
     5.8 + *
     5.9   * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    5.10   */
    5.11 -public class Common {
    5.12 +public class Common implements Serializable {
    5.13 +	  
    5.14 +	private static final long serialVersionUID = 8592857158139659669L;
    5.15  
    5.16 -    /**
    5.17 +	/**
    5.18  	 * Parameter used in JSP files to denote the usage
    5.19  	 * of the HTML interface
    5.20  	 */
    5.21 -	public static final String VIEW 		= "view";
    5.22 +	public static final String VIEW 	= "view";
    5.23  	public static final String VIEW_TYPE 	= "HTML";
    5.24  
    5.25  	/**
    5.26 @@ -106,4 +108,10 @@
    5.27      public String getParamDataURL() {
    5.28      	return Common.PARAM_DATA_URL;
    5.29      }
    5.30 +    
    5.31 +    public String toString() {
    5.32 +    	return "Fucking Common bean and FUCKING JSTL/EL.";
    5.33 +    }
    5.34 +
    5.35 +   public Common() { }
    5.36  }