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/09/04 12:20:15 UTC
svn commit: r1622445 - in /openmeetings/trunk/singlewebapp: ./
openmeetings-server/src/main/assembly/components/ openmeetings-web/
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/
openmeetings-web/src/main/java/org/apache/openmeetings/...
Author: solomax
Date: Thu Sep 4 10:20:14 2014
New Revision: 1622445
URL: http://svn.apache.org/r1622445
Log:
3.1.x version of OM is fixed
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml Thu Sep 4 10:20:14 2014
@@ -90,6 +90,7 @@
<exclude>WEB-INF/lib/spring-*</exclude>
<exclude>WEB-INF/lib/geronimo-jpa*</exclude>
<exclude>WEB-INF/lib/commons-fileupload*</exclude>
+ <exclude>WEB-INF/lib/commons-io*</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -99,6 +100,7 @@
<include>spring-*</include>
<include>geronimo-jpa*</include>
<include>commons-fileupload*</include>
+ <include>commons-io*</include>
</includes>
</fileSet>
<fileSet>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Thu Sep 4 10:20:14 2014
@@ -32,7 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<wicket-dashboard.version>0.11.0+wicket-7</wicket-dashboard.version>
- <select2.version>2.2.3</select2.version>
<dnd.version>0.6.0</dnd.version>
<commons-io.version>2.4</commons-io.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
@@ -370,22 +369,22 @@
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-urlfragment</artifactId>
- <version>${wicketstuff.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-html5</artifactId>
- <version>${wicketstuff.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-whiteboard</artifactId>
- <version>${wicketstuff.version}</version>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
- <groupId>com.vaynberg.wicket.select2</groupId>
- <artifactId>wicket-select2</artifactId>
- <version>${select2.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-select2</artifactId>
+ <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>com.github.svenmeier.wicket-dnd</groupId>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Thu Sep 4 10:20:14 2014
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import com.vaynberg.wicket.select2.Response;
-import com.vaynberg.wicket.select2.TextChoiceProvider;
+import org.wicketstuff.select2.Response;
+import org.wicketstuff.select2.TextChoiceProvider;
public abstract class AdminUserChoiceProvider extends TextChoiceProvider<User> {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Thu Sep 4 10:20:14 2014
@@ -39,7 +39,7 @@ import org.apache.wicket.model.CompoundP
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
-import com.vaynberg.wicket.select2.Select2Choice;
+import org.wicketstuff.select2.Select2Choice;
public class GroupForm extends AdminBaseForm<Organisation> {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Thu Sep 4 10:20:14 2014
@@ -71,10 +71,10 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
-import com.vaynberg.wicket.select2.Response;
-import com.vaynberg.wicket.select2.Select2Choice;
-import com.vaynberg.wicket.select2.Select2MultiChoice;
-import com.vaynberg.wicket.select2.TextChoiceProvider;
+import org.wicketstuff.select2.Response;
+import org.wicketstuff.select2.Select2Choice;
+import org.wicketstuff.select2.Select2MultiChoice;
+import org.wicketstuff.select2.TextChoiceProvider;
public class RoomForm extends AdminBaseForm<Room> {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Thu Sep 4 10:20:14 2014
@@ -62,9 +62,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
-import com.vaynberg.wicket.select2.Response;
-import com.vaynberg.wicket.select2.Select2MultiChoice;
-import com.vaynberg.wicket.select2.TextChoiceProvider;
+import org.wicketstuff.select2.Response;
+import org.wicketstuff.select2.Select2MultiChoice;
+import org.wicketstuff.select2.TextChoiceProvider;
/**
* CRUD operations in form for {@link User}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Sep 4 10:20:14 2014
@@ -82,6 +82,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.settings.PageSettings;
import org.apache.wicket.util.collections.ConcurrentHashSet;
import org.apache.wicket.util.tester.WicketTester;
+import org.wicketstuff.select2.ApplicationSettings;
import org.slf4j.Logger;
import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -119,6 +120,9 @@ public class Application extends Authent
//Resource Loader for a the property key
getResourceSettings().getStringResourceLoaders().add(0, new LabelResourceLoader());
+
+ ApplicationSettings.get().setIncludeJqueryUI(false);
+
super.init();
// register some widgets
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Thu Sep 4 10:20:14 2014
@@ -61,9 +61,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.string.Strings;
-import com.vaynberg.wicket.select2.Response;
-import com.vaynberg.wicket.select2.Select2MultiChoice;
-import com.vaynberg.wicket.select2.TextChoiceProvider;
+import org.wicketstuff.select2.Response;
+import org.wicketstuff.select2.Select2MultiChoice;
+import org.wicketstuff.select2.TextChoiceProvider;
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Thu Sep 4 10:20:14 2014
@@ -288,7 +288,7 @@ public class AppointmentDialog extends A
add(new DropDownChoice<AppointmentReminderTyps>(
"remind"
, remindTypes
- , new ChoiceRenderer<AppointmentReminderTyps>("label.value", "typId")));
+ , new ChoiceRenderer<AppointmentReminderTyps>("label.value", "id")));
final DropDownChoice<RoomType> roomType = new RoomTypeDropDown("room.roomtype");
roomType.setEnabled(createRoom);
@@ -298,7 +298,7 @@ public class AppointmentDialog extends A
final DropDownChoice<Room> room = new DropDownChoice<Room>(
"room"
, getRoomList()
- , new ChoiceRenderer<Room>("name", "rooms_id"));
+ , new ChoiceRenderer<Room>("name", "id"));
room.setEnabled(!createRoom);
room.setOutputMarkupId(true);
add(room);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Thu Sep 4 10:20:14 2014
@@ -34,8 +34,8 @@ import org.apache.wicket.validation.Vali
import org.json.JSONException;
import org.json.JSONWriter;
-import com.vaynberg.wicket.select2.ChoiceProvider;
-import com.vaynberg.wicket.select2.Response;
+import org.wicketstuff.select2.ChoiceProvider;
+import org.wicketstuff.select2.Response;
public class UserChoiceProvider extends ChoiceProvider<User> {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java Thu Sep 4 10:20:14 2014
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.head.Pri
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import com.vaynberg.wicket.select2.Select2MultiChoice;
+import org.wicketstuff.select2.Select2MultiChoice;
public class UserMultiChoice extends Select2MultiChoice<User> {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1622445&r1=1622444&r2=1622445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Thu Sep 4 10:20:14 2014
@@ -41,8 +41,7 @@
<maven.javadoc.version>2.9.1</maven.javadoc.version>
<maven.surefire.version>2.17</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
- <wicket.version>7.0.0-M2</wicket.version>
- <wicketstuff.version>6.16.0</wicketstuff.version>
+ <wicket.version>7.0.0-M3</wicket.version>
<wicket.jqueryui.version>7.0.0-SNAPSHOT</wicket.jqueryui.version>
<red5-server.version>1.0.3-RELEASE</red5-server.version>
<batik.version>1.7</batik.version>