[infinispan-commits] Infinispan SVN: r1171 - in trunk/demos: ec2/src/main and 4 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Nov 13 10:34:38 EST 2009
Author: manik.surtani at jboss.com
Date: 2009-11-13 10:34:38 -0500 (Fri, 13 Nov 2009)
New Revision: 1171
Added:
trunk/demos/ec2/src/main/webapp/
Removed:
trunk/demos/ec2-demo-webui/src/main/webapp/
Modified:
trunk/demos/ec2/pom.xml
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
trunk/demos/ec2/src/main/webapp/WEB-INF/web.xml
trunk/demos/ec2/src/main/webapp/jsp/VirusSearch.jsp
Log:
Updated to include JSTL libs as well as integrated teh webapp UI as well as the main demo
Modified: trunk/demos/ec2/pom.xml
===================================================================
--- trunk/demos/ec2/pom.xml 2009-11-13 15:29:25 UTC (rev 1170)
+++ trunk/demos/ec2/pom.xml 2009-11-13 15:34:38 UTC (rev 1171)
@@ -14,6 +14,7 @@
<version>4.0.0-SNAPSHOT</version>
<name>Infinispan EC2 Demo</name>
<description>Infinispan - EC2 Demo</description>
+ <packaging>war</packaging>
<repositories>
<repository>
<id>codehaus.m2.snapshots</id>
@@ -46,5 +47,16 @@
<artifactId>commons-logging</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java 2009-11-13 15:29:25 UTC (rev 1170)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java 2009-11-13 15:34:38 UTC (rev 1171)
@@ -1,10 +1,12 @@
package org.infinispan.ec2demo.web;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.infinispan.Cache;
+import org.infinispan.ec2demo.CacheBuilder;
+import org.infinispan.ec2demo.Influenza_N_P_CR_Element;
+import org.infinispan.ec2demo.Nucleotide_Protein_Element;
+import org.infinispan.remoting.transport.Address;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
@@ -12,19 +14,17 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import org.infinispan.Cache;
-import org.infinispan.ec2demo.CacheBuilder;
-import org.infinispan.ec2demo.Influenza_N_P_CR_Element;
-import org.infinispan.ec2demo.Nucleotide_Protein_Element;
-import org.infinispan.remoting.transport.Address;
-
/**
* Servlet implementation class CacheSearchServlet
*/
public class CacheSearchServlet extends HttpServlet {
- private Logger myLogger = Logger.getLogger(CacheSearchServlet.class);
+ private Log myLogger = LogFactory.getLog(CacheSearchServlet.class);
private static final long serialVersionUID = 1L;
private Cache<String, Influenza_N_P_CR_Element> influenzaCache;
private Cache<String, Nucleotide_Protein_Element> proteinCache;
Copied: trunk/demos/ec2/src/main/webapp (from rev 1166, trunk/demos/ec2-demo-webui/src/main/webapp)
Modified: trunk/demos/ec2/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/demos/ec2-demo-webui/src/main/webapp/WEB-INF/web.xml 2009-11-13 13:35:22 UTC (rev 1166)
+++ trunk/demos/ec2/src/main/webapp/WEB-INF/web.xml 2009-11-13 15:34:38 UTC (rev 1171)
@@ -1,28 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- id="WebApp_ID" version="2.5">
- <display-name>infinispan-ec2-demo-web</display-name>
- <listener>
- <listener-class>org.infinispan.ec2demo.web.CacheServletListener</listener-class>
- </listener>
- <welcome-file-list>
- <welcome-file>jsp/VirusSearch.jsp</welcome-file>
- </welcome-file-list>
-
- <context-param>
- <param-name>jgroups_file</param-name>
- <param-value>jgroups-s3_ping-aws.xml</param-value>
- </context-param>
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="WebApp_ID" version="2.5">
+ <display-name>infinispan-ec2-demo-web</display-name>
+ <listener>
+ <listener-class>org.infinispan.ec2demo.web.CacheServletListener</listener-class>
+ </listener>
+ <welcome-file-list>
+ <welcome-file>jsp/VirusSearch.jsp</welcome-file>
+ </welcome-file-list>
- <servlet>
- <description></description>
- <display-name>CacheSearchServlet</display-name>
- <servlet-name>CacheSearchServlet</servlet-name>
- <servlet-class>org.infinispan.ec2demo.web.CacheSearchServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>CacheSearchServlet</servlet-name>
- <url-pattern>/CacheSearchServlet</url-pattern>
- </servlet-mapping>
+ <context-param>
+ <param-name>jgroups_file</param-name>
+ <param-value>jgroups-s3_ping-aws.xml</param-value>
+ </context-param>
+
+ <servlet>
+ <description></description>
+ <display-name>CacheSearchServlet</display-name>
+ <servlet-name>CacheSearchServlet</servlet-name>
+ <servlet-class>org.infinispan.ec2demo.web.CacheSearchServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>CacheSearchServlet</servlet-name>
+ <url-pattern>/CacheSearchServlet</url-pattern>
+ </servlet-mapping>
+
+ <taglib>
+ <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+ <taglib-location>/WEB-INF/c.tld</taglib-location>
+ </taglib>
</web-app>
Modified: trunk/demos/ec2/src/main/webapp/jsp/VirusSearch.jsp
===================================================================
--- trunk/demos/ec2-demo-webui/src/main/webapp/jsp/VirusSearch.jsp 2009-11-13 13:35:22 UTC (rev 1166)
+++ trunk/demos/ec2/src/main/webapp/jsp/VirusSearch.jsp 2009-11-13 15:34:38 UTC (rev 1171)
@@ -41,7 +41,7 @@
</table>
<h1>Enter Virus GBAN</h1>
-<form action="/infinispan-ec2-demo-webui/CacheSearchServlet" method="POST">
+<form action="/infinispan-ec2-demo/CacheSearchServlet" method="POST">
Genbank Accession Number <INPUT TYPE="TEXT" NAME="vGBAN"> <INPUT
type="submit" value="Go" /></form>
</body>
More information about the infinispan-commits
mailing list