From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Mon, 23 May 2011 17:17:32 +0000 (+0000)
Subject: Adding JABA web services usage statistics web application. Stat database is to follow
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e0c8e38ab60143dd7d3c805486b4511878323d18;p=jabaws.git

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
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
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
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
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
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
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
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
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
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
--- 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. 
 They are required to run a web service within servlet container - tomcat  
 Standard JDK6 has this library in, it is relocated here to be able to use Ant tasks (WsGen, wsimport) for WS compilation
-and make the project less dependant on the environment
\ No newline at end of file
+and make the project less dependant on the environment
+
+display tag 1.2 dependencies
+
+commons-beanutils-1.7.0.jar
+commons-collections-3.2.jar
+commons-lang-2.3.jar
+commons-logging-1.1.jar
+displaytag-1.2.jar
+displaytag-export-poi-1.2.jar
+itext-1.4.7.jar
+jstl-1.1.2.jar
+poi-3.2-FINAL-20081019.jar
+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
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
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -10,6 +10,9 @@
 		<listener-class>compbio.ws.server.ShutdownEngines</listener-class>
 	</listener>
     <listener>
+        <listener-class>compbio.stat.servlet.StatisticCollector</listener-class>
+     </listener>
+    <listener>
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
     </listener>
     
@@ -17,7 +20,19 @@
 	<session-config>
    		<session-timeout>20</session-timeout>
     </session-config>
-
+ 
+    <servlet>
+    	<description>Display pre-calculated accounting info</description>
+    	<servlet-name>DisplayStat</servlet-name>
+    	<servlet-class>compbio.stat.servlet.DisplayStat</servlet-class>
+    </servlet>
+  
+  <servlet>
+    	<description>Display job list</description>
+    	<servlet-name>Joblist</servlet-name>
+    	<servlet-class>compbio.stat.servlet.Joblist</servlet-class>
+    </servlet>
+    
     <servlet>
         <servlet-name>ClustalWS</servlet-name>
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
@@ -71,7 +86,17 @@
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-         
+        
+    <servlet-mapping>
+    	<servlet-name>DisplayStat</servlet-name>
+    	<url-pattern>/DisplayStat</url-pattern>
+  	</servlet-mapping> 
+    
+    <servlet-mapping>
+    	<servlet-name>Joblist</servlet-name>
+    	<url-pattern>/Joblist</url-pattern>
+  	</servlet-mapping> 
+  	
     <servlet-mapping>
     	<servlet-name>ClustalWS</servlet-name>
     	<url-pattern>/ClustalWS</url-pattern>
@@ -121,6 +146,8 @@
     <web-resource-collection>
     	<web-resource-name>Administrator pages</web-resource-name>
    		<!-- Prohibit access to any resources -->
+    	<url-pattern>/DisplayStat</url-pattern>
+    	<url-pattern>/Joblist</url-pattern>
     	<url-pattern>/conf/*</url-pattern>
    		<url-pattern>/binaries/*</url-pattern>
    		<url-pattern>/jobsout/*</url-pattern>