Author: solomax
Date: Fri Feb 21 14:37:33 2014
New Revision: 1570590
URL: http://svn.apache.org/r1570590
Log:
[OPENMEETINGS-927] XmlWebApplicationContext is destroyed after use
Modified:
openmeetings/branches/3.0.x/LICENSE
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
Modified: openmeetings/branches/3.0.x/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/LICENSE?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/LICENSE (original)
+++ openmeetings/branches/3.0.x/LICENSE Fri Feb 21 14:37:33 2014
@@ -253,7 +253,7 @@ webapps/openmeetings/WEB-INF/classes/MET
webapps/openmeetings/WEB-INF/classes/META-INF/postgres_persistence.xml
webapps/openmeetings/WEB-INF/conf/axis2.xml
webapps/openmeetings/WEB-INF/conf/axis2.xsd
-webapps/openmeetings/WEB-INF/services/oopenmeetings-3.0.0-SNAPSHOT.aar
+webapps/openmeetings/WEB-INF/services/openmeetings-3.0.0-SNAPSHOT.aar
webapps/openmeetings/WEB-INF/services/services.list
webapps/openmeetings/WEB-INF/services/version.aar
@@ -387,22 +387,20 @@ webapps/openmeetings/WEB-INF/lib/stax-ap
webapps/openmeetings/WEB-INF/lib/stax2-api-jar-3.1.1.jar
webapps/openmeetings/WEB-INF/lib/velocity-jar-1.7.jar
webapps/openmeetings/WEB-INF/lib/velocity-tools-jar-2.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-bootstrap-core-bundle-0.8.4.jar
-webapps/openmeetings/WEB-INF/lib/wicket-bootstrap-extensions-bundle-0.8.4.jar
-webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.14.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.9.jar
-webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.14.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.13.1.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.13.1.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.13.1.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.13.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-0.15.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-0.15.jar
-webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.14.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-select2-jar-2.2.2.jar
webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.13.0.jar
webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.13.0.jar
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Fri Feb 21 14:37:33 2014
@@ -229,37 +229,37 @@
<dependency org="org.simpleframework" name="simple-xml"
rev="2.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="joda-time" name="joda-time" rev="2.3"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-devutils"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.15" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="6.14.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.15" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="6.14.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
<dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.13.1" conf="openmeetings->*"
transitive="false">
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
Fri Feb 21 14:37:33 2014
@@ -66,8 +66,8 @@ public class AddUsersDialog extends Abst
return "" + object.getUser_id();
}
});
- DialogButton send = new DialogButton(WebSession.getString(175));
- private DialogButton cancel = new
DialogButton(WebSession.getString(219));
+ private final DialogButton send = new
DialogButton(WebSession.getString(175));
+ private final DialogButton cancel = new
DialogButton(WebSession.getString(219));
public AddUsersDialog(String id, String title, AdminCommonUserForm<?>
commonForm) {
super(id, title, true);
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
Fri Feb 21 14:37:33 2014
@@ -26,13 +26,11 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.model.IModel;
public abstract class AdminCommonUserForm<T> extends AdminBaseForm<T> {
-
private static final long serialVersionUID = -827309847606809118L;
@SuppressWarnings("unchecked")
public AdminCommonUserForm(String id, IModel<?> object) {
super(id, (IModel<T>) object);
- // TODO Auto-generated constructor stub
}
public abstract void updateView(AjaxRequestTarget target);
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Fri Feb 21 14:37:33 2014
@@ -19,12 +19,12 @@
package org.apache.openmeetings.web.admin.configurations;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.web.app.Application.getBean;
import static
org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -47,14 +47,9 @@ import org.apache.wicket.validation.IVal
*
*/
public class ConfigForm extends AdminBaseForm<Configuration> {
-
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
- private ConfigurationDao getConfigDao() {
- return Application.getBean(ConfigurationDao.class);
- }
-
private void refresh(AjaxRequestTarget target) {
target.add(this);
target.appendJavaScript("omConfigPanelInit();");
@@ -68,7 +63,7 @@ public class ConfigForm extends AdminBas
private static final long serialVersionUID =
-3371792361118941958L;
public void validate(IValidatable<String> validatable) {
- Configuration c =
getConfigDao().forceGet(validatable.getValue());
+ Configuration c =
getBean(ConfigurationDao.class).forceGet(validatable.getValue());
if (c != null &&
!c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id()))
{
error(WebSession.getString(1544L));
}
@@ -86,7 +81,7 @@ public class ConfigForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- this.setModelObject(getConfigDao().update(getModelObject(),
WebSession.getUserId()));
+
setModelObject(getBean(ConfigurationDao.class).update(getModelObject(),
WebSession.getUserId()));
hideNewRecord();
target.add(listContainer);
refresh(target);
@@ -100,20 +95,20 @@ public class ConfigForm extends AdminBas
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- Configuration conf = this.getModelObject();
+ Configuration conf = getModelObject();
if (conf.getConfiguration_id() != null) {
- conf = getConfigDao().get(conf.getConfiguration_id());
+ conf =
getBean(ConfigurationDao.class).get(conf.getConfiguration_id());
} else {
conf = new Configuration();
}
- this.setModelObject(conf);
+ setModelObject(conf);
refresh(target);
}
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
-
Application.getBean(ConfigurationDao.class).delete(this.getModelObject(),
WebSession.getUserId());
- this.setModelObject(new Configuration());
+ getBean(ConfigurationDao.class).delete(getModelObject(),
WebSession.getUserId());
+ setModelObject(new Configuration());
target.add(listContainer);
refresh(target);
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
Fri Feb 21 14:37:33 2014
@@ -42,7 +42,7 @@ import org.apache.wicket.markup.repeater
public class ConfigsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
private ConfigForm form;
- final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
+ private final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
Fri Feb 21 14:37:33 2014
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.web.admin.labels;
+import static org.apache.openmeetings.web.app.Application.getBean;
+
import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
import org.apache.openmeetings.db.entity.label.FieldLanguage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmCallListener;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -41,13 +42,11 @@ import org.apache.wicket.util.time.Durat
*
*/
public class LangForm extends Form<Void> {
-
private static final long serialVersionUID = 2837702941211636609L;
private DropDownChoice<FieldLanguage> languages;
public void updateLanguages(AjaxRequestTarget target) {
- FieldLanguageDao langDao = Application
- .getBean(FieldLanguageDao.class);
+ FieldLanguageDao langDao = getBean(FieldLanguageDao.class);
languages.setChoices(langDao.getLanguages());
// add(languages);
target.add(languages);
@@ -61,13 +60,11 @@ public class LangForm extends Form<Void>
* @param language
* @param langPanel
*/
- public LangForm(String id, final WebMarkupContainer listContainer,
- final LangPanel langPanel) {
+ public LangForm(String id, final WebMarkupContainer listContainer,
final LangPanel langPanel) {
super(id);
setOutputMarkupId(true);
- FieldLanguageDao langDao = Application
- .getBean(FieldLanguageDao.class);
+ FieldLanguageDao langDao = getBean(FieldLanguageDao.class);
languages = new DropDownChoice<FieldLanguage>("language"
, new PropertyModel<FieldLanguage>(langPanel,
"language")
@@ -96,7 +93,7 @@ public class LangForm extends Form<Void>
@Override
protected void onEvent(AjaxRequestTarget target) {
langPanel.language.setDeleted(true);
- FieldLanguageDao langDao =
Application.getBean(FieldLanguageDao.class);
+ FieldLanguageDao langDao =
getBean(FieldLanguageDao.class);
try {
langDao.updateLanguage(langPanel.language);
} catch (Exception e) {
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
Fri Feb 21 14:37:33 2014
@@ -46,7 +46,6 @@ import org.apache.wicket.util.time.Durat
*
*/
public class LdapForm extends AdminBaseForm<LdapConfig> {
-
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
Fri Feb 21 14:37:33 2014
@@ -36,7 +36,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
public class OAuthForm extends AdminBaseForm<OAuthServer> {
-
private static final long serialVersionUID = 1L;
private WebMarkupContainer listContainer;
private TextField<String> redirectUriText;
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Fri Feb 21 14:37:33 2014
@@ -79,6 +79,7 @@ public class RoomForm extends AdminCommo
final ListView<Client> clients;
List<RoomModerator> moderatorsInRoom = null;
List<Client> clientsInRoom = null;
+
public RoomForm(String id, WebMarkupContainer roomList, final Room
room) {
super(id, new CompoundPropertyModel<Room>(room));
this.roomList = roomList;
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
Fri Feb 21 14:37:33 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.web.app;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.red5.logging.Red5LoggerFactory.getLogger;
+import static
org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE;
import static
org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
import java.util.Map;
@@ -66,7 +69,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.settings.IPageSettings;
import org.apache.wicket.util.collections.ConcurrentHashSet;
import org.apache.wicket.util.tester.WicketTester;
-import org.springframework.web.context.WebApplicationContext;
+import org.slf4j.Logger;
import org.springframework.web.context.support.XmlWebApplicationContext;
import ro.fortsoft.wicket.dashboard.WidgetRegistry;
@@ -75,9 +78,10 @@ import ro.fortsoft.wicket.dashboard.web.
import ro.fortsoft.wicket.dashboard.web.DashboardSettings;
public class Application extends AuthenticatedWebApplication {
- private DashboardContext dashboardContext;
+ private static final Logger log = getLogger(Application.class,
webAppRootKey);
private static boolean isInstalled;
private static Map<Long, Set<String>> ONLINE_USERS = new
ConcurrentHashMap<Long, Set<String>>();
+ private DashboardContext dashboardContext;
@Override
protected void init() {
@@ -110,8 +114,7 @@ public class Application extends Authent
widgetRegistry.registerWidget(new StartWidgetDescriptor());
widgetRegistry.registerWidget(new RssWidgetDescriptor());
// add dashboard context injector
- DashboardContextInjector dashboardContextInjector = new
DashboardContextInjector(dashboardContext);
-
getComponentInstantiationListeners().add(dashboardContextInjector);
+ getComponentInstantiationListeners().add(new
DashboardContextInjector(dashboardContext));
DashboardSettings dashboardSettings = DashboardSettings.get();
dashboardSettings.setIncludeJQuery(false);
dashboardSettings.setIncludeJQueryUI(false);
@@ -244,15 +247,27 @@ public class Application extends Authent
WicketTester tester = new WicketTester(app);
ServletContext sc = app.getServletContext();
- XmlWebApplicationContext applicationContext = new
XmlWebApplicationContext();
-
applicationContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
- applicationContext.setServletContext(sc);
- applicationContext.refresh();
-
sc.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE,
applicationContext);
+ XmlWebApplicationContext xmlContext = new XmlWebApplicationContext();
+
xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
+ xmlContext.setServletContext(sc);
+ xmlContext.refresh();
+ sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, xmlContext);
if (langId > 0) {
WebSession.get().setLanguage(langId);
}
InitializationContainer.initComplete = true;
return tester;
}
+
+ public static void destroy(WicketTester tester) {
+ if (tester != null) {
+ ServletContext sc = tester.getServletContext();
+ try {
+
((XmlWebApplicationContext)sc.getAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).close();
+ } catch (Exception e) {
+ log.error("Unexpected error while destroying
XmlWebApplicationContext", e);
+ }
+ tester.destroy();
+ }
+ }
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
Fri Feb 21 14:37:33 2014
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -30,7 +29,7 @@ public class OmAuthenticationStrategy ex
/** The separator used to concatenate the username and password */
private static final String VALUE_SEPARATOR = "-sep-";
private static final String COOKIE_KEY = "LoggedIn";
- private static final Logger log =
Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(OmAuthenticationStrategy.class, webAppRootKey);
/** The cookie name to store the username/password/domain */
private final String cookieKey;
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
Fri Feb 21 14:37:33 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.mail.template;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
@@ -54,9 +55,7 @@ public class InvitationTemplate extends
tester = ensureApplication(langId);
return renderPanel(new
InvitationTemplate(TemplatePage.COMP_ID, user, message, link,
isCanceled)).toString();
} finally {
- if (tester != null) {
- tester.destroy();
- }
+ Application.destroy(tester);
}
}
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
Fri Feb 21 14:37:33 2014
@@ -36,6 +36,7 @@ import com.googlecode.wicket.jquery.ui.w
public class AboutDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1400355222295594321L;
+
public AboutDialog(String id) {
super(id, WebSession.getString(1549));
Modified: openmeetings/trunk/singlewebapp/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Fri Feb 21 14:37:33 2014
@@ -385,22 +385,20 @@ webapps/openmeetings/WEB-INF/lib/stax-ap
webapps/openmeetings/WEB-INF/lib/stax2-api-jar-3.1.1.jar
webapps/openmeetings/WEB-INF/lib/velocity-jar-1.7.jar
webapps/openmeetings/WEB-INF/lib/velocity-tools-jar-2.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-bootstrap-core-bundle-0.8.4.jar
-webapps/openmeetings/WEB-INF/lib/wicket-bootstrap-extensions-bundle-0.8.4.jar
-webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.14.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.9.jar
-webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.13.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.14.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.13.1.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.13.1.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.13.1.jar
webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.13.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-0.15.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-0.15.jar
-webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.13.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-6.14.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.14.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-select2-jar-2.2.2.jar
webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.13.0.jar
webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.13.0.jar
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Fri Feb 21 14:37:33 2014
@@ -225,37 +225,37 @@
<dependency org="org.simpleframework" name="simple-xml"
rev="2.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="joda-time" name="joda-time" rev="2.3"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-devutils"
rev="6.13.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils"
rev="6.14.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="0.15" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-core" rev="6.14.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.15" conf="openmeetings->*"
transitive="false">
+ <dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="6.14.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
<dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.13.1" conf="openmeetings->*"
transitive="false">
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
Fri Feb 21 14:37:33 2014
@@ -66,8 +66,8 @@ public class AddUsersDialog extends Abst
return "" + object.getUser_id();
}
});
- DialogButton send = new DialogButton(WebSession.getString(175));
- private DialogButton cancel = new
DialogButton(WebSession.getString(219));
+ private final DialogButton send = new
DialogButton(WebSession.getString(175));
+ private final DialogButton cancel = new
DialogButton(WebSession.getString(219));
public AddUsersDialog(String id, String title, AdminCommonUserForm<?>
commonForm) {
super(id, title, true);
@@ -89,7 +89,7 @@ public class AddUsersDialog extends Abst
formUsers.add(users.setOutputMarkupId(true));
add(formUsers.setOutputMarkupId(true));
}
-
+
@Override
protected void onOpen(AjaxRequestTarget target) {
listUsersModel.getObject().clear();
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/AdminCommonUserForm.java
Fri Feb 21 14:37:33 2014
@@ -26,13 +26,11 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.model.IModel;
public abstract class AdminCommonUserForm<T> extends AdminBaseForm<T> {
-
private static final long serialVersionUID = -827309847606809118L;
@SuppressWarnings("unchecked")
public AdminCommonUserForm(String id, IModel<?> object) {
super(id, (IModel<T>) object);
- // TODO Auto-generated constructor stub
}
public abstract void updateView(AjaxRequestTarget target);
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Fri Feb 21 14:37:33 2014
@@ -19,12 +19,12 @@
package org.apache.openmeetings.web.admin.configurations;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.web.app.Application.getBean;
import static
org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
@@ -47,14 +47,9 @@ import org.apache.wicket.validation.IVal
*
*/
public class ConfigForm extends AdminBaseForm<Configuration> {
-
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
- private ConfigurationDao getConfigDao() {
- return Application.getBean(ConfigurationDao.class);
- }
-
private void refresh(AjaxRequestTarget target) {
target.add(this);
target.appendJavaScript("omConfigPanelInit();");
@@ -68,7 +63,7 @@ public class ConfigForm extends AdminBas
private static final long serialVersionUID =
-3371792361118941958L;
public void validate(IValidatable<String> validatable) {
- Configuration c =
getConfigDao().forceGet(validatable.getValue());
+ Configuration c =
getBean(ConfigurationDao.class).forceGet(validatable.getValue());
if (c != null &&
!c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id()))
{
error(WebSession.getString(1544L));
}
@@ -86,7 +81,7 @@ public class ConfigForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- this.setModelObject(getConfigDao().update(getModelObject(),
WebSession.getUserId()));
+
setModelObject(getBean(ConfigurationDao.class).update(getModelObject(),
WebSession.getUserId()));
hideNewRecord();
target.add(listContainer);
refresh(target);
@@ -100,20 +95,20 @@ public class ConfigForm extends AdminBas
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- Configuration conf = this.getModelObject();
+ Configuration conf = getModelObject();
if (conf.getConfiguration_id() != null) {
- conf = getConfigDao().get(conf.getConfiguration_id());
+ conf =
getBean(ConfigurationDao.class).get(conf.getConfiguration_id());
} else {
conf = new Configuration();
}
- this.setModelObject(conf);
+ setModelObject(conf);
refresh(target);
}
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
-
Application.getBean(ConfigurationDao.class).delete(this.getModelObject(),
WebSession.getUserId());
- this.setModelObject(new Configuration());
+ getBean(ConfigurationDao.class).delete(getModelObject(),
WebSession.getUserId());
+ setModelObject(new Configuration());
target.add(listContainer);
refresh(target);
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
Fri Feb 21 14:37:33 2014
@@ -42,7 +42,7 @@ import org.apache.wicket.markup.repeater
public class ConfigsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
private ConfigForm form;
- final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
+ private final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
Fri Feb 21 14:37:33 2014
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.web.admin.labels;
+import static org.apache.openmeetings.web.app.Application.getBean;
+
import org.apache.openmeetings.db.dao.label.FieldLanguageDao;
import org.apache.openmeetings.db.entity.label.FieldLanguage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmCallListener;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -41,13 +42,11 @@ import org.apache.wicket.util.time.Durat
*
*/
public class LangForm extends Form<Void> {
-
private static final long serialVersionUID = 2837702941211636609L;
private DropDownChoice<FieldLanguage> languages;
public void updateLanguages(AjaxRequestTarget target) {
- FieldLanguageDao langDao = Application
- .getBean(FieldLanguageDao.class);
+ FieldLanguageDao langDao = getBean(FieldLanguageDao.class);
languages.setChoices(langDao.getLanguages());
// add(languages);
target.add(languages);
@@ -61,13 +60,11 @@ public class LangForm extends Form<Void>
* @param language
* @param langPanel
*/
- public LangForm(String id, final WebMarkupContainer listContainer,
- final LangPanel langPanel) {
+ public LangForm(String id, final WebMarkupContainer listContainer,
final LangPanel langPanel) {
super(id);
setOutputMarkupId(true);
- FieldLanguageDao langDao = Application
- .getBean(FieldLanguageDao.class);
+ FieldLanguageDao langDao = getBean(FieldLanguageDao.class);
languages = new DropDownChoice<FieldLanguage>("language"
, new PropertyModel<FieldLanguage>(langPanel,
"language")
@@ -96,7 +93,7 @@ public class LangForm extends Form<Void>
@Override
protected void onEvent(AjaxRequestTarget target) {
langPanel.language.setDeleted(true);
- FieldLanguageDao langDao =
Application.getBean(FieldLanguageDao.class);
+ FieldLanguageDao langDao =
getBean(FieldLanguageDao.class);
try {
langDao.updateLanguage(langPanel.language);
} catch (Exception e) {
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
Fri Feb 21 14:37:33 2014
@@ -46,7 +46,6 @@ import org.apache.wicket.util.time.Durat
*
*/
public class LdapForm extends AdminBaseForm<LdapConfig> {
-
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
Fri Feb 21 14:37:33 2014
@@ -36,7 +36,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
public class OAuthForm extends AdminBaseForm<OAuthServer> {
-
private static final long serialVersionUID = 1L;
private WebMarkupContainer listContainer;
private TextField<String> redirectUriText;
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Fri Feb 21 14:37:33 2014
@@ -79,6 +79,7 @@ public class RoomForm extends AdminCommo
final ListView<Client> clients;
List<RoomModerator> moderatorsInRoom = null;
List<Client> clientsInRoom = null;
+
public RoomForm(String id, WebMarkupContainer roomList, final Room
room) {
super(id, new CompoundPropertyModel<Room>(room));
this.roomList = roomList;
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
Fri Feb 21 14:37:33 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.web.app;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.red5.logging.Red5LoggerFactory.getLogger;
+import static
org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE;
import static
org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
import java.util.Map;
@@ -66,7 +69,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.settings.IPageSettings;
import org.apache.wicket.util.collections.ConcurrentHashSet;
import org.apache.wicket.util.tester.WicketTester;
-import org.springframework.web.context.WebApplicationContext;
+import org.slf4j.Logger;
import org.springframework.web.context.support.XmlWebApplicationContext;
import ro.fortsoft.wicket.dashboard.WidgetRegistry;
@@ -75,9 +78,10 @@ import ro.fortsoft.wicket.dashboard.web.
import ro.fortsoft.wicket.dashboard.web.DashboardSettings;
public class Application extends AuthenticatedWebApplication {
- private DashboardContext dashboardContext;
+ private static final Logger log = getLogger(Application.class,
webAppRootKey);
private static boolean isInstalled;
private static Map<Long, Set<String>> ONLINE_USERS = new
ConcurrentHashMap<Long, Set<String>>();
+ private DashboardContext dashboardContext;
@Override
protected void init() {
@@ -110,8 +114,7 @@ public class Application extends Authent
widgetRegistry.registerWidget(new StartWidgetDescriptor());
widgetRegistry.registerWidget(new RssWidgetDescriptor());
// add dashboard context injector
- DashboardContextInjector dashboardContextInjector = new
DashboardContextInjector(dashboardContext);
-
getComponentInstantiationListeners().add(dashboardContextInjector);
+ getComponentInstantiationListeners().add(new
DashboardContextInjector(dashboardContext));
DashboardSettings dashboardSettings = DashboardSettings.get();
dashboardSettings.setIncludeJQuery(false);
dashboardSettings.setIncludeJQueryUI(false);
@@ -244,15 +247,27 @@ public class Application extends Authent
WicketTester tester = new WicketTester(app);
ServletContext sc = app.getServletContext();
- XmlWebApplicationContext applicationContext = new
XmlWebApplicationContext();
-
applicationContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
- applicationContext.setServletContext(sc);
- applicationContext.refresh();
-
sc.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE,
applicationContext);
+ XmlWebApplicationContext xmlContext = new XmlWebApplicationContext();
+
xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
+ xmlContext.setServletContext(sc);
+ xmlContext.refresh();
+ sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, xmlContext);
if (langId > 0) {
WebSession.get().setLanguage(langId);
}
InitializationContainer.initComplete = true;
return tester;
}
+
+ public static void destroy(WicketTester tester) {
+ if (tester != null) {
+ ServletContext sc = tester.getServletContext();
+ try {
+
((XmlWebApplicationContext)sc.getAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE)).close();
+ } catch (Exception e) {
+ log.error("Unexpected error while destroying
XmlWebApplicationContext", e);
+ }
+ tester.destroy();
+ }
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
Fri Feb 21 14:37:33 2014
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -30,7 +29,7 @@ public class OmAuthenticationStrategy ex
/** The separator used to concatenate the username and password */
private static final String VALUE_SEPARATOR = "-sep-";
private static final String COOKIE_KEY = "LoggedIn";
- private static final Logger log =
Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(OmAuthenticationStrategy.class, webAppRootKey);
/** The cookie name to store the username/password/domain */
private final String cookieKey;
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java?rev=1570590&r1=1570589&r2=1570590&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
Fri Feb 21 14:37:33 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.mail.template;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
@@ -54,9 +55,7 @@ public class InvitationTemplate extends
tester = ensureApplication(langId);
return renderPanel(new
InvitationTemplate(TemplatePage.COMP_ID, user, message, link,
isCanceled)).toString();
} finally {
- if (tester != null) {
- tester.destroy();
- }
+ Application.destroy(tester);
}
}
}
