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 2014/04/07 18:20:03 UTC
svn commit: r1585514 [4/4] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-axis/
openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/
openmeetings-core/
openmeetings-core/src/main/java/org/apache/openmeetings/batik/ openmeeting...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Mon Apr 7 16:19:59 2014
@@ -20,18 +20,29 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.addOnlineUser;
+import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.removeOnlineUser;
+import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.app.WebSession.getUserLevel;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
import static org.apache.openmeetings.web.util.OmUrlFragment.getPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.openmeetings.db.dao.basic.NavigationDao;
+import org.apache.openmeetings.db.entity.basic.Naviglobal;
+import org.apache.openmeetings.db.entity.basic.Navimain;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.ConfirmableAjaxLink;
-import org.apache.openmeetings.web.common.MenuPanel;
+import org.apache.openmeetings.web.common.menu.MainMenuItem;
+import org.apache.openmeetings.web.common.menu.MenuItem;
+import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.user.AboutDialog;
import org.apache.openmeetings.web.user.ChatPanel;
import org.apache.openmeetings.web.util.BaseUrlAjaxBehavior;
@@ -60,7 +71,7 @@ import org.wicketstuff.urlfragment.UrlFr
public class MainPage extends BaseInitedPage {
private static final long serialVersionUID = 6421960759218157999L;
private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
- private final MenuPanel menu = new MenuPanel("menu");
+ private final MenuPanel menu;
private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks");
private final MarkupContainer contents;
private final AbstractAjaxTimerBehavior areaBehavior;
@@ -69,6 +80,7 @@ public class MainPage extends BaseInited
public MainPage(PageParameters pp) {
super();
getHeader().setVisible(false);
+ menu = new MenuPanel("menu", getMainMenu());
contents = new WebMarkupContainer("contents");
add(contents.add(new WebMarkupContainer(CHILD_ID)).setOutputMarkupId(true).setMarkupId("contents"));
add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
@@ -149,6 +161,27 @@ public class MainPage extends BaseInited
add(new BaseUrlAjaxBehavior());
}
+ private List<MenuItem> getMainMenu() {
+ List<MenuItem> menu = new ArrayList<MenuItem>();
+ for (Naviglobal gl : getBean(NavigationDao.class).getMainMenu(getUserLevel(), getUserId(), getLanguage())) {
+ MenuItem g = new MenuItem(gl.getLabel().getValue()) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(MainPage page, AjaxRequestTarget terget) {}
+ };
+ List<MainMenuItem> l = new ArrayList<MainMenuItem>();
+ for (Navimain nm : gl.getMainnavi()) {
+ l.add(new MainMenuItem(nm));
+ }
+ if (!l.isEmpty()) {
+ g.setChildren(l);
+ }
+ menu.add(g);
+ }
+ return menu;
+ }
+
public void updateContents(OmUrlFragment f, AjaxRequestTarget target) {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Mon Apr 7 16:19:59 2014
@@ -26,9 +26,9 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.mail.MailHandler;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.mail.template.ResetPasswordTemplate;
@@ -125,7 +125,7 @@ public class ForgetPasswordDialog extend
if (type == Type.email && null == dao.getUserByEmail(n)) {
error(WebSession.getString(318));
}
- if (type == Type.login && null == dao.getUserByName(n)) {
+ if (type == Type.login && null == dao.getUserByLogin(n)) {
error(WebSession.getString(320));
}
}
@@ -216,7 +216,7 @@ public class ForgetPasswordDialog extend
return new Long(-9);
}
} else if (username.length() > 0) {
- User us = userDao.getUserByName(username);
+ User us = userDao.getUserByLogin(username);
if (us != null) {
sendHashByUser(us, appLink, userDao);
return new Long(-4);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Mon Apr 7 16:19:59 2014
@@ -325,7 +325,7 @@ public class SignInPage extends BaseInit
String firstname = params.get("firstname");
if (firstname == null) firstname = "";
if (lastname == null) lastname = "";
- User user = userDao.getUserByName(login);
+ User user = userDao.getUserByLogin(login);
// generate random password
byte[] rawPass = new byte[16];
Random rnd = new Random();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Mon Apr 7 16:19:59 2014
@@ -20,21 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div class="room container">
- <ul wicket:id="menuContainer">
- <li wicket:id="mainItem">
- <a class="fNiv" href="#" onclick="return false;"><span wicket:id="label"></span></a>
- <ul wicket:enclosure="childItem">
- <li wicket:id="childItem">
- <a wicket:id="link" href="#">
- <span class="menuName" wicket:id="name"></span><br />
- <span class="menuDesc" wicket:id="description"></span>
- </a>
- </li>
- </ul>
- </li>
- </ul>
- AA
- </div>
+ <div wicket:id="menu"></div>
+ This is the room prototype
</wicket:panel>
</html>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Mon Apr 7 16:19:59 2014
@@ -1,15 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.openmeetings.web.room;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.openmeetings.web.common.menu.MenuItem;
+import org.apache.openmeetings.web.common.menu.MenuPanel;
+import org.apache.openmeetings.web.common.menu.RoomMenuItem;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.Behavior;
public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 1L;
+ private final Behavior menuBehavior = new AbstractDefaultAjaxBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ // TODO Auto-generated method stub
+
+ }
+ };
public RoomPanel(String id, long roomId) {
super(id);
+ add(menuBehavior);
+ add(new MenuPanel("menu", getMenu()));
}
+ private List<MenuItem> getMenu() {
+ //TODO hide/show
+ List<MenuItem> menu = new ArrayList<MenuItem>();
+ menu.add(new RoomMenuItem(WebSession.getString(308), WebSession.getString(309), "room menu exit"));
+ MenuItem files = new RoomMenuItem(WebSession.getString(245));
+ List<RoomMenuItem> fileItems = new ArrayList<RoomMenuItem>();
+ fileItems.add(new RoomMenuItem(WebSession.getString(15)));
+ files.setChildren(fileItems);
+ menu.add(files);
+
+ MenuItem actions = new RoomMenuItem(WebSession.getString(635));
+ List<RoomMenuItem> actionItems = new ArrayList<RoomMenuItem>();
+ actionItems.add(new RoomMenuItem(WebSession.getString(213)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(239)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(784)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(785)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(786)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(24)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(37)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(42)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(1447)));
+ actionItems.add(new RoomMenuItem(WebSession.getString(1126)));
+ actions.setChildren(actionItems);
+ menu.add(actions);
+ return menu;
+ }
+
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
target.add(getMainPage().getHeader().setVisible(false), getMainPage().getMenu().setVisible(false)
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java Mon Apr 7 16:19:59 2014
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import static org.apache.openmeetings.rss.LoadAtomRssFeed.getFeedConnection;
+import static org.apache.openmeetings.core.rss.LoadAtomRssFeed.getFeedConnection;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
import static org.apache.openmeetings.web.app.Application.getBean;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Mon Apr 7 16:19:59 2014
@@ -31,7 +31,8 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
-import org.apache.openmeetings.data.conference.InvitationManager;
+import org.apache.openmeetings.core.mail.MailHandler;
+import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -41,10 +42,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
-import org.apache.openmeetings.mail.MailHandler;
-import org.apache.openmeetings.util.LinkHelper;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.ContactsHelper;
+import org.apache.openmeetings.web.util.LinkHelper;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -206,7 +206,7 @@ public class MessageDialog extends Abstr
+ WebSession.getString(1302) + "</a><br/>" : "";
String invitation_link = "";
if (p.isBookedRoom()) {
- Invitation i = getBean(InvitationManager.class).getInvitation(to, p.getRoom(),
+ Invitation i = getBean(IInvitationManager.class).getInvitation(to, p.getRoom(),
false, null, Valid.Period
, userDao.get(getUserId()), getBaseUrl(), userDao.get(getUserId()).getLanguage_id(),
modelStart.getObject(), modelEnd.getObject(), null);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Mon Apr 7 16:19:59 2014
@@ -24,12 +24,12 @@ import static org.apache.openmeetings.we
import java.util.Date;
+import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
import org.apache.openmeetings.db.dao.user.UserContactsDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
-import org.apache.openmeetings.mail.MailHandler;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.apache.openmeetings.web.app.WebSession;
Copied: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/LinkHelper.java (from r1584946, openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/util/LinkHelper.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/LinkHelper.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/LinkHelper.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/util/LinkHelper.java&r1=1584946&r2=1585514&rev=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/util/LinkHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/LinkHelper.java Mon Apr 7 16:19:59 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.util;
+package org.apache.openmeetings.web.util;
import static org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java Mon Apr 7 16:19:59 2014
@@ -40,6 +40,7 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.servers.ServersPanel;
import org.apache.openmeetings.web.admin.users.UsersPanel;
import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.SwfRoomPanel;
import org.apache.openmeetings.web.user.calendar.CalendarPanel;
import org.apache.openmeetings.web.user.dashboard.OmDashboardPanel;
@@ -264,8 +265,8 @@ public class OmUrlFragment implements Se
pp.add("wicketsid", getSid());
pp.add("wicketroomid", roomId);
pp.add("language", getLanguage());
+ basePanel = new RoomPanel(CHILD_ID, roomId);
basePanel = new SwfRoomPanel(CHILD_ID, pp);
- //basePanel = new RoomPanel(CHILD_ID, roomId);
}
} catch(NumberFormatException ne) {
//skip it, bad roomid passed
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Mon Apr 7 16:19:59 2014
@@ -21,10 +21,10 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
<property name="persistenceUnitName" value="openmeetings" />
</bean>
@@ -43,11 +43,11 @@
<context:component-scan base-package="org.apache.openmeetings" />
<!-- New Class for the Streaming Handlers -->
- <bean id="web.handler" class="org.apache.openmeetings.remote.red5.ScopeApplicationAdapter" />
+ <bean id="web.handler" class="org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter" />
<!-- Session configuration start -->
- <bean id="openmeetings.SessionManager" class="org.apache.openmeetings.session.SessionManager">
+ <bean id="openmeetings.SessionManager" class="org.apache.openmeetings.core.session.SessionManager">
<property name="cache">
<ref bean="openmeetings.HashMapStore" /> <!-- Memory based session cache by default -->
<!-- The following section should be used in clustering mode
@@ -55,47 +55,46 @@
-->
</property>
</bean>
- <bean id="openmeetings.EmoticonsManager" class="org.apache.openmeetings.data.whiteboard.EmoticonsManager" />
+ <bean id="openmeetings.EmoticonsManager" class="org.apache.openmeetings.core.data.whiteboard.EmoticonsManager" />
<!-- Singletons for memory based cache -->
- <bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.session.store.HashMapStore" />
- <bean id="whiteBoardObjectListManagerById" scope="singleton"
- class="org.apache.openmeetings.data.whiteboard.WhiteBoardObjectListManagerById" />
+ <bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.core.session.store.HashMapStore" />
+ <bean id="whiteBoardObjectListManagerById" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectListManagerById" />
<!-- WhiteBoardObjectSyncManager can stay in the memory, even on cluster! -->
- <bean id="whiteBoardObjectSyncManager" scope="singleton" class="org.apache.openmeetings.data.whiteboard.WhiteBoardObjectSyncManager" />
+ <bean id="whiteBoardObjectSyncManager" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteBoardObjectSyncManager" />
<!-- Database cache -->
- <bean id="openmeetings.DatabaseStore" class="org.apache.openmeetings.session.store.DatabaseStore" />
+ <bean id="openmeetings.DatabaseStore" class="org.apache.openmeetings.core.session.store.DatabaseStore" />
- <bean id="openmeetings.ServerUtil" scope="singleton" class="org.apache.openmeetings.session.ServerUtil">
+ <bean id="openmeetings.ServerUtil" scope="singleton" class="org.apache.openmeetings.core.session.ServerUtil">
<!-- Need to be uncommented and set to the real ID if in cluster mode <property name="serverId" value="1" /> -->
</bean>
<!-- Cluster related config start -->
<!-- Start of Services -->
- <bean id="xmlcrm.service" class="org.apache.openmeetings.remote.MainService" />
- <bean id="printservice.service" class="org.apache.openmeetings.remote.PrintService" />
- <bean id="pollservice.service" class="org.apache.openmeetings.remote.PollService" />
- <bean id="languageservice.service" class="org.apache.openmeetings.remote.LanguageService" />
- <bean id="invitationservice.service" class="org.apache.openmeetings.remote.InvitationService" />
- <bean id="whiteboardservice.service" class="org.apache.openmeetings.remote.WhiteBoardService" />
- <bean id="userservice.service" class="org.apache.openmeetings.remote.UserService" />
- <bean id="fileservice.service" class="org.apache.openmeetings.remote.ConferenceLibrary" />
- <bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.data.file.FileProcessor" />
- <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.converter.FlvExplorerConverter" />
- <bean id="errorservice.service" class="org.apache.openmeetings.remote.ErrorService" />
- <bean id="conferenceservice.service" class="org.apache.openmeetings.remote.ConferenceService" />
- <bean id="chatservice.service" class="org.apache.openmeetings.remote.ChatService" />
- <bean id="flvrecorderservice.service" class="org.apache.openmeetings.remote.FLVRecorderService" />
- <bean id="openmeetings.FlvRecorderConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask" />
- <bean id="openmeetings.FlvInterviewConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask" />
- <bean id="openmeetings.FlvInterviewReConverterTask" class="org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask" />
- <bean id="openmeetings.FlvInterviewConverter" class="org.apache.openmeetings.converter.FlvInterviewConverter" />
- <bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.converter.FlvRecorderConverter" />
- <bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.cluster.SlaveHTTPConnectionManager" />
+ <bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" />
+ <bean id="printservice.service" class="org.apache.openmeetings.core.remote.PrintService" />
+ <bean id="pollservice.service" class="org.apache.openmeetings.core.remote.PollService" />
+ <bean id="languageservice.service" class="org.apache.openmeetings.core.remote.LanguageService" />
+ <bean id="invitationservice.service" class="org.apache.openmeetings.core.remote.InvitationService" />
+ <bean id="whiteboardservice.service" class="org.apache.openmeetings.core.remote.WhiteBoardService" />
+ <bean id="userservice.service" class="org.apache.openmeetings.core.remote.UserService" />
+ <bean id="fileservice.service" class="org.apache.openmeetings.core.remote.ConferenceLibrary" />
+ <bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" />
+ <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" />
+ <bean id="errorservice.service" class="org.apache.openmeetings.core.remote.ErrorService" />
+ <bean id="conferenceservice.service" class="org.apache.openmeetings.core.remote.ConferenceService" />
+ <bean id="chatservice.service" class="org.apache.openmeetings.core.remote.ChatService" />
+ <bean id="flvrecorderservice.service" class="org.apache.openmeetings.core.remote.FLVRecorderService" />
+ <bean id="openmeetings.FlvRecorderConverterTask" class="org.apache.openmeetings.core.data.flvrecord.converter.FlvRecorderConverterTask" />
+ <bean id="openmeetings.FlvInterviewConverterTask" class="org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewConverterTask" />
+ <bean id="openmeetings.FlvInterviewReConverterTask" class="org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewReConverterTask" />
+ <bean id="openmeetings.FlvInterviewConverter" class="org.apache.openmeetings.core.converter.FlvInterviewConverter" />
+ <bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.core.converter.FlvRecorderConverter" />
+ <bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.core.cluster.SlaveHTTPConnectionManager" />
- <bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.quartz.scheduler.SessionClearJob" />
+ <bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.core.quartz.scheduler.SessionClearJob" />
<bean id="sessionClearJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="openmeetings.SessionClearJob" />
@@ -120,7 +119,7 @@
</property>
</bean>
- <bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.quartz.scheduler.MeetingReminderJob" />
+ <bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.core.quartz.scheduler.MeetingReminderJob" />
<bean id="meetingReminderClear" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="openmeetings.MeetingReminderJob" />
@@ -144,7 +143,7 @@
<value>100000</value>
</property>
</bean>
- <bean id="testSetupCleanupJob" class="org.apache.openmeetings.quartz.scheduler.TestSetupCleanupJob" />
+ <bean id="testSetupCleanupJob" class="org.apache.openmeetings.core.quartz.scheduler.TestSetupCleanupJob" />
<bean id="testSetupCleanup" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="testSetupCleanupJob" />
@@ -167,7 +166,7 @@
</bean>
<!-- Mail related jobs -->
- <bean id="mailHandler" class="org.apache.openmeetings.mail.MailHandler" />
+ <bean id="mailHandler" class="org.apache.openmeetings.core.mail.MailHandler" />
<bean id="resetSendingMailStatus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="mailHandler" />
@@ -225,7 +224,7 @@
<!-- Interface Transactional -->
<bean id="appointmentReminderTypDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao" />
<bean id="appointmentCategoryDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao" />
- <bean id="roommanagement" class="org.apache.openmeetings.data.conference.RoomManager" />
+ <bean id="roommanagement" class="org.apache.openmeetings.core.data.conference.RoomManager" />
<bean id="roomDao" class="org.apache.openmeetings.db.dao.room.RoomDao"/>
<bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao">
<!-- Should be uncommented and updated with real values for Asterisk
@@ -236,7 +235,7 @@
-->
</bean>
<bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" />
- <bean id="organisationmanagement" class="org.apache.openmeetings.data.user.OrganisationManager" />
+ <bean id="organisationmanagement" class="org.apache.openmeetings.core.data.user.OrganisationManager" />
<bean id="organisationDao" class="org.apache.openmeetings.db.dao.user.OrganisationDao" />
<bean id="organisationUserDao" class="org.apache.openmeetings.db.dao.user.OrganisationUserDao" />
<bean id="salutationmanagement" class="org.apache.openmeetings.db.dao.user.SalutationDao" />
@@ -247,25 +246,25 @@
<bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.db.dao.label.FieldLanguageDao" />
<bean id="fieldValueDaoImpl" class="org.apache.openmeetings.db.dao.label.FieldValueDao" />
<bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao" />
- <bean id="fieldmanagment" class="org.apache.openmeetings.data.basic.FieldManager" />
+ <bean id="fieldmanagment" class="org.apache.openmeetings.core.data.basic.FieldManager" />
<bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
<bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" />
- <bean id="appointmentLogic" class="org.apache.openmeetings.data.calendar.management.AppointmentLogic" />
+ <bean id="appointmentLogic" class="org.apache.openmeetings.core.data.calendar.management.AppointmentLogic" />
<bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
- <bean id="userManagement" class="org.apache.openmeetings.data.user.UserManager" />
+ <bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" />
<bean id="roomModeratorsDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorsDao" />
<bean id="roomOrganisationDao" class="org.apache.openmeetings.db.dao.room.RoomOrganisationDao"/>
<bean id="roomTypeDao" class="org.apache.openmeetings.db.dao.room.RoomTypeDao" />
<bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
<bean id="conferenceLogTypeDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogTypeDao" />
- <bean id="emailManagement" class="org.apache.openmeetings.data.user.EmailManager" />
+ <bean id="emailManagement" class="org.apache.openmeetings.web.mail.EmailManager" />
<bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" />
<bean id="flvRecordingDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingDao" />
<bean id="flvRecordingLogDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingLogDao" />
<bean id="flvRecordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao" />
<bean id="flvRecordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao" />
<bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" />
- <bean id="invitationManagement" class="org.apache.openmeetings.data.conference.InvitationManager" />
+ <bean id="invitationManagement" class="org.apache.openmeetings.service.room.InvitationManager" />
<bean id="meetingMemberDao" class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" />
<bean id="privateMessageFolderDao" class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" />
<bean id="privateMessagesDao" class="org.apache.openmeetings.db.dao.user.PrivateMessagesDao" />
@@ -282,18 +281,18 @@
<bean id="oauth2Dao" class="org.apache.openmeetings.db.dao.server.OAuth2Dao" />
<!-- No Interface -->
- <bean id="generateImage" class="org.apache.openmeetings.converter.GenerateImage" />
- <bean id="generateThumbs" class="org.apache.openmeetings.converter.GenerateThumbs" />
- <bean id="generatePDF" class="org.apache.openmeetings.documents.GeneratePDF" />
- <bean id="smsHandler" class="org.apache.openmeetings.mail.SMSHandler" />
+ <bean id="generateImage" class="org.apache.openmeetings.core.converter.GenerateImage" />
+ <bean id="generateThumbs" class="org.apache.openmeetings.core.converter.GenerateThumbs" />
+ <bean id="generatePDF" class="org.apache.openmeetings.core.documents.GeneratePDF" />
+ <bean id="smsHandler" class="org.apache.openmeetings.core.mail.SMSHandler" />
<bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" />
<bean id="languageImport" class="org.apache.openmeetings.backup.LanguageImport" />
- <bean id="libraryWmlLoader" class="org.apache.openmeetings.documents.LibraryWmlLoader" />
- <bean id="generateSWF" class="org.apache.openmeetings.converter.GenerateSWF" />
- <bean id="fileUtils" class="org.apache.openmeetings.data.file.FileUtils" />
- <bean id="ldapLoginManagement" class="org.apache.openmeetings.ldap.LdapLoginManagement" />
+ <bean id="libraryWmlLoader" class="org.apache.openmeetings.core.documents.LibraryWmlLoader" />
+ <bean id="generateSWF" class="org.apache.openmeetings.core.converter.GenerateSWF" />
+ <bean id="fileUtils" class="org.apache.openmeetings.core.data.file.FileUtils" />
+ <bean id="ldapLoginManagement" class="org.apache.openmeetings.core.ldap.LdapLoginManagement" />
<bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" />
- <bean id="whiteboardManagement" class="org.apache.openmeetings.data.whiteboard.WhiteboardManager" />
+ <bean id="whiteboardManagement" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardManager" />
<bean id="backupExport" class="org.apache.openmeetings.backup.BackupExport" />
<bean id="backupImport" class="org.apache.openmeetings.backup.BackupImport" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1585514&r1=1584946&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml Mon Apr 7 16:19:59 2014
@@ -77,6 +77,10 @@
<param-name>parentContextKey</param-name>
<param-value>default.context</param-value>
</context-param>
+ <context-param>
+ <param-name>contextClass</param-name>
+ <param-value>org.apache.openmeetings.util.NoValidationApplicationContext</param-value>
+ </context-param>
<!-- remove the following servlet tags if you want to disable remoting for this application -->
<servlet>
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1585514&r1=1585513&r2=1585514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Mon Apr 7 16:19:59 2014
@@ -34,9 +34,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openmeetings.version>3.1.0-SNAPSHOT</openmeetings.version>
<red5.server.version>1.0.2-M1</red5.server.version>
+ <red5.client.version>1.0.2-RC2</red5.client.version>
<wicket.version>6.14.0</wicket.version>
<jaudiotagger.version>2.0.4-SNAPSHOT</jaudiotagger.version>
<spring.version>4.0.0.RELEASE</spring.version>
+ <junit.version>4.11</junit.version>
</properties>
<modules>
<module>openmeetings-util</module>
@@ -46,6 +48,7 @@
<module>openmeetings-web</module>
<module>openmeetings-core</module>
<module>openmeetings-axis</module>
+ <module>openmeetings-service</module>
</modules>
<profiles>
<profile>
@@ -150,6 +153,18 @@
<artifactId>wicket-util</artifactId>
<version>${wicket.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>