You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/01/31 06:44:10 UTC
svn commit: r1440857 - in /openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/openmeetings-applicationContext.xml
src/org/apache/openmeetings/session/SessionManager.java
src/org/apache/openmeetings/web/pages/MainPage.java
Author: solomax
Date: Thu Jan 31 05:44:09 2013
New Revision: 1440857
URL: http://svn.apache.org/viewvc?rev=1440857&view=rev
Log:
Cluster: serverId remain null if not in cluster mode;
manageCryptStyle in SessionManager is moved from the anonymous class so autowiring works as expected;
code cleanup
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1440857&r1=1440856&r2=1440857&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Thu Jan 31 05:44:09 2013
@@ -75,7 +75,11 @@
<bean id="openmeetings.ServerUtil" scope="singleton"
class="org.apache.openmeetings.session.ServerUtil">
- <property name="serverId" value="null" />
+ <!--
+ Need to be uncommented and set to the real ID if in cluster mode
+
+ <property name="serverId" value="null" />
+ -->
</bean>
<!-- Cluster related config start -->
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java?rev=1440857&r1=1440856&r2=1440857&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/SessionManager.java Thu Jan 31 05:44:09 2013
@@ -59,6 +59,8 @@ public class SessionManager implements I
@Autowired
private ServerUtil serverUtil;
+ @Autowired
+ private ManageCryptStyle manageCryptStyle;
/**
* Injected via Spring, needs a getter/setter because it can be configured
@@ -77,9 +79,6 @@ public class SessionManager implements I
private ISessionManager sessionManager = new ISessionManager() {
- @Autowired
- private ManageCryptStyle manageCryptStyle;
-
public synchronized Client addClientListItem(String streamId,
String scopeName, Integer remotePort, String remoteAddress,
String swfUrl, boolean isAVClient, Server server) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1440857&r1=1440856&r2=1440857&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Thu Jan 31 05:44:09 2013
@@ -24,7 +24,6 @@ import org.apache.openmeetings.web.compo
import org.apache.openmeetings.web.components.MenuPanel;
import org.apache.openmeetings.web.components.user.AboutPanel;
import org.apache.openmeetings.web.components.user.ChatPanel;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;