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/11/18 09:47:21 UTC
svn commit: r1640281 - in /openmeetings/branches/3.0.x: ./ docs/
src/main/java/org/apache/openmeetings/ldap/
src/web/java/org/apache/openmeetings/web/admin/
src/web/java/org/apache/openmeetings/web/admin/groups/
src/web/java/org/apache/openmeetings/web...
Author: solomax
Date: Tue Nov 18 08:47:20 2014
New Revision: 1640281
URL: http://svn.apache.org/r1640281
Log:
[OPENMEETINGS-1082] Wicket version is updated to be most stable version; typos are fixed
Modified:
openmeetings/branches/3.0.x/docs/CalendarService.html
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/ivysettings.xml
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserMultiChoice.java
Modified: openmeetings/branches/3.0.x/docs/CalendarService.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/CalendarService.html?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/CalendarService.html (original)
+++ openmeetings/branches/3.0.x/docs/CalendarService.html Tue Nov 18 08:47:20 2014
@@ -551,12 +551,11 @@
</td>
<td valign="top">mmClient</td>
<td valign="top">List of clients, comma separated string, <br/>
- sample: 1,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1
+ sample: '1,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1'
to add multiple clients you can use the same GET parameter in
the URL multiple times, for example:
- &mmClient=1,firstname,lastname,hans
- .tier@gmail.com,1,Etc/GMT+1&mmClient
- =2,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1</td>
+ &mmClient='1,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1'&mmClient='2,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1'
+ (Please NOTE mmClient value is enclosed in single quotes)</td>
</tr>
<tr>
@@ -856,12 +855,11 @@
</td>
<td valign="top">mmClient</td>
<td valign="top">List of clients, comma separated string, <br/>
- sample: 1,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1
+ sample: '1,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1'
to add multiple clients you can use the same GET parameter in
the URL multiple times, for example:
- &mmClient=1,firstname,lastname,hans
- .tier@gmail.com,1,Etc/GMT+1&mmClient
- =2,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1</td>
+ &mmClient='1,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1'&mmClient='2,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1'
+ (Please NOTE mmClient value is enclosed in single quotes)</td>
</tr>
<tr>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Tue Nov 18 08:47:20 2014
@@ -226,70 +226,58 @@
<dependency org="org.simpleframework" name="simple-xml" rev="2.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="joda-time" name="joda-time" rev="2.3" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="6.17.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.17.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.17.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.17.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.17.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui" rev="6.17.0" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-theme-default" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.18.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.18.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.18.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.18.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui" rev="6.18.0" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-theme-default" rev="6.18.0" conf="openmeetings->*" transitive="false"/>
<dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.12.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="com.google.code.gson" name="gson" rev="2.2.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="6.17.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.vaynberg.wicket.select2" name="wicket-select2" rev="2.2.3" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="6.18.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
Modified: openmeetings/branches/3.0.x/ivysettings.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivysettings.xml?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivysettings.xml (original)
+++ openmeetings/branches/3.0.x/ivysettings.xml Tue Nov 18 08:47:20 2014
@@ -20,7 +20,7 @@
<ibiblio name="central" m2compatible="true"/>
<ibiblio name="apache-public" m2compatible="true" root="https://repository.apache.org/content/groups/public" />
<ibiblio name="apache-snapshot" m2compatible="true" root="https://repository.apache.org/content/groups/snapshots" />
- <url name="mavencentral">
+ <url name="mavencentral" m2compatible="true">
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]" />
</url>
<url name="sonatype" m2compatible="true">
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java Tue Nov 18 08:47:20 2014
@@ -177,7 +177,7 @@ public class LdapLoginManagement {
r = new InputStreamReader(new FileInputStream(new File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName())), "UTF-8");
config.load(r);
} catch (Exception e) {
- log.error("Error on LdapLogin : Configurationdata couldnt be retrieved!");
+ log.error("Error on LdapLogin : Configurationdata couldn't be retrieved!");
return null;
} finally {
if (r != null) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Tue Nov 18 08:47:20 2014
@@ -26,9 +26,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/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Tue Nov 18 08:47:20 2014
@@ -38,8 +38,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.CompoundPropertyModel;
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 = -1720731686053912700L;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Tue Nov 18 08:47:20 2014
@@ -71,11 +71,10 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
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/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java Tue Nov 18 08:47:20 2014
@@ -60,11 +60,11 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
+import org.wicketstuff.select2.Response;
+import org.wicketstuff.select2.Select2MultiChoice;
+import org.wicketstuff.select2.TextChoiceProvider;
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;
/**
* CRUD operations in form for {@link User}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java Tue Nov 18 08:47:20 2014
@@ -60,10 +60,9 @@ import org.apache.wicket.model.IModel;
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/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Tue Nov 18 08:47:20 2014
@@ -29,13 +29,12 @@ import java.util.Map;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.ajax.json.JSONWriter;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.validation.Validatable;
-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/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserMultiChoice.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserMultiChoice.java?rev=1640281&r1=1640280&r2=1640281&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserMultiChoice.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserMultiChoice.java Tue Nov 18 08:47:20 2014
@@ -26,8 +26,7 @@ import org.apache.wicket.markup.head.Jav
import org.apache.wicket.markup.head.PriorityHeaderItem;
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;