Author: solomax
Date: Sun Jun 28 05:17:54 2015
New Revision: 1687988
URL: http://svn.apache.org/r1687988
Log:
[OPENMEETINGS-980] wicket, wicket-jqueryui*, commons-cli and
maven-assembly-plugin versions are updated
Modified:
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.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/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Sun Jun 28 05:17:54 2015
@@ -280,7 +280,7 @@ projects licensed under the Apache Licen
red5-*.jar
webapps/openmeetings/screensharing/red5-*.jar
-commons-cli-jar-1.2.jar
+commons-cli-jar-1.3.1.jar
red5.bat
red5.sh
red5-highperf.sh
@@ -397,24 +397,24 @@ webapps/openmeetings/WEB-INF/lib/stax-ap
webapps/openmeetings/WEB-INF/lib/stax2-api-jar-3.1.1.jar
webapps/openmeetings/WEB-INF/lib/velocity-jar-1.7.jar
webapps/openmeetings/WEB-INF/lib/velocity-tools-jar-2.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.19.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-core-jar-7.0.0-M6.jar
webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.19.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-util-jar-6.19.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-tomcat-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-request-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-7.0.0-M6.jar
+webapps/openmeetings/WEB-INF/lib/wicket-util-jar-7.0.0-M6.jar
webapps/openmeetings/WEB-INF/lib/woden-core-bundle-1.0-SNAPSHOT.jar
webapps/openmeetings/WEB-INF/lib/woodstox-core-asl-jar-4.1.4.jar
webapps/openmeetings/WEB-INF/lib/ws-commons-util-jar-1.0.2.jar
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Sun Jun 28
05:17:54 2015
@@ -30,7 +30,7 @@
<name>Openmeetings Install</name>
<description>TODO</description>
<properties>
- <commons-cli.version>1.3</commons-cli.version>
+ <commons-cli.version>1.3.1</commons-cli.version>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Sun Jun 28 05:17:54 2015
@@ -34,8 +34,8 @@ import com.googlecode.wicket.jquery.ui.w
public abstract class AddFolderDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private final DialogButton add = new
DialogButton(Application.getString(1261));
- private final DialogButton cancel = new
DialogButton(Application.getString(219));
+ private final DialogButton add = new DialogButton("add",
Application.getString(1261));
+ private final DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final Form<String> form;
private final FeedbackPanel feedback = new FeedbackPanel("feedback");
private final String name;
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=1687988&r1=1687987&r2=1687988&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
Sun Jun 28 05:17:54 2015
@@ -60,9 +60,8 @@ import com.googlecode.wicket.jquery.ui.w
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log =
Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
private static final long serialVersionUID = 1L;
- private String sendLbl = Application.getString(317);
- private DialogButton send = new DialogButton(sendLbl);
- private DialogButton cancel = new
DialogButton(Application.getString(122));
+ private DialogButton send = new DialogButton("send",
Application.getString(317));
+ private DialogButton cancel = new DialogButton("cancel",
Application.getString(122));
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private RequiredTextField<String> nameField;
private Form<String> form;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Sun Jun 28 05:17:54 2015
@@ -70,9 +70,8 @@ import com.googlecode.wicket.jquery.ui.w
public class RegisterDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
- private DialogButton cancelBtn = new
DialogButton(Application.getString(122));
- private String registerLbl = Application.getString(121);
- private DialogButton registerBtn = new DialogButton(registerLbl);
+ private DialogButton cancelBtn = new DialogButton("cancel",
Application.getString(122));
+ private DialogButton registerBtn = new DialogButton("register",
Application.getString(121));
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private final IModel<String> tzModel =
Model.of(WebSession.get().getClientTZCode());
private final DropDownChoice<String> tzDropDown = new
DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Sun Jun 28 05:17:54 2015
@@ -49,8 +49,7 @@ import com.googlecode.wicket.jquery.ui.w
public class ResetPasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private String resetLbl = Application.getString(327);
- private DialogButton resetBtn = new DialogButton(resetLbl);
+ private DialogButton resetBtn = new DialogButton("reset",
Application.getString(327));
private Form<String> form;
private FeedbackPanel feedback = new FeedbackPanel("feedback");
private PasswordTextField password;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Sun Jun 28 05:17:54 2015
@@ -77,9 +77,8 @@ import com.googlecode.wicket.jquery.ui.w
public class SignInDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private Form<String> form;
- private DialogButton loginBtn = new
DialogButton(Application.getString(112));
- private String registerLbl = Application.getString(123);
- private DialogButton registerBtn = new DialogButton(registerLbl);
+ private DialogButton loginBtn = new DialogButton("login",
Application.getString(112));
+ private DialogButton registerBtn = new DialogButton("register",
Application.getString(123));
private String password;
private String login;
private boolean rememberMe = false;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Sun Jun 28 05:17:54 2015
@@ -76,9 +76,9 @@ import com.googlecode.wicket.kendo.ui.pa
public class InvitationDialog extends AbstractFormDialog<Invitation> {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(InvitationDialog.class, webAppRootKey);
- private final DialogButton generate = new
DialogButton(Application.getString(1526));
- private final DialogButton send = new
DialogButton(Application.getString(218));
- private final DialogButton cancel = new
DialogButton(Application.getString(219));
+ private final DialogButton generate = new DialogButton("generate",
Application.getString(1526));
+ private final DialogButton send = new DialogButton("send",
Application.getString(218));
+ private final DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final InvitationForm form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final long roomId;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
Sun Jun 28 05:17:54 2015
@@ -30,13 +30,11 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.RoomPoll;
-import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.message.RoomMessage;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
@@ -53,8 +51,8 @@ import com.googlecode.wicket.kendo.ui.pa
public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
private static final long serialVersionUID = 1L;
- private final DialogButton create = new
DialogButton(Application.getString(22));
- private final DialogButton cancel = new
DialogButton(Application.getString(25));
+ private final DialogButton create = new DialogButton("create",
Application.getString(22));
+ private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
private final long roomId;
private final PollForm form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Sun Jun 28 05:17:54 2015
@@ -74,9 +74,9 @@ public class PollResultsDialog extends A
private final long roomId;
private final PollSelectForm selForm;
private final PollResultsForm dispForm;
- private final DialogButton cancel = new
DialogButton(Application.getString(25));
- private final DialogButton close = new
DialogButton(Application.getString(1418));
- private final DialogButton delete = new
DialogButton(Application.getString(1420));
+ private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
+ private final DialogButton close = new DialogButton("close",
Application.getString(1418));
+ private final DialogButton delete = new DialogButton("delete",
Application.getString(1420));
private boolean moderator = false;
private final MessageDialog closeConfirm;
private final MessageDialog deleteConfirm;
@@ -92,7 +92,7 @@ public class PollResultsDialog extends A
@Override
public void onClose(AjaxRequestTarget target,
DialogButton button) {
// TODO should rights be additionally checked
here????
- if(button != null && button.match(LBL_YES)) {
+ if(button != null && button.match(YES)) {
Long id =
dispForm.getModelObject().getId();
getBean(PollDao.class).close(roomId);
selForm.updateModel(target);
@@ -111,7 +111,7 @@ public class PollResultsDialog extends A
@Override
public void onClose(AjaxRequestTarget target,
DialogButton button) {
// TODO should rights be additionally checked
here????
- if(button != null && button.match(LBL_YES)) {
+ if(button != null && button.match(YES)) {
getBean(PollDao.class).delete(dispForm.getModelObject());
selForm.updateModel(target);
dispForm.updateModel(selForm.select.getModelObject(), true, target);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Sun Jun 28 05:17:54 2015
@@ -57,8 +57,8 @@ public class VoteDialog extends Abstract
private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4,
5, 6, 7, 8, 9, 10); //TODO max vote should be added
private final long roomId;
private final PollAnswerForm form;
- private final DialogButton vote = new
DialogButton(Application.getString(32));
- private final DialogButton cancel = new
DialogButton(Application.getString(25));
+ private final DialogButton vote = new DialogButton("vote",
Application.getString(32));
+ private final DialogButton cancel = new DialogButton("cancel",
Application.getString(25));
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> user = Model.of((String)null);
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=1687988&r1=1687987&r2=1687988&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
Sun Jun 28 05:17:54 2015
@@ -87,12 +87,10 @@ public class AppointmentDialog extends A
private static final Logger log =
Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
private AppointmentForm form;
- private DialogButton save = new
DialogButton(Application.getString(813));
- private DialogButton cancel = new
DialogButton(Application.getString(1130));
- private String deleteLbl = Application.getString(814);
- private DialogButton delete = new DialogButton(deleteLbl);
- private String enterRoomLbl = Application.getString(1282);
- private DialogButton enterRoom = new DialogButton(enterRoomLbl);
+ private DialogButton save = new DialogButton("save",
Application.getString(813));
+ private DialogButton cancel = new DialogButton("cancel",
Application.getString(1130));
+ private DialogButton delete = new DialogButton("delete",
Application.getString(814));
+ private DialogButton enterRoom = new DialogButton("enterRoom",
Application.getString(1282));
private final CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
final MessageDialog confirmDelete;
@@ -131,7 +129,7 @@ public class AppointmentDialog extends A
private static final long serialVersionUID = 1L;
public void onClose(AjaxRequestTarget target,
DialogButton button) {
- if (button != null &&
button.match(AbstractDialog.LBL_OK)){
+ if (button != null &&
button.match(AbstractDialog.OK)){
deleteAppointment(target);
}
}
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=1687988&r1=1687987&r2=1687988&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
Sun Jun 28 05:17:54 2015
@@ -73,9 +73,8 @@ public class MessageDialog extends Abstr
private static final long serialVersionUID = 1L;
private final Form<PrivateMessage> form;
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
- String sendLbl = Application.getString(218);
- DialogButton send = new DialogButton(sendLbl);
- private DialogButton cancel = new
DialogButton(Application.getString(219));
+ DialogButton send = new DialogButton("send",
Application.getString(218));
+ private DialogButton cancel = new DialogButton("cancel",
Application.getString(219));
private final WebMarkupContainer roomParamsBlock = new
WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new
WebMarkupContainer("roomParams");
private final DateTimePicker start = new OmDateTimePicker("start",
Model.of(LocalDateTime.now()));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Sun Jun 28 05:17:54 2015
@@ -36,11 +36,9 @@ import com.googlecode.wicket.jquery.ui.w
public class UserInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
private WebMarkupContainer container = new
WebMarkupContainer("container");
- private DialogButton cancel = new
DialogButton(Application.getString(61));
- private String messageLbl = Application.getString(1253);
- private DialogButton message = new DialogButton(messageLbl);
- private String contactsLbl = Application.getString(1186);
- private DialogButton contacts = new DialogButton(contactsLbl);
+ private DialogButton cancel = new DialogButton("cancel",
Application.getString(61));
+ private DialogButton message = new DialogButton("message",
Application.getString(1253));
+ private DialogButton contacts = new DialogButton("contacts",
Application.getString(1186));
private MessageDialog newMessage;
private long userId;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1687988&r1=1687987&r2=1687988&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sun Jun 28 05:17:54 2015
@@ -41,8 +41,8 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
- <wicket.version>7.0.0-SNAPSHOT</wicket.version>
- <wicketju.version>7.0.0-SNAPSHOT</wicketju.version>
+ <wicket.version>7.0.0-M6</wicket.version>
+ <wicketju.version>7.0.0-M6</wicketju.version>
<wickets.version>7.0.0-M5</wickets.version>
<red5-server.version>1.0.5-RELEASE</red5-server.version>
<red5-client.version>1.0.5-RELEASE</red5-client.version>
@@ -763,7 +763,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.4</version>
+ <version>2.5.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
