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 2013/09/12 04:13:12 UTC
svn commit: r1522128 - in /openmeetings/trunk/singlewebapp: docs/
src/main/java/org/apache/openmeetings/axis/services/
src/main/java/org/apache/openmeetings/data/calendar/management/
src/test/java/org/apache/openmeetings/test/calendar/
Author: solomax
Date: Thu Sep 12 02:13:12 2013
New Revision: 1522128
URL: http://svn.apache.org/r1522128
Log:
[OPENMEETINGS-777] methods not designed to be available through WebService are hidden
Modified:
openmeetings/trunk/singlewebapp/docs/CalendarService.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
Modified: openmeetings/trunk/singlewebapp/docs/CalendarService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/CalendarService.html?rev=1522128&r1=1522127&r2=1522128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/CalendarService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/CalendarService.html Thu Sep 12 02:13:12 2013
@@ -67,10 +67,6 @@ limitations under the License.
<div class="navigation_comment"><i >Search a calendar event for the current SID</i></div>
</div>
<div>
- <a href="#getAppointment"><b>getAppointment</b></a><br/>
- <div class="navigation_comment"><i ></i></div>
- </div>
- <div>
<a href="#saveAppointment"><b>saveAppointment</b></a><br/>
<div class="navigation_comment"><i >Save an appointment</i></div>
</div>
@@ -384,68 +380,6 @@ limitations under the License.
<div class="method">
<div class="method_header">
<div style="margin-left:10px">
- <a name="getAppointment" ><b>getAppointment</b></a>
- </div>
- </div>
-
- Method: <i>getAppointment (
- String appointmentName
- ,
- String appointmentLocation
- ,
- String appointmentDescription
- ,
- Calendar appointmentstart
- ,
- Calendar appointmentend
- ,
- Boolean isDaily
- ,
- Boolean isWeekly
- ,
- Boolean isMonthly
- ,
- Boolean isYearly
- ,
- Long categoryId
- ,
- Long remind
- ,
- String mmClient
- ,
- Long roomType
- ,
- String baseUrl
- ,
- Long languageId
- ,
- Boolean isPasswordProtected
- ,
- String password
- ,
- long roomId
- ,
- Long users_id
- )
- </i><br/>
- <p>
-
- </p>
- <p>
- Return Type: org.apache.openmeetings.persistence.beans.calendar.Appointment
- </p>
- <p>Params:</p>
- <b>Warning:</b><i> Params in this method do not seem to be correctly documentated</i>
- <br/><br/>
-
- <i>No Params</i>
- <br/>
- REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/CalendarService/getAppointment?appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseUrl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE&users_id=VALUE">http://localhost:5080/openmeetings/services/CalendarService/getAppointment?appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointme
ntstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseUrl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE&users_id=VALUE</a>
- </div>
- <div class="method">
- <div class="method_header">
- <div style="margin-left:10px">
<a name="saveAppointment" ><b>saveAppointment</b></a>
</div>
</div>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1522128&r1=1522127&r2=1522128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java Thu Sep 12 02:13:12 2013
@@ -32,7 +32,6 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
-import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.RoomDao;
@@ -42,7 +41,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
-import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.web.app.WebSession;
@@ -82,8 +80,6 @@ public class CalendarWebService {
private AppointmentReminderTypDao appointmentReminderTypDao;
@Autowired
private TimezoneUtil timezoneUtil;
- @Autowired
- private MeetingMemberDao meetingMemberDao;
/**
* Load appointments by a start / end range for the current SID
@@ -223,63 +219,6 @@ public class CalendarWebService {
}
- private MeetingMember getMeetingMember(Long userId, Long langId, String str) {
- String[] params = str.split(",");
-
- try {
- return meetingMemberDao.get(Long.valueOf(params[0]));
- } catch (Exception e) {
- //no-op
- }
- MeetingMember mm = new MeetingMember();
- try {
- mm.setUser(userDao.get(Long.valueOf(params[4])));
- } catch (Exception e) {
- //no-op
- }
- if (mm.getUser() == null) {
- mm.setUser(userDao.getContact(params[3], params[1], params[2], langId, params[5], userId));
- }
-
- return mm;
- }
-
- public Appointment getAppointment(String appointmentName,
- String appointmentLocation, String appointmentDescription,
- Calendar appointmentstart, Calendar appointmentend,
- Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
- Boolean isYearly, Long categoryId, Long remind, String[] mmClient,
- Long roomType, String baseUrl, Long languageId,
- Boolean isPasswordProtected, String password, long roomId, Long users_id) {
- Appointment a = new Appointment();
- a.setTitle(appointmentName);
- a.setLocation(appointmentLocation);
- a.setDescription(appointmentDescription);
- a.setStart(appointmentstart.getTime());
- a.setEnd(appointmentend.getTime());
- a.setIsDaily(isDaily);
- a.setIsWeekly(isWeekly);
- a.setIsMonthly(isMonthly);
- a.setIsYearly(isYearly);
- a.setCategory(appointmentCategoryDao.get(categoryId));
- a.setRemind(appointmentReminderTypDao.get(remind));
- WebSession.get().setBaseUrl(baseUrl); //TODO verify !!!!!
- a.setRoom(new Room());
- a.getRoom().setComment(appointmentDescription);
- a.getRoom().setName(appointmentName);
- a.getRoom().setRooms_id(roomId);
- a.getRoom().setRoomtype(roomManager.getRoomTypesById(roomType));
- a.setOwner(userDao.get(users_id));
- a.setPasswordProtected(isPasswordProtected);
- a.setPassword(password);
- a.setMeetingMembers(new ArrayList<MeetingMember>());
- for (String singleClient : mmClient) {
- MeetingMember mm = getMeetingMember(users_id, languageId, singleClient);
- mm.setAppointment(a);
- a.getMeetingMembers().add(mm);
- }
- return a;
- }
/**
* Save an appointment
*
@@ -350,7 +289,7 @@ public class CalendarWebService {
Long user_level = userManager.getUserLevelByID(users_id);
if (authLevelUtil.checkUserLevel(user_level)) {
- Appointment a = getAppointment(appointmentName, appointmentLocation, appointmentDescription,
+ Appointment a = appointmentLogic.getAppointment(appointmentName, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly, isMonthly, isYearly, categoryId, remind,
mmClient, roomType, baseUrl, languageId, isPasswordProtected, password, roomId, users_id);
return appointmentDao.update(a, baseUrl, users_id).getId();
@@ -511,7 +450,7 @@ public class CalendarWebService {
a.setPassword(password);
a.setMeetingMembers(new ArrayList<MeetingMember>());
for (String singleClient : mmClient) {
- MeetingMember mm = getMeetingMember(users_id, languageId, singleClient);
+ MeetingMember mm = appointmentLogic.getMeetingMember(users_id, languageId, singleClient);
mm.setAppointment(a);
a.getMeetingMembers().add(mm);
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1522128&r1=1522127&r2=1522128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Thu Sep 12 02:13:12 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.data.cal
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -27,16 +28,22 @@ import java.util.TimeZone;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
+import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.InvitationManager;
+import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.InvitationDao;
import org.apache.openmeetings.data.conference.dao.RoomDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.invitation.Invitation;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.web.app.WebSession;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +54,10 @@ public class AppointmentLogic {
@Autowired
private AppointmentDao appointmentDao;
@Autowired
+ private AppointmentCategoryDao appointmentCategoryDao;
+ @Autowired
+ private AppointmentReminderTypDao appointmentReminderTypDao;
+ @Autowired
private ConfigurationDao configurationDao;
@Autowired
private FieldManager fieldManager;
@@ -58,6 +69,12 @@ public class AppointmentLogic {
private TimezoneUtil timezoneUtil;
@Autowired
private InvitationDao invitationDao;
+ @Autowired
+ private RoomManager roomManager;
+ @Autowired
+ private AdminUserDao userDao;
+ @Autowired
+ private MeetingMemberDao meetingMemberDao;
private static int DEFAULT_MINUTES_REMINDER_SEND = 15;
@@ -253,4 +270,62 @@ public class AppointmentLogic {
return message.toString();
}
+
+ public Appointment getAppointment(String appointmentName,
+ String appointmentLocation, String appointmentDescription,
+ Calendar appointmentstart, Calendar appointmentend,
+ Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
+ Boolean isYearly, Long categoryId, Long remind, String[] mmClient,
+ Long roomType, String baseUrl, Long languageId,
+ Boolean isPasswordProtected, String password, long roomId, Long users_id) {
+ Appointment a = new Appointment();
+ a.setTitle(appointmentName);
+ a.setLocation(appointmentLocation);
+ a.setDescription(appointmentDescription);
+ a.setStart(appointmentstart.getTime());
+ a.setEnd(appointmentend.getTime());
+ a.setIsDaily(isDaily);
+ a.setIsWeekly(isWeekly);
+ a.setIsMonthly(isMonthly);
+ a.setIsYearly(isYearly);
+ a.setCategory(appointmentCategoryDao.get(categoryId));
+ a.setRemind(appointmentReminderTypDao.get(remind));
+ WebSession.get().setBaseUrl(baseUrl); //TODO verify !!!!!
+ a.setRoom(new Room());
+ a.getRoom().setComment(appointmentDescription);
+ a.getRoom().setName(appointmentName);
+ a.getRoom().setRooms_id(roomId);
+ a.getRoom().setRoomtype(roomManager.getRoomTypesById(roomType));
+ a.setOwner(userDao.get(users_id));
+ a.setPasswordProtected(isPasswordProtected);
+ a.setPassword(password);
+ a.setMeetingMembers(new ArrayList<MeetingMember>());
+ for (String singleClient : mmClient) {
+ MeetingMember mm = getMeetingMember(users_id, languageId, singleClient);
+ mm.setAppointment(a);
+ a.getMeetingMembers().add(mm);
+ }
+ return a;
+ }
+
+ public MeetingMember getMeetingMember(Long userId, Long langId, String str) {
+ String[] params = str.split(",");
+
+ try {
+ return meetingMemberDao.get(Long.valueOf(params[0]));
+ } catch (Exception e) {
+ //no-op
+ }
+ MeetingMember mm = new MeetingMember();
+ try {
+ mm.setUser(userDao.get(Long.valueOf(params[4])));
+ } catch (Exception e) {
+ //no-op
+ }
+ if (mm.getUser() == null) {
+ mm.setUser(userDao.getContact(params[3], params[1], params[2], langId, params[5], userId));
+ }
+
+ return mm;
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1522128&r1=1522127&r2=1522128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Thu Sep 12 02:13:12 2013
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertTru
import java.util.Calendar;
-import org.apache.openmeetings.axis.services.CalendarWebService;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -36,8 +35,6 @@ public class TestAppointmentAddAppointme
private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentAddAppointment.class, webAppRootKey);
@Autowired
- private CalendarWebService calendarWebService;
- @Autowired
private AppointmentLogic appointmentLogic;
@Autowired
private AppointmentDao appointmentDao;
@@ -72,7 +69,7 @@ public class TestAppointmentAddAppointme
String baseUrl = "http://localhost:5080/openmeetings/";
Long roomType = 1L;
- Appointment a = calendarWebService.getAppointment(appointmentName,
+ Appointment a = appointmentLogic.getAppointment(appointmentName,
appointmentLocation, appointmentDescription,
start, end, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, mmClient,