Adding JABA web services usage statistics web application. Stat database is to follow

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4156 e3abac25-378b-4346-85de-24260fe3988d

diff --git a/WEB-INF/lib/commons-beanutils-1.7.0.jar b/WEB-INF/lib/commons-beanutils-1.7.0.jar
new file mode 100644 (file)
index 0000000..b1b89c9
Binary files /dev/null and b/WEB-INF/lib/commons-beanutils-1.7.0.jar differ

diff --git a/WEB-INF/lib/commons-collections-3.2.jar b/WEB-INF/lib/commons-collections-3.2.jar
new file mode 100644 (file)
index 0000000..75580be
Binary files /dev/null and b/WEB-INF/lib/commons-collections-3.2.jar differ

diff --git a/WEB-INF/lib/commons-lang-2.3.jar b/WEB-INF/lib/commons-lang-2.3.jar
new file mode 100644 (file)
index 0000000..c33b353
Binary files /dev/null and b/WEB-INF/lib/commons-lang-2.3.jar differ

diff --git a/WEB-INF/lib/commons-logging-1.1.jar b/WEB-INF/lib/commons-logging-1.1.jar
new file mode 100644 (file)
index 0000000..2ff9bbd
Binary files /dev/null and b/WEB-INF/lib/commons-logging-1.1.jar differ

diff --git a/WEB-INF/lib/displaytag-1.2.jar b/WEB-INF/lib/displaytag-1.2.jar
new file mode 100644 (file)
index 0000000..4f379bd
Binary files /dev/null and b/WEB-INF/lib/displaytag-1.2.jar differ

diff --git a/WEB-INF/lib/displaytag-export-poi-1.2.jar b/WEB-INF/lib/displaytag-export-poi-1.2.jar
new file mode 100644 (file)
index 0000000..b0ae2d1
Binary files /dev/null and b/WEB-INF/lib/displaytag-export-poi-1.2.jar differ

diff --git a/WEB-INF/lib/itext-1.4.7.jar b/WEB-INF/lib/itext-1.4.7.jar
new file mode 100644 (file)
index 0000000..7c6d633
Binary files /dev/null and b/WEB-INF/lib/itext-1.4.7.jar differ

diff --git a/WEB-INF/lib/jstl-1.1.2.jar b/WEB-INF/lib/jstl-1.1.2.jar
new file mode 100644 (file)
index 0000000..a02abec
Binary files /dev/null and b/WEB-INF/lib/jstl-1.1.2.jar differ

diff --git a/WEB-INF/lib/poi-3.2-FINAL-20081019.jar b/WEB-INF/lib/poi-3.2-FINAL-20081019.jar
new file mode 100644 (file)
index 0000000..e860545
Binary files /dev/null and b/WEB-INF/lib/poi-3.2-FINAL-20081019.jar differ

diff --git a/WEB-INF/lib/readme.txt b/WEB-INF/lib/readme.txt
index f69a102..2736669 100644 (file)
--- a/WEB-INF/lib/readme.txt
+++ b/WEB-INF/lib/readme.txt
@@ -6,4 +6,17 @@ is to satisfy compile dependencies for web services.
 Once they are compiled this library is not needed. \r
 They are required to run a web service within servlet container - tomcat  \r
 Standard JDK6 has this library in, it is relocated here to be able to use Ant tasks (WsGen, wsimport) for WS compilation\r
-and make the project less dependant on the environment
\ No newline at end of file
+and make the project less dependant on the environment\r
+\r
+display tag 1.2 dependencies\r
+\r
+commons-beanutils-1.7.0.jar\r
+commons-collections-3.2.jar\r
+commons-lang-2.3.jar\r
+commons-logging-1.1.jar\r
+displaytag-1.2.jar\r
+displaytag-export-poi-1.2.jar\r
+itext-1.4.7.jar\r
+jstl-1.1.2.jar\r
+poi-3.2-FINAL-20081019.jar\r
+standard-1.1.2.jar
\ No newline at end of file

diff --git a/WEB-INF/lib/standard-1.1.2.jar b/WEB-INF/lib/standard-1.1.2.jar
new file mode 100644 (file)
index 0000000..bc528ac
Binary files /dev/null and b/WEB-INF/lib/standard-1.1.2.jar differ

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index dadfde9..5eb6a42 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -10,6 +10,9 @@
                <listener-class>compbio.ws.server.ShutdownEngines</listener-class>\r
        </listener>\r
     <listener>\r
+        <listener-class>compbio.stat.servlet.StatisticCollector</listener-class>\r
+     </listener>\r
+    <listener>\r
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>\r
     </listener>\r
     \r
@@ -17,7 +20,19 @@
        <session-config>\r
                <session-timeout>20</session-timeout>\r
     </session-config>\r
-\r
+ \r
+    <servlet>\r
+       <description>Display pre-calculated accounting info</description>\r
+       <servlet-name>DisplayStat</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.DisplayStat</servlet-class>\r
+    </servlet>\r
+  \r
+  <servlet>\r
+       <description>Display job list</description>\r
+       <servlet-name>Joblist</servlet-name>\r
+       <servlet-class>compbio.stat.servlet.Joblist</servlet-class>\r
+    </servlet>\r
+    \r
     <servlet>\r
         <servlet-name>ClustalWS</servlet-name>\r
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
@@ -71,7 +86,17 @@
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
         <load-on-startup>1</load-on-startup>\r
     </servlet>\r
-         \r
+        \r
+    <servlet-mapping>\r
+       <servlet-name>DisplayStat</servlet-name>\r
+       <url-pattern>/DisplayStat</url-pattern>\r
+       </servlet-mapping> \r
+    \r
+    <servlet-mapping>\r
+       <servlet-name>Joblist</servlet-name>\r
+       <url-pattern>/Joblist</url-pattern>\r
+       </servlet-mapping> \r
+       \r
     <servlet-mapping>\r
        <servlet-name>ClustalWS</servlet-name>\r
        <url-pattern>/ClustalWS</url-pattern>\r
@@ -121,6 +146,8 @@
     <web-resource-collection>\r
        <web-resource-name>Administrator pages</web-resource-name>\r
                <!-- Prohibit access to any resources -->\r
+       <url-pattern>/DisplayStat</url-pattern>\r
+       <url-pattern>/Joblist</url-pattern>\r
        <url-pattern>/conf/*</url-pattern>\r
                <url-pattern>/binaries/*</url-pattern>\r
                <url-pattern>/jobsout/*</url-pattern>\r