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/09/12 06:02:12 UTC
svn commit: r1522289 - in /openmeetings/trunk/singlewebapp: ./ .settings/
src/main/java/org/apache/openmeetings/data/calendar/daos/
src/main/java/org/apache/openmeetings/data/calendar/management/
src/main/java/org/apache/openmeetings/data/conference/ s...
Author: solomax
Date: Thu Sep 12 04:02:11 2013
New Revision: 1522289
URL: http://svn.apache.org/r1522289
Log:
[OPENMEETINGS-777] sendInvitationLink seems to work as expected
Added:
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
- copied unchanged from r1522099, openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml
Removed:
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/AbstractTemplatePanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.xml
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWiketTester.java
Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Thu Sep 12 04:02:11 2013
@@ -21,7 +21,6 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry excluding="classes/|conf/|services/|classes/" kind="src" path="src/main/webapp/WEB-INF"/>
<classpathentry kind="src" path="src/main/webapp/WEB-INF/classes"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
Modified: openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component (original)
+++ openmeetings/trunk/singlewebapp/.settings/org.eclipse.wst.common.component Thu Sep 12 04:02:11 2013
@@ -28,7 +28,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/WebContent/openmeetings/WEB-INF/classes"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp/WEB-INF"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp/WEB-INF/classes"/>
<property name="java-output-path"/>
<property name="context-root" value="/"/>
Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Thu Sep 12 04:02:11 2013
@@ -750,7 +750,6 @@
<fileset dir="${red5.root}" includes="*.jar" />
<fileset dir="${red5.root}/lib" includes="*.jar" />
<fileset dir="${red5.root}/plugins" includes="*.jar" />
- <pathelement path="${om.dist.webapp}/WEB-INF" />
<pathelement path="${dist.classes.dir}" />
<pathelement path="${main.out.dir}" />
</path>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Thu Sep 12 04:02:11 2013
@@ -159,18 +159,16 @@ public class AppointmentDao {
// update meeting members
List<MeetingMember> mmList = a.getMeetingMembers();
if (mmList != null){
+ Appointment a0 = a.getId() == null ? null : get(a.getId());
for (MeetingMember mm : mmList) {
if (mm.getId() != null && !mmIds.contains(mm.getId())) {
invitationManager.processInvitation(a, mm, MessageType.Create, baseUrl);
} else {
- Appointment a0 = get(a.getId());
-
- boolean sendMail = !a0.getTitle().equals(a.getTitle()) ||
+ boolean sendMail = a0 == null || !a0.getTitle().equals(a.getTitle()) ||
!a0.getDescription().equals(a.getDescription()) ||
!a0.getLocation().equals(a.getLocation()) ||
!a0.getStart().equals(a.getStart()) ||
!a0.getEnd().equals(a.getEnd());
-
mmIds.remove(mm.getId());
invitationManager.processInvitation(a, mm, MessageType.Update, baseUrl, sendMail);
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Thu Sep 12 04:02:11 2013
@@ -33,6 +33,7 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.InvitationManager;
+import org.apache.openmeetings.data.conference.InvitationManager.MessageType;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.InvitationDao;
import org.apache.openmeetings.data.conference.dao.RoomDao;
@@ -43,7 +44,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.apache.openmeetings.web.app.WebSession;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -211,12 +211,9 @@ public class AppointmentLogic {
String subject = generateSubject(labelid1158, a, tZone);
String smsSubject = generateSMSSubject(labelid1158, a);
- String message = generateMessage(labelid1158, a,
- language_id, labelid1153, labelid1154, tZone);
+ String message = generateMessage(labelid1158, a, language_id, labelid1153, labelid1154, tZone);
- invitationManager.sendInvitationReminderLink(language_id, message,
- inv.getBaseUrl(), mm.getUser().getAdresses().getEmail(), subject,
- inv.getHash());
+ invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false);
invitationManager.sendInvitationReminderSMS(mm.getUser().getAdresses().getPhone(), smsSubject, language_id);
inv.setUpdated(new Date());
@@ -290,12 +287,14 @@ public class AppointmentLogic {
a.setIsYearly(isYearly);
a.setCategory(appointmentCategoryDao.get(categoryId));
a.setRemind(appointmentReminderTypDao.get(remind));
- WebSession.get().setBaseUrl(baseUrl); //TODO verify !!!!!
- a.setRoom(new Room());
- a.getRoom().setComment(appointmentDescription);
- a.getRoom().setName(appointmentName);
- a.getRoom().setRooms_id(roomId);
- a.getRoom().setRoomtype(roomManager.getRoomTypesById(roomType));
+ if (roomId > 0) {
+ a.setRoom(roomDao.get(roomId));
+ } else {
+ a.setRoom(new Room());
+ a.getRoom().setComment(appointmentDescription);
+ a.getRoom().setName(appointmentName);
+ a.getRoom().setRoomtype(roomManager.getRoomTypesById(roomType));
+ }
a.setOwner(userDao.get(users_id));
a.setPasswordProtected(isPasswordProtected);
a.setPassword(password);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java Thu Sep 12 04:02:11 2013
@@ -440,7 +440,7 @@ public class InvitationManager {
User owner = i.getInvitedBy();
String invitorName = owner.getFirstname() + " " + owner.getLastname();
- String template = InvitationTemplate.getEmail(invitorName, message, invitation_link);
+ String template = InvitationTemplate.getEmail(i.getInvitee().getLanguage_id(), invitorName, message, invitation_link);
String email = i.getInvitee().getAdresses().getEmail();
String replyToEmail = owner.getAdresses().getEmail();
@@ -469,6 +469,7 @@ public class InvitationManager {
// Writing back meetingUid
if (a.getIcalId() == null || a.getIcalId().length() < 1) {
a.setIcalId(meetingId);
+ // TODO should it be saved ???
}
log.debug(handler.getICalDataAsString());
@@ -479,40 +480,6 @@ public class InvitationManager {
}
/**
- * @author o.becherer
- * @param userName
- * @param message
- * @param baseUrl
- * @param email
- * @param subject
- * @param invitationHash
- * @return
- */
- // ----------------------------------------------------------------------------------------------------
- public String sendInvitationReminderLink(long langId, String message, String baseUrl,
- String email, String subject, String invitationHash) {
- log.debug("sendInvitationReminderLink");
-
- try {
- String invitation_link = baseUrl + "?invitationHash="
- + invitationHash;
-
- mailHandler.send(new MailMessage(
- email
- , null
- , subject
- , message + "<br/><a href='" + invitation_link + "'>"
- + fieldManager.getFieldByIdAndLanguage(626L, langId).getValue() + "</a>"), true);
-
- return "success";
- } catch (Exception e) {
- log.error("sendInvitationReminderLink", e);
- }
-
- return null;
- }
-
- /**
* This method sends invitation reminder SMS
* @param phone user's phone
* @param subject
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java Thu Sep 12 04:02:11 2013
@@ -62,7 +62,6 @@ public class InvitationService implement
private RoomDao roomDao;
public void resultReceived(IPendingServiceCall arg0) {
- // TODO Auto-generated method stub
log.debug("InvitationService resultReceived" + arg0);
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Sep 12 04:02:11 2013
@@ -24,6 +24,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import javax.servlet.ServletContext;
+
import org.apache.openmeetings.data.basic.FieldLanguagesValuesDao;
import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
@@ -59,6 +61,9 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
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.springframework.web.context.support.XmlWebApplicationContext;
import ro.fortsoft.wicket.dashboard.WidgetRegistry;
import ro.fortsoft.wicket.dashboard.web.DashboardContext;
@@ -222,4 +227,25 @@ public class Application extends Authent
throw new RestartResponseException(NotInitedPage.class);
}
}
+
+ public static WicketTester getWicketTester() {
+ return getWicketTester(-1);
+ }
+
+ public static WicketTester getWicketTester(long langId) {
+ Application app = new Application();
+
+ 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);
+ if (langId > 0) {
+ WebSession.get().setLanguage(langId);
+ }
+ ScopeApplicationAdapter.initComplete = true;
+ return tester;
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java Thu Sep 12 04:02:11 2013
@@ -158,6 +158,10 @@ public class WebSession extends Abstract
return s == null ? "[Missing]" : s;
}
+ void setLanguage(long languageId) {
+ this.languageId = languageId;
+ }
+
public static long getLanguage() {
WebSession session = get();
if (session.languageId < 0) {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/AbstractTemplatePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/AbstractTemplatePanel.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/AbstractTemplatePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/AbstractTemplatePanel.java Thu Sep 12 04:02:11 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.web.mail.template;
+import static org.apache.openmeetings.web.app.Application.getWicketTester;
+
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -32,7 +34,6 @@ import org.apache.wicket.util.tester.Wic
public abstract class AbstractTemplatePanel extends Panel {
private static final long serialVersionUID = 1L;
- private static WicketTester wicketTest = null;
public AbstractTemplatePanel(String id) {
super(id);
@@ -74,14 +75,17 @@ public abstract class AbstractTemplatePa
}
}
- static void ensureApplication() {
+ static WicketTester ensureApplication() {
+ return ensureApplication(-1);
+ }
+
+ static WicketTester ensureApplication(long langId) {
+ WicketTester tester = null;
try {
Application.get();
} catch (Exception e) {
- if (wicketTest == null) {
- //FIXME not working since there is no ServletContext
- wicketTest = new WicketTester(new Application());
- }
+ tester = getWicketTester(langId);
}
+ return tester;
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java Thu Sep 12 04:02:11 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.mail
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.util.tester.WicketTester;
public class InvitationTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
@@ -33,7 +34,18 @@ public class InvitationTemplate extends
}
public static String getEmail(String user, String message, String link) {
- ensureApplication();
- return renderPanel(new InvitationTemplate(TemplatePage.COMP_ID, user, message, link)).toString();
+ return getEmail(-1, user, message, link);
+ }
+
+ public static String getEmail(long langId, String user, String message, String link) {
+ WicketTester tester = null;
+ try {
+ tester = ensureApplication(langId);
+ return renderPanel(new InvitationTemplate(TemplatePage.COMP_ID, user, message, link)).toString();
+ } finally {
+ if (tester != null) {
+ tester.destroy();
+ }
+ }
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.xml?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.xml Thu Sep 12 04:02:11 2013
@@ -37,5 +37,5 @@
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
- <import resource="openmeetings-applicationContext.xml" />
+ <import resource="classes/openmeetings-applicationContext.xml" />
</beans>
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Thu Sep 12 04:02:11 2013
@@ -46,7 +46,7 @@ import org.springframework.test.context.
@RunWith(SpringJUnit4ClassRunner.class)
@TestExecutionListeners({})
-@ContextConfiguration(locations={"classpath:/openmeetings-applicationContext.xml"}, inheritLocations = true)
+@ContextConfiguration(locations={"classpath:openmeetings-applicationContext.xml"}, inheritLocations = true)
public abstract class AbstractOpenmeetingsSpringTest extends AbstractJUnit4SpringContextTests {
private static final Logger log = Red5LoggerFactory.getLogger(AbstractOpenmeetingsSpringTest.class);
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWiketTester.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWiketTester.java?rev=1522289&r1=1522288&r2=1522289&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWiketTester.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractWiketTester.java Thu Sep 12 04:02:11 2013
@@ -18,18 +18,13 @@
*/
package org.apache.openmeetings.test;
+import static org.apache.openmeetings.web.app.Application.getWicketTester;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import javax.servlet.ServletContext;
-
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.After;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
public class AbstractWiketTester extends AbstractOpenmeetingsSpringTest {
@@ -38,17 +33,8 @@ public class AbstractWiketTester extends
@Override
public void setUp() throws Exception {
super.setUp();
- Application app = new Application();
-
- 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);
+ tester = getWicketTester();
assertNotNull("Web session should not be null", WebSession.get());
- ScopeApplicationAdapter.initComplete = true;
}
public void login(String login, String password) {