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 2015/09/09 05:49:08 UTC
svn commit: r1701897 [3/3] - in /openmeetings/trunk/singlewebapp:
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
openmeetings-db/src/main/java/org/apache/openmeetings/
openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/b...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Wed Sep 9 03:49:07 2015
@@ -280,8 +280,6 @@
<entry key="258">Ðа оÑÑÐ°Ð½Ð½Ñ ÑÑоÑÑнкÑ</entry>
<entry key="259">ÐменÑиÑи</entry>
<entry key="260">ÐбÑлÑÑиÑи</entry>
- <entry key="261">Ð.</entry>
- <entry key="262">Ð.</entry>
<entry key="263">ÐалаÑÑÑваннÑ</entry>
<entry key="264">ID</entry>
<entry key="265">ÐлÑÑ</entry>
@@ -341,8 +339,6 @@
<entry key="319">ÐпиÑÑваннÑ</entry>
<entry key="320">ÐоÑиÑÑÑÐ²Ð°Ñ Ð· даним Ñменем вÑдÑÑÑнÑй</entry>
<entry key="321">Ðа ваÑÑ Ð¿Ð¾ÑÑÐ¾Ñ ÑкÑинÑÐºÑ Ð²Ð¸Ñлано лиÑÑ. ÐÑдÑ-лаÑка пеÑевÑÑÑе Ð²Ð°Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ñ ÑкÑинÑкÑ.</entry>
- <entry key="322">Ðомилка</entry>
- <entry key="323">ÐовÑдомленнÑ</entry>
<entry key="324">ÐепÑавилÑний Ñ
еÑ. ÐоÑиÑÑÑваÑа не знайдено.</entry>
<entry key="325">СкинÑÑи ÐÐ°Ñ Ð¿Ð°ÑолÑ</entry>
<entry key="326">ÐогÑн</entry>
@@ -860,8 +856,6 @@
<entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
<entry key="839">Do you really want to delete this File/Folder?</entry>
<entry key="840">Delete File/Folder?</entry>
- <entry key="841">Mrs.</entry>
- <entry key="842">Dr.</entry>
<entry key="843">Properties</entry>
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1477,6 @@
<entry key="1461">Export/Import System Backups</entry>
<entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
<entry key="1463">Edit text</entry>
- <entry key="1464">Prof</entry>
<entry key="1465">Publish</entry>
<entry key="1466">Start Publish</entry>
<entry key="1467">Stop Publish</entry>
@@ -1584,9 +1577,6 @@
<entry key="1565">Oct</entry>
<entry key="1566">Nov</entry>
<entry key="1567">Dec</entry>
- <entry key="1568">do not send notification</entry>
- <entry key="1569">simple email</entry>
- <entry key="1570">iCal email</entry>
<entry key="1571">OAuth2</entry>
<entry key="1572">Manage OAuth2 configurations</entry>
<entry key="1573">Name</entry>
@@ -1869,4 +1859,14 @@
<entry key="room.type.conference">conference (1-25 users)</entry>
<entry key="room.type.restricted">restricted (1-150 users)</entry>
<entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Ð.</entry>
+ <entry key="user.salutation.ms">Ð.</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Ðомилка</entry>
+ <entry key="error.type.info">ÐовÑдомленнÑ</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Wed Sep 9 03:49:07 2015
@@ -280,8 +280,6 @@
<entry key="258">转å°æåä¸é¡µ</entry>
<entry key="259">缩å°</entry>
<entry key="260">æ¾å¤§</entry>
- <entry key="261">å
ç.</entry>
- <entry key="262">女士.</entry>
<entry key="263">é
置信æ¯</entry>
<entry key="264">åºå·</entry>
<entry key="265">å
³é®å</entry>
@@ -341,8 +339,6 @@
<entry key="319">æ票</entry>
<entry key="320">没ææ¤ç¨æ·å</entry>
<entry key="321">ä¸å°å
å«ç¹æ®é¾æ¥çé®ä»¶å·²åéè³ä½ çä¿¡ç®±,请æ¥æ¶.å¦æ没ææ¶å°,请æ£æ¥åè°æ´ä½ çé®ç®±åå¾é®ä»¶è®¾ç½®,éæ°åé认è¯é®ä»¶.</entry>
- <entry key="322">é误</entry>
- <entry key="323">æ¶æ¯</entry>
<entry key="324">æ æçåå¸å¼,没æ该ç¨æ·.</entry>
<entry key="325">éç½®ä½ çå¯ç </entry>
<entry key="326">ç»å½</entry>
@@ -860,8 +856,6 @@
<entry key="838">è¿ä¸ªæ¯è¶
级主æ人ï¼ä½ ä¸è½åæ¶ä¸ä¸ªè¶
级主æ人çæéï¼</entry>
<entry key="839">ä½ ççè¦å é¤è¿ä¸ªæ件/æ件夹ï¼</entry>
<entry key="840">å é¤æ件/æ件夹?</entry>
- <entry key="841">女士</entry>
- <entry key="842">å
ç</entry>
<entry key="843">å±æ§</entry>
<entry key="844">å¨å
±äº«å¨ä¸æ¾ç¤ºé¼ æ ä½ç½®</entry>
<entry key="845">使ç¨SIPå°åºç¨ç¨åºå
±äº«é³é¢</entry>
@@ -1483,7 +1477,6 @@
<entry key="1461">è¾åºï¼è¾å
¥ç³»ç»å¤ä»½</entry>
<entry key="1462">éè¦ä¸»æ人æ被èµäºæå©ä»¥å¨ç½æ¿ä¸ç»å¾ï¼ä¸ä¼ ï¼æ·»å ï¼å é¤æå è½½æ件åæ件夹ã</entry>
<entry key="1463">ç¼è¾å
容</entry>
- <entry key="1464">ææ</entry>
<entry key="1465">Publish</entry>
<entry key="1466">Start Publish</entry>
<entry key="1467">Stop Publish</entry>
@@ -1584,9 +1577,6 @@
<entry key="1565">Oct</entry>
<entry key="1566">Nov</entry>
<entry key="1567">Dec</entry>
- <entry key="1568">do not send notification</entry>
- <entry key="1569">simple email</entry>
- <entry key="1570">iCal email</entry>
<entry key="1571">OAuth2</entry>
<entry key="1572">Manage OAuth2 configurations</entry>
<entry key="1573">Name</entry>
@@ -1869,4 +1859,14 @@
<entry key="room.type.conference">conference (1-25 users)</entry>
<entry key="room.type.restricted">restricted (1-150 users)</entry>
<entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">å
ç.</entry>
+ <entry key="user.salutation.ms">女士.</entry>
+ <entry key="user.salutation.mrs">女士</entry>
+ <entry key="user.salutation.dr">å
ç</entry>
+ <entry key="user.salutation.prof">ææ</entry>
+ <entry key="error.type.error">é误</entry>
+ <entry key="error.type.info">æ¶æ¯</entry>
</properties>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Wed Sep 9 03:49:07 2015
@@ -280,8 +280,6 @@
<entry key="258">å°æå¾ä¸é </entry>
<entry key="259">ç¸®å° --</entry>
<entry key="260">æ¾å¤§ ++</entry>
- <entry key="261">å
ç</entry>
- <entry key="262">女士</entry>
<entry key="263">é
ç½®</entry>
<entry key="264">ç¼å·</entry>
<entry key="265">ééµ</entry>
@@ -341,8 +339,6 @@
<entry key="319">æ°èª¿</entry>
<entry key="320">ææ²æç¨æ¶é£æ¥å°è©²ç¨æ¶å</entry>
<entry key="321">該é»éµè¼æä¸åç¹æ®çè¯ç¹«å·²è¢«ç¼éå°æ¨çé»åéµä»¶å°åï¼è«æª¢æ¥æ¨çä¿¡ç®±ãå¦ææ¨éæ²ææ¶å°éµä»¶ï¼è«èª¿æ´ä½ çåå¾éµä»¶è¨ç½®ï¼ä¸¦éæ°ç¼é確èªéµä»¶</entry>
- <entry key="322">é¯è¯¯</entry>
- <entry key="323">è¨æ¯</entry>
<entry key="324">ç¡ææ£åãæ¾ä¸å°ç¨æ¶.</entry>
<entry key="325">éç½®å¯ç¢¼</entry>
<entry key="326">ç»é</entry>
@@ -860,8 +856,6 @@
<entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
<entry key="839">Do you really want to delete this File/Folder?</entry>
<entry key="840">Delete File/Folder?</entry>
- <entry key="841">Mrs.</entry>
- <entry key="842">Dr.</entry>
<entry key="843">Properties</entry>
<entry key="844">Show mouse position to viewers</entry>
<entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1477,6 @@
<entry key="1461">Export/Import System Backups</entry>
<entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
<entry key="1463">Edit text</entry>
- <entry key="1464">Prof</entry>
<entry key="1465">Publish</entry>
<entry key="1466">Start Publish</entry>
<entry key="1467">Stop Publish</entry>
@@ -1584,9 +1577,6 @@
<entry key="1565">Oct</entry>
<entry key="1566">Nov</entry>
<entry key="1567">Dec</entry>
- <entry key="1568">do not send notification</entry>
- <entry key="1569">simple email</entry>
- <entry key="1570">iCal email</entry>
<entry key="1571">OAuth2</entry>
<entry key="1572">Manage OAuth2 configurations</entry>
<entry key="1573">Name</entry>
@@ -1869,4 +1859,14 @@
<entry key="room.type.conference">conference (1-25 users)</entry>
<entry key="room.type.restricted">restricted (1-150 users)</entry>
<entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">å
ç</entry>
+ <entry key="user.salutation.ms">女士</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">é¯è¯¯</entry>
+ <entry key="error.type.info">è¨æ¯</entry>
</properties>
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=1701897&r1=1701896&r2=1701897&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 Wed Sep 9 03:49:07 2015
@@ -24,24 +24,22 @@ import static org.apache.openmeetings.we
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
-import org.apache.openmeetings.db.dao.user.SalutationDao;
import org.apache.openmeetings.db.dao.user.StateDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.OrganisationUser;
-import org.apache.openmeetings.db.entity.user.Salutation;
import org.apache.openmeetings.db.entity.user.State;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Salutation;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.CalendarHelper;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -70,7 +68,6 @@ import com.googlecode.wicket.kendo.ui.re
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
- private Salutation salutation;
private LocalDate age;
private PasswordTextField passwordField;
private RequiredTextField<String> email;
@@ -84,31 +81,21 @@ public class GeneralUserForm extends For
passwordField.setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
updateModelObject(getModelObject());
- SalutationDao salutDao = getBean(SalutationDao.class);
add(new DropDownChoice<Salutation>("salutation"
- , new PropertyModel<Salutation>(this, "salutation")
- , salutDao.get()
+ , Arrays.asList(Salutation.values())
, new ChoiceRenderer<Salutation>() {
private static final long serialVersionUID = 1L;
@Override
public Object getDisplayValue(Salutation object) {
- return getString("" + object.getLabelId());
+ return getString("user.salutation." + object.name());
}
@Override
public String getIdValue(Salutation object, int index) {
- return "" + object.getId();
+ return object.name();
}
- })
- .add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- GeneralUserForm.this.getModelObject().setSalutationId(salutation.getId());
- }
- }));
+ }));
add(new TextField<String>("firstname"));
add(new TextField<String>("lastname"));
@@ -184,7 +171,6 @@ public class GeneralUserForm extends For
}
public void updateModelObject(User u) {
- salutation = getBean(SalutationDao.class).get(u.getSalutationId());
age = CalendarHelper.getDate(u.getAge());
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Wed Sep 9 03:49:07 2015
@@ -37,7 +37,7 @@
</tr>
<tr>
<td><wicket:message key="565" /></td>
- <td><select wicket:id="remind" ></select></td>
+ <td><select wicket:id="reminder" ></select></td>
</tr>
<tr>
<td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td>
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=1701897&r1=1701896&r2=1701897&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 Wed Sep 9 03:49:07 2015
@@ -31,11 +31,10 @@ import java.util.List;
import java.util.Set;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
+import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.OrganisationUser;
@@ -246,9 +245,8 @@ public class AppointmentDialog extends A
super.onModelChanged();
Appointment a = getModelObject();
- List<AppointmentReminderType> remindTypes = getRemindTypes();
- if (a.getRemind() == null && !remindTypes.isEmpty()) {
- a.setRemind(remindTypes.get(0));
+ if (a.getReminder() == null) {
+ a.setReminder(Reminder.none);
}
if (a.getRoom() == null) {
@@ -301,27 +299,26 @@ public class AppointmentDialog extends A
pwd.setOutputMarkupId(true);
add(pwd);
- List<AppointmentReminderType> remindTypes = getRemindTypes();
- add(new DropDownChoice<AppointmentReminderType>(
- "remind"
- , remindTypes
- , new IChoiceRenderer<AppointmentReminderType>() {
+ add(new DropDownChoice<Reminder>(
+ "reminder"
+ , Arrays.asList(Reminder.values())
+ , new IChoiceRenderer<Reminder>() {
private static final long serialVersionUID = 1L;
@Override
- public Object getDisplayValue(AppointmentReminderType art) {
- return getString("" + art.getLabelId());
+ public Object getDisplayValue(Reminder art) {
+ return getString("appointment.reminder." + art.name());
}
@Override
- public String getIdValue(AppointmentReminderType art, int index) {
- return "" + art.getId();
+ public String getIdValue(Reminder art, int index) {
+ return art.name();
}
@Override
- public AppointmentReminderType getObject(String id, IModel<? extends List<? extends AppointmentReminderType>> choices) {
- for (AppointmentReminderType art : choices.getObject()) {
- if (getIdValue(art, -1).equals(id)) {
+ public Reminder getObject(String id, IModel<? extends List<? extends Reminder>> choices) {
+ for (Reminder art : choices.getObject()) {
+ if (art.name().equals(id)) {
return art;
}
}
@@ -356,10 +353,6 @@ public class AppointmentDialog extends A
add(owner);
}
- private List<AppointmentReminderType> getRemindTypes() {
- return getBean(AppointmentReminderTypeDao.class).get();
- }
-
private List<Room> getRoomList() {
//FIXME need to be reviewed
List<Room> result = new ArrayList<Room>();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Wed Sep 9 03:49:07 2015
@@ -27,9 +27,9 @@ import java.util.Date;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.UserPanel;
@@ -84,10 +84,6 @@ public class CalendarPanel extends UserP
return getBean(AppointmentDao.class);
}
- private AppointmentReminderTypeDao getReminderTypeDao() {
- return getBean(AppointmentReminderTypeDao.class);
- }
-
public void refresh(IPartialPageRequestHandler handler) {
calendar.refresh(handler);
}
@@ -265,7 +261,7 @@ public class CalendarPanel extends UserP
private Appointment getDefault() {
Appointment a = new Appointment();
- a.setRemind(getReminderTypeDao().get(3L)); //TODO: Make configurable
+ a.setReminder(Reminder.ical); //TODO: Make configurable
a.setOwner(getBean(UserDao.class).get(getUserId()));
a.setTitle(Application.getString(1444));
log.debug(" -- getDefault -- Current model " + a);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java Wed Sep 9 03:49:07 2015
@@ -29,13 +29,9 @@ import org.apache.wicket.model.IModel;
public class RoomTypeDropDown extends DropDownChoice<Type> {
private static final long serialVersionUID = 1L;
- public static List<Type> getRoomTypes() {
- return Arrays.<Type>asList(Type.values());
- }
-
public RoomTypeDropDown(String id) {
super(id);
- setChoices(getRoomTypes());
+ setChoices(Arrays.asList(Type.values()));
setChoiceRenderer(new IChoiceRenderer<Type>() {
private static final long serialVersionUID = 1L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Wed Sep 9 03:49:07 2015
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,8 +34,6 @@
<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
@@ -61,7 +58,6 @@
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.db.entity.user.Salutation</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
<class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Wed Sep 9 03:49:07 2015
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,8 +34,6 @@
<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
@@ -61,7 +58,6 @@
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.db.entity.user.Salutation</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
<class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Wed Sep 9 03:49:07 2015
@@ -24,7 +24,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -34,8 +33,6 @@
<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
@@ -60,7 +57,6 @@
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.db.entity.user.Salutation</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
<class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Wed Sep 9 03:49:07 2015
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,8 +34,6 @@
<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
@@ -61,7 +58,6 @@
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.db.entity.user.Salutation</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
<class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Wed Sep 9 03:49:07 2015
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,8 +34,6 @@
<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
@@ -61,7 +58,6 @@
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.db.entity.user.Salutation</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
<class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Wed Sep 9 03:49:07 2015
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorType</class>
<class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
@@ -35,8 +34,6 @@
<class>org.apache.openmeetings.db.entity.server.SOAPLogin</class>
<class>org.apache.openmeetings.db.entity.server.Server</class>
<class>org.apache.openmeetings.db.entity.calendar.Appointment</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentCategory</class>
- <class>org.apache.openmeetings.db.entity.calendar.AppointmentReminderType</class>
<class>org.apache.openmeetings.db.entity.calendar.MeetingMember</class>
<class>org.apache.openmeetings.db.entity.basic.ChatMessage</class>
<class>org.apache.openmeetings.db.entity.user.Organisation</class>
@@ -61,7 +58,6 @@
<class>org.apache.openmeetings.db.entity.user.State</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
- <class>org.apache.openmeetings.db.entity.user.Salutation</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
<class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
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=1701897&r1=1701896&r2=1701897&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 Wed Sep 9 03:49:07 2015
@@ -193,8 +193,6 @@
<!-- End of Services -->
<!-- Interface Transactional -->
- <bean id="appointmentReminderTypeDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao" />
- <bean id="appointmentCategoryDaoImpl" class="org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao" />
<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">
@@ -208,7 +206,6 @@
<bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" />
<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" />
<bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" />
<bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" />
<bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/calendar.css Wed Sep 9 03:49:07 2015
@@ -37,7 +37,7 @@
height: 80px;
}
-.appointmentPopUp select[name="remind"] {
+.appointmentPopUp select[name="reminder"] {
width: 426px;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/errorvalues.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/errorvalues.xml?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/errorvalues.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/errorvalues.xml Wed Sep 9 03:49:07 2015
@@ -26,7 +26,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">334</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">2</field>
@@ -34,7 +34,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">319</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">3</field>
@@ -42,7 +42,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">320</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">4</field>
@@ -50,7 +50,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">321</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">5</field>
@@ -58,7 +58,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">324</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">6</field>
@@ -66,7 +66,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">330</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">7</field>
@@ -74,7 +74,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">331</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">8</field>
@@ -82,7 +82,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">332</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">9</field>
@@ -90,7 +90,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">318</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">10</field>
@@ -98,7 +98,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">335</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">11</field>
@@ -106,7 +106,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">336</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">12</field>
@@ -114,7 +114,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">337</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">13</field>
@@ -122,7 +122,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">103</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">14</field>
@@ -130,7 +130,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">338</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">15</field>
@@ -138,7 +138,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">105</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">16</field>
@@ -146,7 +146,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">107</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">17</field>
@@ -154,7 +154,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">106</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">18</field>
@@ -162,7 +162,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">236</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">19</field>
@@ -170,7 +170,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">339</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">20</field>
@@ -178,7 +178,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">340</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">21</field>
@@ -186,7 +186,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">341</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">22</field>
@@ -194,7 +194,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">342</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">23</field>
@@ -202,7 +202,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">343</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">24</field>
@@ -210,7 +210,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">345</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">25</field>
@@ -218,7 +218,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">346</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">26</field>
@@ -226,7 +226,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">347</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">27</field>
@@ -234,7 +234,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">358</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">28</field>
@@ -242,7 +242,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">357</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">29</field>
@@ -250,7 +250,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">358</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">30</field>
@@ -258,7 +258,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">403</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">31</field>
@@ -266,7 +266,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">533</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">32</field>
@@ -274,7 +274,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">534</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">33</field>
@@ -282,7 +282,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">535</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">34</field>
@@ -290,7 +290,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">538</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">35</field>
@@ -298,7 +298,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">276</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">36</field>
@@ -306,7 +306,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">664</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">37</field>
@@ -314,7 +314,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">665</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">38</field>
@@ -322,7 +322,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">663</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">39</field>
@@ -330,7 +330,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">666</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">40</field>
@@ -338,7 +338,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">674</field>
- <field name="errortype_id">2</field>
+ <field name="type">info</field>
</row>
<row>
<field name="errorvalues_id">41</field>
@@ -346,7 +346,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">673</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">42</field>
@@ -354,7 +354,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">787</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">43</field>
@@ -362,7 +362,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">920</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">44</field>
@@ -370,7 +370,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1000</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">45</field>
@@ -378,7 +378,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1195</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">46</field>
@@ -386,7 +386,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1226</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">47</field>
@@ -394,7 +394,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1227</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">48</field>
@@ -402,7 +402,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1228</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">49</field>
@@ -410,7 +410,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1231</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">50</field>
@@ -418,7 +418,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1271</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">51</field>
@@ -426,7 +426,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1309</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">52</field>
@@ -434,7 +434,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1310</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">53</field>
@@ -442,7 +442,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1416</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">54</field>
@@ -450,7 +450,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1431</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">55</field>
@@ -458,7 +458,7 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1540</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
<row>
<field name="errorvalues_id">56</field>
@@ -466,6 +466,6 @@
<field name="updatetime" />
<field name="deleted">false</field>
<field name="fieldvalues_id">1544</field>
- <field name="errortype_id">1</field>
+ <field name="type">error</field>
</row>
</ROOT>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Wed Sep 9 03:49:07 2015
@@ -22,14 +22,11 @@ import static org.apache.openmeetings.ut
import static org.junit.Assert.assertNotNull;
import java.util.Date;
-import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.installation.ImportInitvalues;
@@ -51,15 +48,11 @@ public abstract class AbstractJUnitDefau
@Autowired
private AppointmentDao appointmentDao;
@Autowired
- private AppointmentReminderTypeDao reminderTypeDao;
- @Autowired
private UserDao userDao;
@Autowired
private ImportInitvalues importInitvalues;
@Autowired
private ConfigurationDao configurationDao;
-
- private List<AppointmentReminderType> remindTypes;
@Before
public void setUp() throws Exception {
@@ -74,7 +67,6 @@ public abstract class AbstractJUnitDefau
if (configKeyCryptClassName == null) {
assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
}
- remindTypes = reminderTypeDao.get();
}
public Appointment createAppointment() {
@@ -107,8 +99,8 @@ public abstract class AbstractJUnitDefau
ap.setOwner(userDao.get(1L));
ap.setConnectedEvent(false);
- if (ap.getRemind() == null && !remindTypes.isEmpty()) {
- ap.setRemind(remindTypes.get(0));
+ if (ap.getReminder() == null) {
+ ap.setReminder(Appointment.Reminder.none);
}
Room r = new Room();
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Wed Sep 9 03:49:07 2015
@@ -37,16 +37,12 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
-import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
-import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypeDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.calendar.AppointmentDTO;
-import org.apache.openmeetings.db.dto.calendar.AppointmentReminderTypeDTO;
import org.apache.openmeetings.db.entity.calendar.Appointment;
-import org.apache.openmeetings.db.entity.calendar.AppointmentCategory;
-import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType;
+import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User.Right;
@@ -79,10 +75,6 @@ public class CalendarWebService {
private SessiondataDao sessionDao;
@Autowired
private UserDao userDao;
- @Autowired
- private AppointmentCategoryDao appointmentCategoryDao;
- @Autowired
- private AppointmentReminderTypeDao reminderTypeDao;
/**
* Load appointments by a start / end range for the current SID
@@ -283,7 +275,7 @@ public class CalendarWebService {
log.debug("save userId:" + userId);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- Appointment a = appointment.get(userDao, appointmentDao, reminderTypeDao);
+ Appointment a = appointment.get(userDao, appointmentDao);
return new AppointmentDTO(appointmentDao.update(a, userId));
} else {
log.error("save : wrong user level");
@@ -383,8 +375,7 @@ public class CalendarWebService {
a.setIsWeekly(isWeekly);
a.setIsMonthly(isMonthly);
a.setIsYearly(isYearly);
- a.setCategory(appointmentCategoryDao.get(categoryId));
- a.setRemind(reminderTypeDao.get(remind));
+ a.setReminder(Reminder.get(remind));
a.getRoom().setComment(appointmentDescription);
a.getRoom().setName(appointmentName);
a.getRoom().setType(Room.Type.get(roomType));
@@ -447,69 +438,6 @@ public class CalendarWebService {
}
/**
- * Get all categories of calendar events
- *
- * @param SID
- * @return - all categories of calendar events
- */
- public List<AppointmentCategory> getAppointmentCategoryList(String SID) {
- log.debug("AppointmenetCategoryService.getAppointmentCategoryList SID : " + SID);
-
- try {
- Long userId = sessionDao.checkSession(SID);
-
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<AppointmentCategory> res = appointmentCategoryDao.getAppointmentCategoryList();
-
- if (res == null || res.size() < 1) {
- log.debug("no AppointmentCategories found");
- } else {
- for (int i = 0; i < res.size(); i++) {
- AppointmentCategory ac = res.get(i);
- log.debug("found appCategory : " + ac.getName());
- }
- }
-
- return res;
- } else {
- log.error("AppointmenetCategoryService.getAppointmentCategoryList : UserLevel Error");
- }
- } catch (Exception err) {
- log.error("[getAppointmentCategory]", err);
- }
- return null;
-
- }
-
- private List<AppointmentReminderTypeDTO> getReminders(List<AppointmentReminderType> list) {
- List<AppointmentReminderTypeDTO> result = new ArrayList<>(list.size());
- for (AppointmentReminderType rt : list) {
- result.add(new AppointmentReminderTypeDTO(rt));
- }
- return result;
- }
- /**
- * Get all reminder types for calendar events
- *
- * @param SID
- * @return - all reminder types for calendar events
- */
- public List<AppointmentReminderTypeDTO> getAppointmentReminderTypList(String SID) {
- log.debug("getAppointmentReminderTypList");
-
- try {
- Long userId = sessionDao.checkSession(SID);
- if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return getReminders(reminderTypeDao.get());
- } else
- log.debug("getAppointmentReminderTypList :error - wrong authlevel!");
- } catch (Exception err) {
- log.error("[getAppointmentReminderTypList]", err);
- }
- return null;
- }
-
- /**
* Adds a conference room that is only available for a period of time
*
* @param SID
@@ -560,7 +488,7 @@ public class CalendarWebService {
*
* @return - id of the room in case of success, error code otherwise
* @throws ServiceException
- *//*
+ */
public Long addRoomWithModerationAndExternalTypeAndStartEnd(String SID,
String name, Long roomtypesId, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
@@ -581,7 +509,7 @@ public class CalendarWebService {
log.info("validFromHour: " + validFromHour);
log.info("validFromMinute: " + validFromMinute);
-
+/*
Date fromDate = CalendarPatterns.parseDateBySeparator(validFromDate); // dd.MM.yyyy
Date toDate = CalendarPatterns.parseDateBySeparator(validToDate); // dd.MM.yyyy
@@ -635,7 +563,7 @@ public class CalendarWebService {
appointmentDao.update(a, userId); //FIXME verify !!!
return roomId;
-
+*/
} else {
return -2L;
}
@@ -644,10 +572,10 @@ public class CalendarWebService {
throw new ServiceException(err.getMessage());
}
- // return new Long(-1);
+ return new Long(-1);
// return numberOfPartizipants;
}
-*/
+
/**
* Add a meeting member to a certain room. This is the same as adding an
* external user to a event in the calendar.
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1701897&r1=1701896&r2=1701897&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java Wed Sep 9 03:49:07 2015
@@ -32,7 +32,6 @@ import org.apache.cxf.feature.Features;
import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
-import org.apache.openmeetings.db.entity.basic.ErrorType;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -78,11 +77,10 @@ public class ErrorWebService {
if (id < 0) {
ErrorValue eValues = errorDao.get(-1 * id);
if (eValues != null) {
- ErrorType eType = errorDao.getErrorType(eValues.getTypeId());
log.debug("eValues.getLabelId() = " + eValues.getLabelId());
- log.debug("eValues.getErrorType() = " + eType);
+ log.debug("eValues.getErrorType() = " + eValues.getType());
String eValue = labelDao.getString(eValues.getLabelId(), lang);
- String tValue = labelDao.getString(eType.getLabelId(), lang);
+ String tValue = labelDao.getString("error.type." + eValues.getType().name(), lang);
if (eValue != null) {
return new ServiceResult(id, eValue, tValue);
}