Author: solomax
Date: Sun Dec 16 12:16:58 2012
New Revision: 1422565
URL: http://svn.apache.org/viewvc?rev=1422565&view=rev
Log:
Wicket: dependencies are updated to work as expected; liveSessions map is
removed
Modified:
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1422565&r1=1422564&r2=1422565&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Sun Dec 16 12:16:58 2012
@@ -215,25 +215,25 @@
<dependency org="org.simpleframework" name="simple-xml"
rev="2.6.9" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.4.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.5-SNAPSHOT" conf="openmeetings->*"
transitive="false">
@@ -327,16 +327,16 @@
<!-- END OF MySQL Driver -->
<!-- Tomcat 7 -->
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.32" transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.34" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.32" transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.34" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.32"
transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.34"
transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.32"
transitive="false" >
+ <dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.34"
transitive="false" >
<include type="jar" />
</dependency>
<dependency org="tomcatplugin" name="tomcatplugin" rev="1.4"
conf="tomcat7->*" transitive="false">
Modified: incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1422565&r1=1422564&r2=1422565&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivysettings.xml Sun Dec 16
12:16:58 2012
@@ -22,7 +22,6 @@
<ibiblio name="springsource-release"
m2compatible="true"
root="http://repository.springsource.com/maven/bundles/release"/>
<ibiblio name="tmatesoft-release" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/releases"/>
<ibiblio name="tmatesoft-snapshots" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/snapshots"/>
- <ibiblio name="apache-snapshots" m2compatible="true"
root="https://repository.apache.org/snapshots/"/>
<ibiblio name="apache-public" m2compatible="true"
root="https://repository.apache.org/content/groups/public"; />
<url name="mavencentral">
<artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1422565&r1=1422564&r2=1422565&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
Sun Dec 16 12:16:58 2012
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.web.app;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.auth.SignInPage;
@@ -36,13 +34,11 @@ import org.apache.wicket.protocol.http.W
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.session.ISessionStore.UnboundListener;
import org.apache.wicket.settings.IPageSettings;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
public class Application extends AuthenticatedWebApplication {
- private ConcurrentHashMap<String, WebSession> liveSessions = new
ConcurrentHashMap<String, WebSession>(100); //TODO need to investigate
@Override
protected void init() {
@@ -82,18 +78,6 @@ public class Application extends Authent
}
}
});
-
- getSessionStore().registerUnboundListener(new UnboundListener()
{
- public void sessionUnbound(String sessionId) {
- liveSessions.remove(sessionId);
- }
- });
- }
-
- void addLiveSession(WebSession session) {
- if (!liveSessions.containsKey(session.getId())) {
- liveSessions.put(session.getId(), session);
- }
}
@Override
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1422565&r1=1422564&r2=1422565&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
Sun Dec 16 12:16:58 2012
@@ -43,7 +43,6 @@ public class WebSession extends Abstract
private String area = null;
private TimeZone tz;
private SimpleDateFormat ISO8601FORMAT = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
- private Integer websocketPageId = null;
public WebSession(Request request) {
super(request);
@@ -93,7 +92,6 @@ public class WebSession extends Abstract
if (null == getId()) {
bind();
}
- Application.get().addLiveSession(this);
return true;
}
return false;
@@ -144,12 +142,4 @@ public class WebSession extends Abstract
public void setArea(String area) {
this.area = area;
}
-
- public Integer getWebsocketPageId() {
- return websocketPageId;
- }
-
- public void setWebsocketPageId(Integer websocketPageId) {
- this.websocketPageId = websocketPageId;
- }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1422565&r1=1422564&r2=1422565&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
Sun Dec 16 12:16:58 2012
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.web.pages;
+import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.ConfirmableAjaxLink;
import org.apache.openmeetings.web.components.MenuPanel;
import org.apache.openmeetings.web.components.user.ChatPanel;
@@ -30,10 +30,13 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
@AuthorizeInstantiation("USER")
public class MainPage extends BasePage {
private static final long serialVersionUID = 6421960759218157999L;
+ private static final Logger log =
Red5LoggerFactory.getLogger(MainPage.class,
OpenmeetingsVariables.webAppRootKey);
private final MenuPanel menu;
public MainPage() {
@@ -58,13 +61,13 @@ public class MainPage extends BasePage {
@Override
protected void onConnect(ConnectedMessage message) {
super.onConnect(message);
-
WebSession.get().setWebsocketPageId(message.getPageId());
+ log.debug("WebSocketBehavior::onConnect");
}
@Override
protected void onClose(ClosedMessage message) {
super.onClose(message);
- WebSession.get().setWebsocketPageId(null);
+ log.debug("WebSocketBehavior::onClose");
}
});
}
