Print

Print


Commit in SlicDiagWeb/org-glast-web-base-application/src/webapp on MAIN
META-INF/context.xml-41.1.1.1 removed
WEB-INF/decorators.xml-191.1.1.1 removed
       /sitemesh.xml-201.1.1.1 removed
       /web.xml-1971.1.1.1 removed
WEB-INF/classes/displaytag.properties-71.1.1.1 removed
               /freehepWebapp.properties-111.1.1.1 removed
               /logging.properties-111.1.1.1 removed
css/style.css[empty]1.1.1.1 removed
decorators/basicDecorator.jsp-351.1.1.1 removed
          /justFooterDecorator.jsp-251.1.1.1 removed
          /justHeaderDecorator.jsp-341.1.1.1 removed
          /justStyleDecorator.jsp-211.1.1.1 removed
-384
12 removed files
remove files

SlicDiagWeb/org-glast-web-base-application/src/webapp/META-INF
context.xml removed after 1.1.1.1
diff -N context.xml
--- context.xml	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context path="/WebBaseApplication" autoDeploy="true">
-    <ResourceLink name="jdbc/glastgen" type="javax.sql.DataSource" global="jdbc/glastgen" /> 
-</Context>

SlicDiagWeb/org-glast-web-base-application/src/webapp/WEB-INF
decorators.xml removed after 1.1.1.1
diff -N decorators.xml
--- decorators.xml	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<decorators defaultdir="/decorators">
-
-  <decorator name="basicDecorator" page="basicDecorator.jsp">
-        <pattern>/*</pattern>      
-  </decorator>
-
-  <decorator name="justStyleDecorator" page="justStyleDecorator.jsp">
-        <pattern>/plotTree.jsp</pattern>
-  </decorator>
-
-  <decorator name="justHeaderDecorator" page="justHeaderDecorator.jsp">
-        <pattern>/plotHeader.jsp</pattern>
-  </decorator>
-
-  <decorator name="justFooterDecorator" page="justFooterDecorator.jsp">
-        <pattern>/plotMain.jsp</pattern>
-  </decorator>
-
-</decorators>
\ No newline at end of file

SlicDiagWeb/org-glast-web-base-application/src/webapp/WEB-INF
sitemesh.xml removed after 1.1.1.1
diff -N sitemesh.xml
--- sitemesh.xml	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<sitemesh>
-    <property name="decorators-file" value="/WEB-INF/decorators.xml" />
-    <excludes file="${decorators-file}" />
-
-    <page-parsers>
-        <parser content-type="text/html"
-            class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
-        <parser content-type="text/html;charset=ISO-8859-1"
-            class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
-    </page-parsers>
-
-    <decorator-mappers>
-        <mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper"/>
-        <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
-            <param name="config" value="${decorators-file}" />
-        </mapper>
-    </decorator-mappers>
-</sitemesh>
-
-

SlicDiagWeb/org-glast-web-base-application/src/webapp/WEB-INF
web.xml removed after 1.1.1.1
diff -N web.xml
--- web.xml	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-    
-    <session-config>
-        <session-timeout>30</session-timeout>
-    </session-config>
-    
-    <welcome-file-list>
-        <welcome-file>
-            index.jsp
-        </welcome-file>
-    </welcome-file-list>
-    
-    <!-- Filter to check the cookies -->
-    <filter>
-        <filter-name>CheckCookiesFilter</filter-name>
-        <filter-class>org.glast.base.web.checkcookies.filter.CheckCookiesFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>CheckCookiesFilter</filter-name>
-        <url-pattern>*.jsp</url-pattern>
-    </filter-mapping>
-    
-    
-    <!-- Login Filter -->
-    <filter>
-        <filter-name>LoginFilter</filter-name>
-        <filter-class>org.glast.base.web.login.filter.LoginFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>LoginFilter</filter-name>
-        <url-pattern>*.jsp</url-pattern>
-    </filter-mapping>    
-    
-    <!-- Preferences Filter     -->
-   <filter>
-        <filter-name>PreferencesFilter</filter-name>
-        <filter-class>org.glast.base.web.preferences.filter.PreferencesFilter</filter-class>
-        <init-param>
-            <param-name>preferencesDatabase</param-name>
-            <param-value>jdbc/glastgen</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>WebBaseApplication</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>preferences</param-name>
-            <param-value>org.glast.web.base.preferences.UserPreferences</param-value>
-        </init-param>    
-    </filter>
-    <filter-mapping>
-        <filter-name>PreferencesFilter</filter-name>
-        <url-pattern>*.jsp</url-pattern>
-    </filter-mapping>    
-
-    <!-- Adding Sitemesh Filter -->
-    <filter>
-        <filter-name>sitemesh</filter-name>
-        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-        <filter-name>sitemesh</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    <!-- Done adding Sitemesh Filter -->
-   
-
-    <!-- Load the Multipart Filter -->
-    <filter>
-        <filter-name>MultipartFilter</filter-name>
-        <filter-class>org.glast.base.web.multipart.filter.MultipartFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>MultipartFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    
-    <!-- Adding Servelet to make icons for the tree -->
-    <servlet>
-        <servlet-name>fhicon</servlet-name>
-        <servlet-class>org.freehep.webutil.tree.IconServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>fhicon</servlet-name>
-        <url-pattern>/icon.jsp</url-pattern>
-    </servlet-mapping>
-    <!-- Done adding Servelet to make icons for the tree -->
-
-    <filter>
-        <filter-name>RefreshFilter</filter-name>
-        <filter-class>org.glast.base.web.refresh.filter.RefreshFilter</filter-class>
-        <init-param>
-            <param-name>minRefreshRate</param-name>
-            <param-value>30</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>refreshRate</param-name>
-            <param-value>30</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>maxNumberOfRefresh</param-name>
-            <param-value>30</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>pagesToRefresh</param-name>
-            <param-value>index.jsp</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>defaultPage</param-name>
-            <param-value>index.jsp</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>preferencesName</param-name>
-            <param-value>refreshPreferences</param-value>
-        </init-param>    
-        <init-param>
-            <param-name>preferencesAutoSave</param-name>
-            <param-value>true</param-value>
-        </init-param>    
-    </filter>
-    <filter-mapping>
-        <filter-name>RefreshFilter</filter-name>
-        <url-pattern>*.jsp</url-pattern>
-    </filter-mapping>    
-
-    
-    <!-- Servlet for generating the FreeHEP Web Util tabs -->
-    <servlet>
-        <servlet-name>tabCornerServlet</servlet-name>
-        <servlet-class>org.freehep.webutil.tabs.servlet.TabCornerServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>tabCornerServlet</servlet-name>
-        <url-pattern>/tabCornerServlet.jsp</url-pattern>
-    </servlet-mapping>        
-    <!-- Done with tabs -->
-            
-    <!-- Adding AIDA TLD -->
-    <servlet>
-        <servlet-name>aidaplot</servlet-name>
-        <servlet-class>hep.aida.web.servlet.PlotServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>aidaplot</servlet-name>
-        <url-pattern>/aida_plot.jsp</url-pattern>
-    </servlet-mapping>
-    <!-- Done adding AIDA TLD -->
-  
-    <!-- Non Available Filter -->
-    <filter>
-        <filter-name>NotAvailableFilter</filter-name>
-        <filter-class>org.freehep.webutil.filter.NotAvailableFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>NotAvailableFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name> 
-                Protected Site 
-            </web-resource-name>
-            <!-- This is the location of the filter's form -->
-            <url-pattern> /admin/available </url-pattern>
-            <!-- If you list http methods, 
-            only those methods are protected -->
-            <http-method> DELETE </http-method>
-            <http-method> GET </http-method>
-            <http-method> POST </http-method>
-            <http-method> PUT </http-method>
-        </web-resource-collection>
-        <auth-constraint>
-            <!-- Roles that have access -->
-            <role-name>manager</role-name>
-        </auth-constraint>
-    </security-constraint>
-    <login-config>
-        <auth-method> BASIC </auth-method>
-        <realm-name>Please enter administrator password</realm-name>
-    </login-config>
-    <!-- Define security roles -->
-    <security-role>
-        <role-name>manager</role-name>
-    </security-role>
-    <!-- Done with Non Available Filter -->
-  
-    
-</web-app>

SlicDiagWeb/org-glast-web-base-application/src/webapp/WEB-INF/classes
displaytag.properties removed after 1.1.1.1
diff -N displaytag.properties
--- displaytag.properties	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-# Sample ResourceBundle properties file
-export.xml.filename=data.xml
-export.xml.include_header=true
-export.csv.filename=data.csv
-export.csv.include_header=true
-export.excel.filename=data.xls
-export.excel.include_header=true

SlicDiagWeb/org-glast-web-base-application/src/webapp/WEB-INF/classes
freehepWebapp.properties removed after 1.1.1.1
diff -N freehepWebapp.properties
--- freehepWebapp.properties	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-# Configuration of the FreeHEP tabs
-#freehep.tabs.textstyle = font-family: verdana, arial, sans-serif;font-size: 70%;color: black;
-#freehep.tabs.selectedtextstyle = font-family: verdana, arial, sans-serif;font-size: 70%;font-weight: bold;color: black;
-freehep.tabs.selectedColor = #FFCE7F
-freehep.tabs.color = #FFE6BF
-
-# Configuration of the FreeHEP NonAvailableFilter
-freehep.nonavailablefilter.redirectpage = /nonAvailable.jsp
-
-# Tree Leaf Style (non-bold)
-freehep.tree.leafstyle = font-size: 8pt; font-weight: none;

SlicDiagWeb/org-glast-web-base-application/src/webapp/WEB-INF/classes
logging.properties removed after 1.1.1.1
diff -N logging.properties
--- logging.properties	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-handlers = org.apache.juli.FileHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-org.apache.juli.FileHandler.level = FINE
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-org.apache.juli.FileHandler.prefix = WebBaseApplication.
-

SlicDiagWeb/org-glast-web-base-application/src/webapp/decorators
basicDecorator.jsp removed after 1.1.1.1
diff -N basicDecorator.jsp
--- basicDecorator.jsp	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
-<%@taglib prefix="dec" tagdir="/WEB-INF/tags/decorators" %>
-
-<html>
-    <head>
-        <title>
-            GLAST - <decorator:title default="Welcome!" />
-        </title>
-        <link href="http://glast-ground.slac.stanford.edu/Commons/css/glastCommons.jsp" rel="stylesheet" type="text/css">
-        <link type="text/css" rel="stylesheet" href="css/style.css"/>
-        <decorator:head />
-    </head>
-
-    <body >
-        <table width="100%">
-            <tr>
-                <td>
-                    <dec:headerDecorator/>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <div class="pageBody">
-                        <decorator:body />
-                    </div>
-                </td>
-            </tr>
-        </table>        
-        <dec:footerDecorator/>    
-    </body>
-</html>
-                
\ No newline at end of file

SlicDiagWeb/org-glast-web-base-application/src/webapp/decorators
justFooterDecorator.jsp removed after 1.1.1.1
diff -N justFooterDecorator.jsp
--- justFooterDecorator.jsp	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@taglib prefix="dec" tagdir="/WEB-INF/tags/decorators" %>
-
-<html>
-    <head>
-        <title>
-            GLAST - <decorator:title default="Welcome!" />
-        </title>
-        <link href="http://glast-ground.slac.stanford.edu/Commons/css/glastCommons.jsp" rel="stylesheet" type="text/css">
-        <link type="text/css" rel="stylesheet" href="css/style.css"/>
-        <decorator:head />
-    </head>
-
-    <body>
-    
-        <div class="pageBody">
-            <decorator:body />
-        </div>
-    
-        <dec:footerDecorator/>
-    </body>
-</html>
-                
\ No newline at end of file

SlicDiagWeb/org-glast-web-base-application/src/webapp/decorators
justHeaderDecorator.jsp removed after 1.1.1.1
diff -N justHeaderDecorator.jsp
--- justHeaderDecorator.jsp	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 
-<%@taglib prefix="dec" tagdir="/WEB-INF/tags/decorators" %>
-
-<html>
-    <head>
-        <title>
-            GLAST - <decorator:title default="Welcome!" />
-        </title>
-        <link href="http://glast-ground.slac.stanford.edu/Commons/css/glastCommons.jsp" rel="stylesheet" type="text/css">
-        <link type="text/css" rel="stylesheet" href="css/style.css"/>
-        <decorator:head />
-    </head>
-
-    <body>
-        <table width="100%">
-            <tr>
-                <td>
-                    <dec:headerDecorator/>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <div class="pageBody">
-                        <decorator:body />
-                    </div>
-                </td>
-            </tr>
-        </table>    
-    </body>
-</html>
-                
\ No newline at end of file

SlicDiagWeb/org-glast-web-base-application/src/webapp/decorators
justStyleDecorator.jsp removed after 1.1.1.1
diff -N justStyleDecorator.jsp
--- justStyleDecorator.jsp	21 Sep 2007 23:34:03 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-
-<html>
-    <head>
-        <title>
-            GLAST - <decorator:title default="Welcome!" />
-        </title>
-        <link href="http://glast-ground.slac.stanford.edu/Commons/css/glastCommons.jsp" rel="stylesheet" type="text/css">
-        <link type="text/css" rel="stylesheet" href="css/style.css"/>
-        <decorator:head />
-    </head>
-
-    <body>
-        <div class="pageBody">
-            <decorator:body />
-        </div>            
-    </body>
-</html>
-                
\ No newline at end of file
CVSspam 0.2.8