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 2012/12/12 06:21:42 UTC
svn commit: r1420529 - in
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
remote/red5/ScopeApplicationAdapter.java web/app/Application.java
Author: solomax
Date: Wed Dec 12 05:21:40 2012
New Revision: 1420529
URL: http://svn.apache.org/viewvc?rev=1420529&view=rev
Log:
Log message on OM ready is improved
Wicket is modified to not load beans until OM is ready
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1420529&r1=1420528&r2=1420529&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Wed Dec 12 05:21:40 2012
@@ -139,6 +139,12 @@ public class ScopeApplicationAdapter ext
}
ScopeApplicationAdapter.initComplete = true;
+ log.debug("\n" +
+ "\t################################################\n" +
+ "\t# Openmeetings is up #\n" +
+ "\t# and ready to use #\n" +
+ "\t################################################\n"
+ );
} catch (Exception err) {
log.error("[appStart]", err);
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=1420529&r1=1420528&r2=1420529&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 Wed Dec 12 05:21:40 2012
@@ -20,6 +20,7 @@ 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;
import org.apache.wicket.Page;
@@ -115,7 +116,10 @@ public class Application extends Authent
}
public static <T> T getBean(Class<T> clazz) {
- ApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(get().getServletContext());
- return context.getBean(clazz);
+ if (ScopeApplicationAdapter.initComplete) {
+ ApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(get().getServletContext());
+ return context.getBean(clazz);
+ }
+ return null;
}
}