Author: solomax
Date: Tue Apr 23 10:28:33 2013
New Revision: 1470881
URL: http://svn.apache.org/r1470881
Log:
[OPENMEETINGS-612]
WelcomeWidgetView is fixed
wicket-jquery-ui* versions are bumped
Dashboard is moved to WebSession to be able to be personalized by user
maven/svn repositories are switched to https;
code clean-up;
Modified:
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/ivysettings.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/OmDashboardPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsTabbedPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Apr 23 10:28:33 2013
@@ -899,7 +899,7 @@
<available classpathref="check.classpath"
classname="org.apache.derby.jdbc.ClientDriver" property="derby.installed" />
<available file="${laszlo.home}/WEB-INF/lib" type="dir"
property="laszlo.installed" />
<available file="${laszlo46.home}/WEB-INF/lib" type="dir"
property="laszlo46.installed" />
- <available file="${red5.lib}/red5.sh" type="file"
property="red5.installed" />
+ <available file="${red5.lib}/red5.sh" type="file"
property="red5.server.installed" />
<available classpathref="check.classpath"
classname="org.red5.client.net.rtmp.RTMPClient"
property="red5.client.installed" />
</target>
@@ -949,9 +949,9 @@
</target>
<!-- Check for the Red5 server libraries -->
- <target name="-retrieve-red5-server" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-ant-task,-maven-task">
+ <target name="-retrieve-red5-server" unless="red5.server.installed"
description="Retrieves the libraries if needed" depends="-ant-task,-maven-task">
<svn refid="svn.settings">
- <checkout
url="http://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
+ <checkout
url="https://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
</svn>
<artifact:mvn pom="${red5.server.dir}/pom.xml"
mavenVersion="${maven.version}" fork="true" dir="${red5.server.dir}">
<jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
@@ -1007,7 +1007,7 @@
<!-- Check for the Red5 client libraries -->
<target name="-retrieve-red5-client" unless="red5.client.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
<svn refid="svn.settings">
- <checkout
url="http://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
+ <checkout
url="https://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
</svn>
<delete>
<fileset dir="${red5.client.dir}/lib"
includes="red5-server*.jar" />
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Tue Apr 23 10:28:33 2013
@@ -253,10 +253,13 @@
<dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.8" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="jquery-ui-core" rev="6.2.2" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.7.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="jquery-ui-calendar" rev="6.2.2" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui" rev="6.7.0" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-calendar" rev="6.7.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
<dependency org="ro.fortsoft.wicket.dashboard"
name="wicket-dashboard-core" rev="0.6" conf="openmeetings->*"
transitive="false">
Modified: openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ openmeetings/trunk/singlewebapp/ivysettings.xml Tue Apr 23 10:28:33 2013
@@ -22,14 +22,14 @@
<url name="mavencentral">
<artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
</url>
- <url name="sonatype">
- <artifact
pattern="http://oss.sonatype.org/content/repositories/sourceforge-releases/[organisation]/[artifact]-[revision].[ext]";
/>
- <artifact
pattern="http://oss.sonatype.org/content/repositories/central/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
+ <url name="sonatype" m2compatible="true">
+ <artifact
pattern="https://oss.sonatype.org/content/repositories/sourceforge-releases/[organisation]/[artifact]-[revision].[ext]";
/>
+ <artifact
pattern="https://oss.sonatype.org/content/repositories/central/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
</url>
<url name="googlecode">
- <artifact
pattern="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="http://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="https://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="https://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="https://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
</url>
<url name="smslib" m2compatible="true">
<artifact
pattern="http://smslib.org/maven2/v3/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
Tue Apr 23 10:28:33 2013
@@ -42,16 +42,12 @@ import org.apache.wicket.settings.IPageS
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import ro.fortsoft.wicket.dashboard.Dashboard;
-import ro.fortsoft.wicket.dashboard.DefaultDashboard;
-import ro.fortsoft.wicket.dashboard.WidgetFactory;
import ro.fortsoft.wicket.dashboard.WidgetRegistry;
import ro.fortsoft.wicket.dashboard.web.DashboardContext;
import ro.fortsoft.wicket.dashboard.web.DashboardContextInjector;
public class Application extends AuthenticatedWebApplication {
private DashboardContext dashboardContext;
- private Dashboard dashboard;
@Override
protected void init() {
@@ -122,6 +118,10 @@ public class Application extends Authent
return (Application) WebApplication.get();
}
+ public static DashboardContext getDashboardContext() {
+ return get().dashboardContext;
+ }
+
public static <T> T getBean(Class<T> clazz) {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils.getWebApplicationContext(get().getServletContext());
@@ -130,25 +130,4 @@ public class Application extends Authent
throw new RestartResponseException(NotInitedPage.class);
}
}
-
- public static Dashboard getDashboard() {
- Dashboard d = get().dashboard;
- if (d == null) {
- get().initDashboard();
- d = get().dashboard;
- }
- return d;
- }
-
- private void initDashboard() {
- //FIXME check title etc.
- dashboard = dashboardContext.getDashboardPersiter().load();
- if (dashboard == null) {
- dashboard = new DefaultDashboard("default", "Default");
- }
- WidgetFactory widgetFactory =
dashboardContext.getWidgetFactory();
- dashboard.getWidgets().clear(); //FIXME hack somehow Dashboard
loaded with 7! PrivateRoomsWidgets
- dashboard.addWidget(widgetFactory.createWidget(new
WelcomeWidgetDescriptor()));
- dashboard.addWidget(widgetFactory.createWidget(new
PrivateRoomsWidgetDescriptor()));
- }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
Tue Apr 23 10:28:33 2013
@@ -35,10 +35,17 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.user.User;
+import
org.apache.openmeetings.web.components.user.dashboard.PrivateRoomsWidgetDescriptor;
+import
org.apache.openmeetings.web.components.user.dashboard.WelcomeWidgetDescriptor;
import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
+import ro.fortsoft.wicket.dashboard.Dashboard;
+import ro.fortsoft.wicket.dashboard.DefaultDashboard;
+import ro.fortsoft.wicket.dashboard.WidgetFactory;
+import ro.fortsoft.wicket.dashboard.web.DashboardContext;
+
public class WebSession extends AbstractAuthenticatedWebSession {
private static final long serialVersionUID = 1123393236459095315L;
private long userId = -1;
@@ -47,6 +54,7 @@ public class WebSession extends Abstract
private String area = null;
private TimeZone tz;
private SimpleDateFormat ISO8601FORMAT = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+ private Dashboard dashboard;
public WebSession(Request request) {
super(request);
@@ -151,4 +159,27 @@ public class WebSession extends Abstract
public void setArea(String area) {
this.area = area;
}
+
+
+ public static Dashboard getDashboard() {
+ Dashboard d = get().dashboard;
+ if (d == null) {
+ get().initDashboard();
+ d = get().dashboard;
+ }
+ return d;
+ }
+
+ private void initDashboard() {
+ DashboardContext dashboardContext =
Application.getDashboardContext();
+ //FIXME check title etc.
+ dashboard = dashboardContext.getDashboardPersiter().load();
+ if (dashboard == null) {
+ dashboard = new DefaultDashboard("default", "Default");
+ }
+ WidgetFactory widgetFactory =
dashboardContext.getWidgetFactory();
+ dashboard.getWidgets().clear(); //FIXME hack somehow Dashboard
loaded with 7! PrivateRoomsWidgets
+ dashboard.addWidget(widgetFactory.createWidget(new
WelcomeWidgetDescriptor()));
+ dashboard.addWidget(widgetFactory.createWidget(new
PrivateRoomsWidgetDescriptor()));
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java
Tue Apr 23 10:28:33 2013
@@ -51,9 +51,7 @@ public class AboutDialog extends Abstrac
protected List<DialogButton> getButtons() {
return new ArrayList<DialogButton>();
}
-
- @Override
- protected void onClose(AjaxRequestTarget target, DialogButton button) {
- //empty
+
+ public void onClose(AjaxRequestTarget arg0, DialogButton arg1) {
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
Tue Apr 23 10:28:33 2013
@@ -31,9 +31,10 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
-import com.googlecode.wicket.jquery.ui.JQueryAbstractBehavior;
-import com.googlecode.wicket.jquery.ui.Options;
+import com.googlecode.wicket.jquery.core.JQueryAbstractBehavior;
+import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.calendar.Calendar;
+import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
public class CalendarPanel extends UserPanel {
private static final long serialVersionUID = -6536379497642291437L;
@@ -94,32 +95,31 @@ public class CalendarPanel extends UserP
}
@Override
- protected boolean isSelectable() {
+ public boolean isSelectable() {
return true;
}
@Override
- protected boolean isEditable() {
+ public boolean isEditable() {
return true;
}
@Override
- protected boolean isEventDropEnabled() {
+ public boolean isEventDropEnabled() {
return true;
}
@Override
- protected boolean isEventResizeEnabled() {
+ public boolean isEventResizeEnabled() {
return true;
}
//no need to override onDayClick
@Override
- protected void onSelect(AjaxRequestTarget target, Date
start, Date end, boolean allDay) {
+ public void onSelect(AjaxRequestTarget target,
CalendarView view, Date start, Date end, boolean allDay) {
Appointment a = new Appointment();
- //FIXME seems like this check should be done
for monthly view only
- if (start.equals(end)) {
+ if (CalendarView.month == view &&
start.equals(end)) {
java.util.Calendar now =
WebSession.getCalendar();
java.util.Calendar cal =
WebSession.getCalendar();
cal.setTime(start);
@@ -139,7 +139,7 @@ public class CalendarPanel extends UserP
}
@Override
- protected void onEventClick(AjaxRequestTarget target,
int eventId) {
+ public void onEventClick(AjaxRequestTarget target,
CalendarView view, int eventId) {
Appointment a =
getDao().getAppointmentById((long)eventId);
dialog.setModelObject(a);
@@ -147,7 +147,7 @@ public class CalendarPanel extends UserP
}
@Override
- protected void onEventDrop(AjaxRequestTarget target,
int eventId, long delta, boolean allDay) {
+ public void onEventDrop(AjaxRequestTarget target, int
eventId, long delta, boolean allDay) {
AppointmentDao dao = getDao();
Appointment a =
dao.getAppointmentById((long)eventId);
@@ -165,7 +165,7 @@ public class CalendarPanel extends UserP
}
@Override
- protected void onEventResize(AjaxRequestTarget target,
int eventId, long delta) {
+ public void onEventResize(AjaxRequestTarget target, int
eventId, long delta) {
AppointmentDao dao = getDao();
Appointment a =
dao.getAppointmentById((long)eventId);
java.util.Calendar cal =
WebSession.getCalendar();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/OmDashboardPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/OmDashboardPanel.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/OmDashboardPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/OmDashboardPanel.java
Tue Apr 23 10:28:33 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.UserPanel;
import org.apache.wicket.model.Model;
@@ -31,6 +31,6 @@ public class OmDashboardPanel extends Us
public OmDashboardPanel(String id) {
super(id);
- add(new DashboardPanel("dashboard", new
Model<Dashboard>(Application.getDashboard())));
+ add(new DashboardPanel("dashboard", new
Model<Dashboard>(WebSession.getDashboard())));
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
Tue Apr 23 10:28:33 2013
@@ -24,7 +24,7 @@
<tr>
<td><div wicket:id="img"></div></td>
<td>
- <wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
<wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
<wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
<wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
<wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
+ <wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span><br/>
<wicket:ommessage key="1143"/> <span
wicket:id="tz"></span><br/>
<wicket:ommessage key="378"/> <span
wicket:id="unread"></span><br/>
<a wicket:id="editProfile"><wicket:ommessage
key="377"/></a>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsTabbedPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsTabbedPanel.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsTabbedPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/RoomsTabbedPanel.java
Tue Apr 23 10:28:33 2013
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
-import com.googlecode.wicket.jquery.ui.JQueryBehavior;
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
public class RoomsTabbedPanel extends UserPanel {
private static final long serialVersionUID = 3642004664480074881L;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1470881&r1=1470880&r2=1470881&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
Tue Apr 23 10:28:33 2013
@@ -32,7 +32,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.googlecode.wicket.jquery.ui.JQueryAbstractBehavior;
+import com.googlecode.wicket.jquery.core.JQueryAbstractBehavior;
public class SignInPage extends BasePage {
private static final long serialVersionUID = -3843571657066167592L;
