Move Atmosphere to Argeo TP extras

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 73c60d04c022e821013434c1f2bb9409f5d660ad..633115c548a999c38e1ddcd204c0499c644caf2c 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -88,9 +88,6 @@
                                <ref bean="eclipse/org.argeo.tp.equinox" />
                                <ref bean="eclipse/org.argeo.tp.gemini" />
 
-                               <!-- Web -->
-                               <ref bean="org.atmosphere.runtime" />
-
                                <!-- Jackrabbit -->
                                <ref bean="apache/org.apache.tika" />
                                <ref bean="apache/org.apache.lucene" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 204eb3c1fac134709bab597cb183ec7266fe73bc..b895d566f9f504490562123633bdb939098f3f83 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -382,7 +382,17 @@
        </bean>
 
        <bean id="org.atmosphere.runtime"
-               p:sourceCoords="org.atmosphere:atmosphere-runtime:2.5.2"
+               p:sourceCoords="org.atmosphere:atmosphere-runtime:2.4.32"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
+       <bean id="org.atmosphere.socketio"
+               p:sourceCoords="org.atmosphere:atmosphere-socketio:2.4.21"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant