Skip to content
Browse files

* Got the Atmosphere PubSub stuff to work

  • Loading branch information...
1 parent 03932d7 commit d9a51f9a4ecb22239eb8c476052535cbd55243f1 @mlaccetti mlaccetti committed Mar 15, 2012
Showing with 45 additions and 55 deletions.
  1. +17 −18 vlove-server/pom.xml
  2. +3 −3 vlove-server/src/main/resources/rebel.xml
  3. +25 −34 vlove-server/src/main/webapp/WEB-INF/web.xml
View
35 vlove-server/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -68,24 +67,24 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- atmosphere -->
<dependency>
- <groupId>org.atmosphere</groupId>
- <artifactId>atmosphere-jersey</artifactId>
- <version>0.8.6</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>1.12</version>
- </dependency>
-
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-jersey</artifactId>
+ <version>0.8.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+
<!-- aspectj -->
<dependency>
<groupId>org.aspectj</groupId>
View
6 vlove-server/src/main/resources/rebel.xml
@@ -2,15 +2,15 @@
<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
<classpath>
- <dir name="C:/Users/Michael/workspace/limone/vlove/vlove-server/target/classes">
+ <dir name="C:/Users/Michael/workspace/vlove/vlove-server/target/classes">
</dir>
- <dir name="C:/Users/Michael/workspace/limone/vlove/vlove-server/target/test-classes">
+ <dir name="C:/Users/Michael/workspace/vlove/vlove-server/target/test-classes">
</dir>
</classpath>
<web>
<link target="/">
- <dir name="C:/Users/Michael/workspace/limone/vlove/vlove-server/src/main/webapp">
+ <dir name="C:/Users/Michael/workspace/vlove/vlove-server/src/main/webapp">
</dir>
</link>
</web>
View
59 vlove-server/src/main/webapp/WEB-INF/web.xml
@@ -8,55 +8,51 @@
<param-value>classpath:/spring-config.xml</param-value>
</context-param>
- <servlet>
- <description>MeteorServlet</description>
- <servlet-name>MeteorServlet</servlet-name>
- <servlet-class>org.atmosphere.cpr.MeteorServlet</servlet-class>
- <init-param>
- <param-name>org.atmosphere.filter</param-name>
- <param-value>org.apache.wicket.protocol.http.WicketFilter</param-value>
- </init-param>
- <init-param>
- <param-name>org.atmosphere.filter.name</param-name>
- <param-value>wicket-filter</param-value>
- </init-param>
+ <filter>
+ <filter-name>wicket</filter-name>
+ <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+ <async-supported>true</async-supported>
<init-param>
<param-name>applicationClassName</param-name>
<param-value>vlove.web.WicketApplication</param-value>
</init-param>
<init-param>
- <param-name>org.atmosphere.useWebSocket</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>org.atmosphere.useNative</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>filterMappingUrlPattern</param-name>
- <param-value>/*</param-value>
+ <param-name>configuration</param-name>
+ <param-value>deployment</param-value>
</init-param>
- <load-on-startup>0</load-on-startup>
- <async-supported>true</async-supported>
- </servlet>
+ </filter>
+ <filter>
+ <filter-name>em</filter-name>
+ <filter-class>vlove.spring.jpa.OptionalOpenEntityManagerInViewFilter</filter-class>
+ <async-supported>false</async-supported>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>wicket</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>em</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<servlet>
<description>AtmosphereServlet</description>
<servlet-name>AtmosphereServlet</servlet-name>
<servlet-class>org.atmosphere.cpr.AtmosphereServlet</servlet-class>
- <init-param>
+ <!-- <init-param>
<param-name>org.atmosphere.useWebSocket</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>org.atmosphere.useNative</param-name>
<param-value>true</param-value>
- </init-param>
+ </init-param> -->
<init-param>
<param-name>org.atmosphere.cpr.broadcasterClass</param-name>
<param-value>vlove.service.PubSubBroadcaster</param-value>
</init-param>
- <init-param>
+ <!-- <init-param>
<param-name>org.atmosphere.cpr.sessionSupport</param-name>
<param-value>true</param-value>
</init-param>
@@ -67,17 +63,12 @@
<init-param>
<param-name>org.atmosphere.cpr.broadcasterCacheClass</param-name>
<param-value>org.atmosphere.cache.HeaderBroadcasterCache</param-value>
- </init-param>
+ </init-param> -->
<load-on-startup>1</load-on-startup>
<async-supported>true</async-supported>
</servlet>
<servlet-mapping>
- <servlet-name>MeteorServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>AtmosphereServlet</servlet-name>
<url-pattern>/ps/*</url-pattern>
</servlet-mapping>

0 comments on commit d9a51f9

Please sign in to comment.
Something went wrong with that request. Please try again.