diff --git a/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF b/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF index 79d932df182..82a82f45c0f 100644 --- a/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF +++ b/bundles/io/org.openhab.io.rest.lib/META-INF/MANIFEST.MF @@ -20,9 +20,9 @@ Bundle-ClassPath: lib/jackson-core-asl-1.9.2.jar, lib/atmosphere-compat-jbossweb-2.0.1.jar, lib/atmosphere-compat-tomcat-2.0.1.jar, lib/atmosphere-compat-tomcat7-2.0.1.jar, - lib/atmosphere-annotations-2.0.7.jar, - lib/atmosphere-jersey-2.0.7.jar, - lib/atmosphere-runtime-2.0.7.jar + lib/atmosphere-annotations-2.0.9.jar, + lib/atmosphere-jersey-2.0.9.jar, + lib/atmosphere-runtime-2.0.9.jar Import-Package: com.sun.jersey.api.core, com.sun.jersey.api.json, com.sun.jersey.core.osgi, diff --git a/bundles/io/org.openhab.io.rest.lib/build.properties b/bundles/io/org.openhab.io.rest.lib/build.properties index 4aa0344fa57..c57483a2ba5 100644 --- a/bundles/io/org.openhab.io.rest.lib/build.properties +++ b/bundles/io/org.openhab.io.rest.lib/build.properties @@ -14,6 +14,6 @@ bin.includes = META-INF/,\ lib/atmosphere-compat-jbossweb-2.0.1.jar,\ lib/atmosphere-compat-tomcat-2.0.1.jar,\ lib/atmosphere-compat-tomcat7-2.0.1.jar,\ - lib/atmosphere-annotations-2.0.7.jar,\ - lib/atmosphere-jersey-2.0.7.jar,\ - lib/atmosphere-runtime-2.0.7.jar + lib/atmosphere-annotations-2.0.9.jar,\ + lib/atmosphere-jersey-2.0.9.jar,\ + lib/atmosphere-runtime-2.0.9.jar diff --git a/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-annotations-2.0.7.jar b/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-annotations-2.0.9.jar similarity index 69% rename from bundles/io/org.openhab.io.rest.lib/lib/atmosphere-annotations-2.0.7.jar rename to bundles/io/org.openhab.io.rest.lib/lib/atmosphere-annotations-2.0.9.jar index 41cdee85f0b..80157c76cee 100644 Binary files a/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-annotations-2.0.7.jar and b/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-annotations-2.0.9.jar differ diff --git a/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-jersey-2.0.7.jar b/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-jersey-2.0.9.jar similarity index 82% rename from bundles/io/org.openhab.io.rest.lib/lib/atmosphere-jersey-2.0.7.jar rename to bundles/io/org.openhab.io.rest.lib/lib/atmosphere-jersey-2.0.9.jar index 52fbdabb97a..07179911a75 100644 Binary files a/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-jersey-2.0.7.jar and b/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-jersey-2.0.9.jar differ diff --git a/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-runtime-2.0.7.jar b/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-runtime-2.0.9.jar similarity index 70% rename from bundles/io/org.openhab.io.rest.lib/lib/atmosphere-runtime-2.0.7.jar rename to bundles/io/org.openhab.io.rest.lib/lib/atmosphere-runtime-2.0.9.jar index 1be9aadd2d7..63dfc893841 100644 Binary files a/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-runtime-2.0.7.jar and b/bundles/io/org.openhab.io.rest.lib/lib/atmosphere-runtime-2.0.9.jar differ diff --git a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/RESTApplication.java b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/RESTApplication.java index 4b71d5d0af5..b81bf9ac9ae 100644 --- a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/RESTApplication.java +++ b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/RESTApplication.java @@ -198,7 +198,7 @@ private Dictionary getJerseyServletParams() { jerseyServletParams.put("org.atmosphere.cpr.AtmosphereInterceptor", "org.atmosphere.interceptor.DefaultHeadersInterceptor,org.atmosphere.interceptor.AndroidAtmosphereInterceptor,org.atmosphere.interceptor.SSEAtmosphereInterceptor,org.atmosphere.interceptor.JSONPAtmosphereInterceptor,org.atmosphere.interceptor.JavaScriptProtocol,org.atmosphere.interceptor.OnDisconnectInterceptor"); // The BroadcasterCache is set in ResourceStateChangeListener.registerItems(), because otherwise // it gets somehow overridden by other registered servlets (e.g. the CV-bundle) -// jerseyServletParams.put("org.atmosphere.cpr.broadcasterCacheClass", "org.atmosphere.cache.UUIDBroadcasterCache"); + jerseyServletParams.put("org.atmosphere.cpr.broadcasterCacheClass", "org.atmosphere.cache.UUIDBroadcasterCache"); jerseyServletParams.put("org.atmosphere.cpr.broadcasterLifeCyclePolicy", "IDLE_DESTROY"); jerseyServletParams.put("org.atmosphere.cpr.CometSupport.maxInactiveActivity", "3000000"); diff --git a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/listeners/ResourceStateChangeListener.java b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/listeners/ResourceStateChangeListener.java index 589eda8be02..bc1cbbd8bf9 100644 --- a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/listeners/ResourceStateChangeListener.java +++ b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/listeners/ResourceStateChangeListener.java @@ -67,7 +67,7 @@ public static ConcurrentMap getMap() { } public void registerItems(){ - broadcaster.getBroadcasterConfig().setBroadcasterCache(new UUIDBroadcasterCache()); + //broadcaster.getBroadcasterConfig().setBroadcasterCache(new UUIDBroadcasterCache()); broadcaster.getBroadcasterConfig().addFilter(new PerRequestBroadcastFilter() {