Revision: 16217
Author: [email protected]
Date: Thu Jan 6 07:56:31 2011
Log: Update Issue 2258
Fix one compilation error,the other ones need specific EAP jars for EJB3
VFS SPI and some meta data jars that may have been updated in the EAP
branch not sure where I can get them since they are not on the nexus maven
2 public repo.
http://code.google.com/p/mobicents/source/detail?r=16217
Modified:
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/TomcatConvergedSipInjectionContainer.java
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
=======================================
---
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/TomcatConvergedSipInjectionContainer.java
Tue Mar 17 10:08:43 2009
+++
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/TomcatConvergedSipInjectionContainer.java
Thu Jan 6 07:56:31 2011
@@ -31,7 +31,6 @@
import org.apache.catalina.Context;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.deployment.MappedReferenceMetaDataResolverDeployer;
import org.jboss.deployment.dependency.ContainerDependencyMetaData;
import org.jboss.deployment.spi.DeploymentEndpointResolver;
=======================================
---
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
Thu Jan 6 05:29:29 2011
+++
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-jboss5/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
Thu Jan 6 07:56:31 2011
@@ -4717,28 +4717,30 @@
return mobicentsCluster;
}
- public class AlwaysTrueOutdatedSessionChecker implements
- OutdatedSessionChecker {
- public boolean isSessionOutdated(
- ClusteredSession<? extends
OutgoingDistributableSessionData> session) {
- return true;
- }
-
- }
-
- public class AskSessionOutdatedSessionChecker implements
- OutdatedSessionChecker {
- public boolean isSessionOutdated(
- ClusteredSession<? extends
OutgoingDistributableSessionData> session) {
- return session.isOutdated();
- }
-
- }
-
- public interface OutdatedSessionChecker {
- boolean isSessionOutdated(
- ClusteredSession<? extends
OutgoingDistributableSessionData> session);
- }
+// For EAP Branch it has to stay commented
+
+// public class AlwaysTrueOutdatedSessionChecker implements
+// OutdatedSessionChecker {
+// public boolean isSessionOutdated(
+// ClusteredSession<? extends OutgoingDistributableSessionData>
session) {
+// return true;
+// }
+//
+// }
+//
+// public class AskSessionOutdatedSessionChecker implements
+// OutdatedSessionChecker {
+// public boolean isSessionOutdated(
+// ClusteredSession<? extends OutgoingDistributableSessionData>
session) {
+// return session.isOutdated();
+// }
+//
+// }
+//
+// public interface OutdatedSessionChecker {
+// boolean isSessionOutdated(
+// ClusteredSession<? extends OutgoingDistributableSessionData>
session);
+// }
public class AlwaysTrueOutdatedSipSessionChecker implements
OutdatedSipSessionChecker {
