You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/03/17 10:12:57 UTC
svn commit: r1301899 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/modules/lzcalendar/
WebContent/src/modules/lzcalendar/compontents/
src/app/org/openmeetings/app/data/calendar/beans/
src/app/org/openmeetings/app/data/calendar/daos/ s...
Author: sebawagner
Date: Sat Mar 17 09:12:55 2012
New Revision: 1301899
URL: http://svn.apache.org/viewvc?rev=1301899&view=rev
Log:
Fixes OPENMEETINGS-91 Fix field type's of comment/description fields to use datatype Text (instead of VARCHAR(255))
OPENMEETINGS-7 - Fix save/update with roomtype, persist isPasswordProtected / password
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/Appointment.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/Userdata.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestAddGroup.java
incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java
incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx Sat Mar 17 09:12:55 2012
@@ -110,6 +110,8 @@
updateObj.categoryId = 1;
updateObj.remind = this._reminderType.getValue();
updateObj.roomType = this._roomType.getValue();
+ updateObj.isPasswordProtected = this._ispasswordProtected.getValue();
+ updateObj.password = this._password.getText();
if ($debug) Debug.write("appointmentId: ",updateObj.appointmentId);
@@ -141,6 +143,8 @@
<netparam><method name="getValue">return parent.parent.updateObj.roomType;</method></netparam>
<netparam><method name="getValue">return parent.parent.baseUrl;</method></netparam>
<netparam><method name="getValue">return hib.userlang;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.updateObj.isPasswordProtected;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.updateObj.password;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("saveAppointment ",value);
@@ -169,6 +173,8 @@
<netparam><method name="getValue">return parent.parent.updateObj.roomType;</method></netparam>
<netparam><method name="getValue">return parent.parent.baseUrl;</method></netparam>
<netparam><method name="getValue">return hib.userlang;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.updateObj.isPasswordProtected;</method></netparam>
+ <netparam><method name="getValue">return parent.parent.updateObj.password;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("updateAppointment ",value);
@@ -246,7 +252,15 @@
<!-- Roomtype -->
<labelText name="_roomTypeLabel" x="4" y="102" labelid="619" fontstyle="bold" />
- <resetCombobox name="_roomType" width="$once{ parent.width-110 }" y="102" x="100" editable="false" fontsize="11">
+ <resetCombobox name="_roomType" width="$once{ parent.width-110 }" y="102" x="100" editable="false"
+ datapath="local:classroot.eventDS:/roomTypeId">
+ <handler name="ondata" args="roomTypeIdNode">
+ if ($debug) Debug.write("remindtype ondata 1: ", roomTypeIdNode.childNodes[0].data);
+ var remTypeId = Number(roomTypeIdNode.childNodes[0].data);
+ if (remTypeId > 0) {
+ this.selectItem(remTypeId);
+ }
+ </handler>
<handler name="oninit" >
<![CDATA[
for (var i=0;i<canvas.roomTypesInitValues.length;i++){
@@ -356,7 +370,6 @@
this.jNameTimeZone = tDataPointer.xpathQuery( 'jNameTimeZone/text()' );
this.memberText.setAttribute("text",this.firstName+' '+this.lastName+' ['+this.email+']');
</handler>
-
</attendeeListItem>
<simplelayout axis="y" spacing="1" />
</view>
@@ -367,13 +380,16 @@
<!-- Location -->
<labelText name="_locationLabel" x="4" y="304" labelid="569" fontstyle="bold" />
- <customEdittext name="_location" width="$once{ parent.width-110 }" x="100" y="304" />
+ <customEdittext name="_location"
+ datapath="local:classroot.eventDS:/location" text="$path{'text()'}"
+ width="$once{ parent.width-110 }" x="100" y="304" />
<!-- Comment -->
<labelText name="_descrLabel" x="4" y="330" labelid="573" fontstyle="bold" />
- <customScrollEdittext name="_descr" y="330" x="100" width="$once{ parent.width-110 }"
- height="124" text="" />
+ <customScrollEdittext name="_descr" y="330" x="100"
+ datapath="local:classroot.eventDS:/comment" text="$path{'text()'}"
+ width="$once{ parent.width-110 }" height="124" />
<simpleLabelButton labelid="813" width="100" x="$once{ parent.width-315 }"
y="$once{ parent.height-24 }" >
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx Sat Mar 17 09:12:55 2012
@@ -146,6 +146,7 @@
newAppointment.roomsId = 0;
newAppointment.location = "";
newAppointment.isPasswordProtected = false;
+ newAppointment.roomTypeId = 1;
return newAppointment;
]]>
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/beans/AppointmentDTO.java Sat Mar 17 09:12:55 2012
@@ -13,6 +13,7 @@ public class AppointmentDTO {
private Long categoryId;
private Long reminderId;
private Long roomId;
+ private Long roomTypeId;
private String title;
private String location;
private String comment;
@@ -29,6 +30,9 @@ public class AppointmentDTO {
.getRemind().getTypId() : null;
roomId = (appointment.getRoom() != null) ? appointment.getRoom()
.getRooms_id() : null;
+ roomTypeId = (roomId != null && appointment.getRoom().getRoomtype() != null) ? appointment
+ .getRoom().getRoomtype().getRoomtypes_id()
+ : null;
title = appointment.getAppointmentName();
location = appointment.getAppointmentLocation();
comment = appointment.getAppointmentDescription();
@@ -132,4 +136,12 @@ public class AppointmentDTO {
this.meetingMember = meetingMember;
}
+ public Long getRoomTypeId() {
+ return roomTypeId;
+ }
+
+ public void setRoomTypeId(Long roomTypeId) {
+ this.roomTypeId = roomTypeId;
+ }
+
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java Sat Mar 17 09:12:55 2012
@@ -421,7 +421,7 @@ public class AppointmentDaoImpl {
Date appointmentend, Boolean isDaily, Boolean isWeekly,
Boolean isMonthly, Boolean isYearly, Long categoryId, Long remind,
@SuppressWarnings("rawtypes") List mmClient, Long users_id, String baseUrl, Long language_id,
- Boolean isPasswordProtected, String password, String iCalTimeZone) {
+ Boolean isPasswordProtected, String password, String iCalTimeZone, String appointmentLocation) {
log.debug("AppointmentDAOImpl.updateAppointment");
try {
@@ -448,6 +448,7 @@ public class AppointmentDaoImpl {
appointmentstart, appointmentend);
ap.setAppointmentName(appointmentName);
+ ap.setAppointmentLocation(appointmentLocation);
ap.setAppointmentStarttime(appointmentstart);
ap.setAppointmentEndtime(appointmentend);
ap.setAppointmentDescription(appointmentDescription);
@@ -605,7 +606,9 @@ public class AppointmentDaoImpl {
sendToUserId, // sending To: External users have
// a 0 here
new Boolean(false), // invitor
- language_id, isPasswordProtected, password,
+ language_id,
+ isPasswordProtected,
+ password,
timezoneMember, omTimeZone, invitorName);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentReminderTypDaoImpl.java Sat Mar 17 09:12:55 2012
@@ -95,8 +95,7 @@ public class AppointmentReminderTypDaoIm
return null;
}
- public Long addAppointmentReminderTyps(Long user_id, String name,
- String comment) {
+ public Long addAppointmentReminderTyps(Long user_id, String name) {
try {
AppointmentReminderTyps ac = new AppointmentReminderTyps();
@@ -105,7 +104,6 @@ public class AppointmentReminderTypDaoIm
ac.setStarttime(new Date());
ac.setDeleted("false");
ac.setUser(usersDao.getUser(user_id));
- ac.setComment(comment);
ac = em.merge(ac);
Long category_id = ac.getTypId();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java Sat Mar 17 09:12:55 2012
@@ -144,7 +144,8 @@ public class AppointmentLogic {
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
Boolean isYearly, Long categoryId, Long remind,
@SuppressWarnings("rawtypes") List mmClient, Long roomType,
- String baseUrl, Long language_id) {
+ String baseUrl, Long language_id, Boolean isPasswordProtected,
+ String password) {
log.debug("Appointmentlogic.saveAppointment");
@@ -212,7 +213,7 @@ public class AppointmentLogic {
userId, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, room, language_id,
- false, "", false, user.getOmTimeZone().getJname());
+ isPasswordProtected, password, false, user.getOmTimeZone().getJname());
String invitorName = user.getFirstname() + " " + user.getLastname()
+ " [" + user.getAdresses().getEmail() + "]";
@@ -221,7 +222,7 @@ public class AppointmentLogic {
meetingMemberLogic.addMeetingMember(user.getFirstname(), user
.getLastname(), "", "", appointmentId, userId, user
.getAdresses().getEmail(), baseUrl, userId, true,
- language_id, false, "", timezone, user.getOmTimeZone(),
+ language_id, isPasswordProtected, password, timezone, user.getOmTimeZone(),
invitorName);
// iterate through all members of this meeting and add them to the
@@ -292,8 +293,8 @@ public class AppointmentLogic {
userId, // meeting_organizer
new Boolean(false), // invitor
language_id, //language_id
- false, // isPasswordProtected
- "", // password
+ isPasswordProtected, // isPasswordProtected
+ password, // password
timezoneMember, omTimeZone, invitorName);
}
@@ -570,60 +571,6 @@ public class AppointmentLogic {
return message;
}
- // ----------------------------------------------------------------------------------------------
-
- /**
- *
- * @param appointmentId
- * @param appointmentName
- * @param appointmentDescription
- * @param appointmentstart
- * @param appointmentend
- * @param isDaily
- * @param isWeekly
- * @param isMonthly
- * @param isYearly
- * @param categoryId
- * @param remind
- * @param mmClient
- * @return
- */
- public Long updateAppointment(Long appointmentId, String appointmentName,
- String appointmentDescription, Date appointmentstart,
- Date appointmentend, Boolean isDaily, Boolean isWeekly,
- Boolean isMonthly, Boolean isYearly, Long categoryId, Long remind,
- @SuppressWarnings("rawtypes") List mmClient, Long user_id,
- String baseUrl, Long language_id, Boolean isPasswordProtected,
- String password, String iCalTimeZone) {
-
- try {
-
- return appointmentDao.updateAppointment(appointmentId,
- appointmentName, appointmentDescription, appointmentstart,
- appointmentend, isDaily, isWeekly, isMonthly, isYearly,
- categoryId, remind, mmClient, user_id, baseUrl,
- language_id, isPasswordProtected, password, iCalTimeZone);
-
- } catch (Exception err) {
- log.error("[updateAppointment]", err);
- }
- return null;
- }
-
- public Long updateAppointmentByTime(Long appointmentId,
- Date appointmentstart, Date appointmentend, Long user_id,
- String baseUrl, Long language_id, String iCalTimeZone) {
-
- try {
- return appointmentDao.updateAppointmentByTime(appointmentId,
- appointmentstart, appointmentend, user_id, baseUrl,
- language_id, iCalTimeZone);
- } catch (Exception err) {
- log.error("[updateAppointment]", err);
- }
- return null;
- }
-
/**
* Updating AppointMent object
*/
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Organisationmanagement.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Organisationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Organisationmanagement.java Sat Mar 17 09:12:55 2012
@@ -327,7 +327,7 @@ public class Organisationmanagement {
for (Iterator<Long> it = usersToAdd.iterator(); it.hasNext();) {
Long user_id = it.next();
this.addUserToOrganisation(user_id, org.getOrganisation_id(),
- insertedby, "");
+ insertedby);
}
for (Iterator<Long> it = usersToDel.iterator(); it.hasNext();) {
@@ -461,10 +461,10 @@ public class Organisationmanagement {
* @return
*/
public Long addUserToOrganisation(Long user_id, Long organisation_id,
- Long insertedby, String comment) {
+ Long insertedby) {
try {
if (this.getOrganisation_UserByUserAndOrganisation(user_id, organisation_id) == null) {
- return addOrganisationUserObj(user_id, getOrgUser(organisation_id, insertedby, comment));
+ return addOrganisationUserObj(user_id, getOrgUser(organisation_id, insertedby));
} else {
return -35L;
}
@@ -475,12 +475,11 @@ public class Organisationmanagement {
}
public Organisation_Users getOrgUser(Long organisation_id,
- Long insertedby, String comment) {
+ Long insertedby) {
Organisation_Users orgUser = new Organisation_Users();
orgUser.setOrganisation(getOrganisationById(organisation_id));
orgUser.setDeleted("false");
- orgUser.setComment(comment);
return orgUser;
}
@@ -787,7 +786,7 @@ public class Organisationmanagement {
// log.error("updateUserOrganisationsByUser size ADD: "+orgIdsToAdd.size());
for (Long orgToAdd : orgIdsToAdd) {
this.addUserToOrganisation(us.getUser_id(), orgToAdd,
- us.getUser_id(), "");
+ us.getUser_id());
}
// log.error("updateUserOrganisationsByUser size DELETE: "+orgIdsToDelete.size());
@@ -817,7 +816,7 @@ public class Organisationmanagement {
for (Iterator it = org.iterator(); it.hasNext();) {
Integer key = (Integer) it.next();
Long newOrgId = key.longValue();
- this.addUserToOrganisation(us, newOrgId, new Long(1), "");
+ this.addUserToOrganisation(us, newOrgId, new Long(1));
}
}
} catch (Exception ex) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java Sat Mar 17 09:12:55 2012
@@ -1123,7 +1123,7 @@ public class Usermanagement {
//new user add organizations without checks
List<Organisation_Users> orgList = users.getOrganisation_users();
for (Long orgId : orgIds) {
- orgList.add(organisationmanagement.getOrgUser(orgId, null, ""));
+ orgList.add(organisationmanagement.getOrgUser(orgId, null));
}
return addUser(users);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java Sat Mar 17 09:12:55 2012
@@ -854,11 +854,11 @@ public class ImportInitvalues {
try {
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "do not send notification", "no reminder");
+ "do not send notification");
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "simple email", "simple email notification");
+ "simple email");
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "iCal email", "Ical notification");
+ "iCal email");
} catch (Exception e) {
log.error("Could not create ReminderType");
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapLoginManagement.java Sat Mar 17 09:12:55 2012
@@ -713,7 +713,7 @@ public class LdapLoginManagement {
log.debug("Adding user '" + newUserId + "' to organization '"
+ organisation_id + "'");
organisationmanagement.addUserToOrganisation(newUserId,
- organisation_id, newUserId, "");
+ organisation_id, newUserId);
}
return newUserId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java Sat Mar 17 09:12:55 2012
@@ -28,6 +28,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -42,7 +43,8 @@ public class Adresses implements Seriali
private Long adresses_id;
@Column(name = "additionalname")
private String additionalname;
- @Column(name = "comment_field")
+ @Lob
+ @Column(name = "comment_field", length=2048)
private String comment;
@Column(name = "fax")
private String fax;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/basic/Configuration.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/basic/Configuration.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/basic/Configuration.java Sat Mar 17 09:12:55 2012
@@ -29,6 +29,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -50,7 +51,8 @@ public class Configuration implements Se
private Date starttime;
@Column(name="updatetime")
private Date updatetime;
- @Column(name="comment_field")
+ @Lob
+ @Column(name="comment_field", length=2048)
private String comment;
@Column(name="deleted")
private String deleted;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/Appointment.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/Appointment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/Appointment.java Sat Mar 17 09:12:55 2012
@@ -30,6 +30,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -54,7 +55,8 @@ public class Appointment implements Seri
private Date appointmentStarttime;
@Column(name = "appointment_endtime")
private Date appointmentEndtime;
- @Column(name = "description")
+ @Lob
+ @Column(name = "description", length=2048)
private String appointmentDescription;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "category_id", nullable = true)
@@ -69,8 +71,6 @@ public class Appointment implements Seri
private Date updatetime;
@Column(name = "deleted")
private String deleted;
- @Column(name = "comment_field")
- private String comment;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "remind_id", nullable = true)
private AppointmentReminderTyps remind;
@@ -214,14 +214,6 @@ public class Appointment implements Seri
this.deleted = deleted;
}
- public String getComment() {
- return comment;
- }
-
- public void setComment(String comment) {
- this.comment = comment;
- }
-
public Boolean getIsWeekly() {
return isWeekly;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentCategory.java Sat Mar 17 09:12:55 2012
@@ -31,6 +31,7 @@ import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
@@ -57,7 +58,8 @@ public class AppointmentCategory impleme
private Date updatetime;
@Column(name="deleted")
private String deleted;
- @Column(name="comment_field")
+ @Lob
+ @Column(name="comment_field", length=2048)
private String comment;
public Long getCategoryId() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/AppointmentReminderTyps.java Sat Mar 17 09:12:55 2012
@@ -30,6 +30,7 @@ import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
@@ -60,8 +61,6 @@ public class AppointmentReminderTyps imp
private Date updatetime;
@Column(name="deleted")
private String deleted;
- @Column(name="comment_field")
- private String comment;
public Long getTypId() {
return typId;
@@ -105,12 +104,4 @@ public class AppointmentReminderTyps imp
this.deleted = deleted;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
-
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/calendar/MeetingMember.java Sat Mar 17 09:12:55 2012
@@ -69,8 +69,6 @@ public class MeetingMember implements Se
private Date updatetime;
@Column(name="deleted")
private Boolean deleted;
- @Column(name="comment_field")
- private String comment;
@Column(name="invitor")
private Boolean invitor;
@@ -170,13 +168,6 @@ public class MeetingMember implements Se
this.deleted = deleted;
}
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
-
public Boolean getInvitor() {
return invitor;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java Sat Mar 17 09:12:55 2012
@@ -70,9 +70,6 @@ public class Organisation_Users implemen
@Column(name = "is_moderator")
private Boolean isModerator;
- @Column(name = "comment_field")
- private String comment;
-
public Organisation getOrganisation() {
return organisation;
}
@@ -121,14 +118,6 @@ public class Organisation_Users implemen
this.deleted = deleted;
}
- public String getComment() {
- return comment;
- }
-
- public void setComment(String comment) {
- this.comment = comment;
- }
-
public Boolean getIsModerator() {
return isModerator;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/Userdata.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/Userdata.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/Userdata.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/Userdata.java Sat Mar 17 09:12:55 2012
@@ -27,6 +27,7 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@@ -49,6 +50,7 @@ public class Userdata implements Seriali
private Date starttime;
@Column(name = "updatetime")
private Date updatetime;
+ @Lob
@Column(name = "comment_field")
private String comment;
@Column(name = "deleted")
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java Sat Mar 17 09:12:55 2012
@@ -121,7 +121,8 @@ public class CalendarService {
Date appointmentstart, Date appointmentend, Boolean isDaily,
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
Long categoryId, Long remind, @SuppressWarnings("rawtypes") List mmClient, Long roomType,
- String baseUrl, Long language_id) {
+ String baseUrl, Long language_id, Boolean isPasswordProtected,
+ String password) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " + baseUrl);
@@ -137,7 +138,7 @@ public class CalendarService {
users_id, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, mmClient,
- roomType, baseUrl, language_id);
+ roomType, baseUrl, language_id, isPasswordProtected, password);
return id;
} else {
@@ -167,10 +168,11 @@ public class CalendarService {
.getAppointMentById(appointmentId);
Users user = userManagement.getUserById(users_id);
-
- return appointmentLogic.updateAppointmentByTime(appointmentId,
+
+ return appointmentDao.updateAppointmentByTime(appointmentId,
appointmentstart, appointmentend, users_id, baseurl,
language_id, user.getOmTimeZone().getIcal());
+
}
} catch (Exception err) {
log.error("[updateAppointment]", err);
@@ -181,12 +183,13 @@ public class CalendarService {
}
public Long updateAppointment(String SID, Long appointmentId,
- String appointmentName,
+ String appointmentName,
String appointmentLocation, String appointmentDescription,
Date appointmentstart, Date appointmentend, Boolean isDaily,
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
Long categoryId, Long remind, @SuppressWarnings("rawtypes") List mmClient, Long roomType,
- String baseUrl, Long language_id) {
+ String baseUrl, Long language_id, Boolean isPasswordProtected,
+ String password) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -212,12 +215,12 @@ public class CalendarService {
Users user = userManagement.getUserById(users_id);
- return appointmentLogic.updateAppointment(appointmentId,
+ return appointmentDao.updateAppointment(appointmentId,
appointmentName, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, mmClient,
- users_id, baseUrl, language_id, false, "", user
- .getOmTimeZone().getIcal());
+ users_id, baseUrl, language_id, isPasswordProtected, password, user
+ .getOmTimeZone().getIcal(), appointmentLocation);
}
} catch (Exception err) {
log.error("[updateAppointment]", err);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java Sat Mar 17 09:12:55 2012
@@ -174,13 +174,13 @@ public class OrganisationService {
}
public Long addUserToOrganisation(String SID, Long organisation_id,
- Long user_id, String comment) {
+ Long user_id) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkAdminLevel(user_level)) {
return organisationmanagement.addUserToOrganisation(user_id,
- organisation_id, users_id, comment);
+ organisation_id, users_id);
} else {
return -26L;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java Sat Mar 17 09:12:55 2012
@@ -164,7 +164,7 @@ public class UserImport {
Long organisation_id = Long.valueOf(
orgElement.getText()).longValue();
organisationmanagement.addUserToOrganisation(
- us.getUser_id(), organisation_id, null, "");
+ us.getUser_id(), organisation_id, null);
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java Sat Mar 17 09:12:55 2012
@@ -813,7 +813,6 @@ public class BackupExport {
appointment.addElement("users_id").addCDATA("" + 0);
}
appointment.addElement("deleted").addCDATA("" + a.getDeleted());
- appointment.addElement("comment").addCDATA("" + a.getComment());
if (a.getRemind() != null) {
appointment.addElement("typId").addCDATA(
"" + a.getRemind().getTypId());
@@ -1516,8 +1515,6 @@ public class BackupExport {
formatString("" + meetMember.getEmail()));
meetingmember.addElement("deleted").addCDATA(
formatString("" + meetMember.getDeleted()));
- meetingmember.addElement("comment").addCDATA(
- formatString("" + meetMember.getComment()));
meetingmember.addElement("invitor").addCDATA(
formatString("" + meetMember.getInvitor()));
@@ -1796,8 +1793,6 @@ public class BackupExport {
formatString("" + orgUsers.getDeleted()));
user_organisation.addElement("isModerator").addCDATA(
formatString("" + orgUsers.getIsModerator()));
- user_organisation.addElement("comment").addCDATA(
- formatString("" + orgUsers.getComment()));
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java Sat Mar 17 09:12:55 2012
@@ -892,8 +892,6 @@ public class BackupImportController exte
Maps.ORGANISATIONS);
Boolean isModerator = importBooleanType(unformatString(organisationObject
.element("isModerator").getText()));
- String commentOrg = unformatString(organisationObject
- .element("comment").getText());
String deleted = unformatString(organisationObject
.element("deleted").getText());
@@ -901,7 +899,6 @@ public class BackupImportController exte
orgUser.setOrganisation(organisationmanagement
.getOrganisationByIdBackup(organisation_id));
orgUser.setIsModerator(isModerator);
- orgUser.setComment(commentOrg);
orgUser.setStarttime(new Date());
orgUser.setDeleted(deleted);
@@ -1534,8 +1531,6 @@ public class BackupImportController exte
.element("email").getText());
Boolean deleted = importBooleanType(unformatString(appointmentsObject
.element("deleted").getText()));
- String comment = unformatString(appointmentsObject
- .element("comment").getText());
Boolean invitor = importBooleanType(unformatString(appointmentsObject
.element("invitor").getText()));
@@ -1550,7 +1545,6 @@ public class BackupImportController exte
meetingMember.setAppointmentStatus(appointmentStatus);
meetingMember.setEmail(email);
meetingMember.setDeleted(deleted);
- meetingMember.setComment(comment);
meetingMember.setInvitor(invitor);
meetingmembersList.add(meetingMember);
@@ -1692,8 +1686,6 @@ public class BackupImportController exte
.getText()));
String deleted = unformatString(appointmentsObject
.element("deleted").getText());
- String comment = unformatString(appointmentsObject
- .element("comment").getText());
Long typId = importLongType(unformatString(appointmentsObject
.element("typId").getText()));
Boolean isDaily = importBooleanType(unformatString(appointmentsObject
@@ -1731,7 +1723,6 @@ public class BackupImportController exte
app.setAppointmentStarttime(appointmentStarttime);
app.setAppointmentEndtime(appointmentEndtime);
app.setDeleted(deleted);
- app.setComment(comment);
app.setRemind(appointmentReminderTypDaoImpl
.getAppointmentReminderTypById(typId));
app.setIsDaily(isDaily);
Modified: incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java Sat Mar 17 09:12:55 2012
@@ -259,6 +259,10 @@ public class CalendarWebService {
* @param languageId
* the language id of the calendar event, notification emails
* will be send in this language
+ * @param isPasswordProtected
+ * if the room is password protected
+ * @param password
+ * the password for the room
* @return
*/
public Long saveAppointment(String SID, String appointmentName,
@@ -266,7 +270,8 @@ public class CalendarWebService {
Calendar appointmentstart, Calendar appointmentend,
Boolean isDaily, Boolean isWeekly, Boolean isMonthly,
Boolean isYearly, Long categoryId, Long remind, String[] mmClient,
- Long roomType, String baseUrl, Long languageId) {
+ Long roomType, String baseUrl, Long languageId,
+ Boolean isPasswordProtected, String password) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " + baseUrl);
@@ -296,7 +301,8 @@ public class CalendarWebService {
users_id, appointmentLocation, appointmentDescription,
appointmentstart.getTime(), appointmentend.getTime(),
isDaily, isWeekly, isMonthly, isYearly, categoryId,
- remind, newList, roomType, baseUrl, languageId);
+ remind, newList, roomType, baseUrl, languageId,
+ isPasswordProtected, password);
return id;
} else {
@@ -341,7 +347,7 @@ public class CalendarWebService {
Users user = userManagement.getUserById(users_id);
- return appointmentLogic.updateAppointmentByTime(appointmentId,
+ return appointmentDao.updateAppointmentByTime(appointmentId,
appointmentstart, appointmentend, users_id, baseurl,
languageId, user.getOmTimeZone().getIcal());
}
@@ -401,6 +407,10 @@ public class CalendarWebService {
* @param languageId
* the language id of the calendar event, notification emails
* will be send in this language
+ * @param isPasswordProtected
+ * if the room is password protected
+ * @param password
+ * the password for the room
* @return
*/
public Long updateAppointment(String SID, Long appointmentId,
@@ -408,15 +418,16 @@ public class CalendarWebService {
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) throws AxisFault {
+ String[] mmClient, Long roomType, String baseurl, Long languageId,
+ Boolean isPasswordProtected, String password)
+ throws AxisFault {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
-
-
+
if (authLevelManagement.checkUserLevel(user_level)) {
- //check if the appointment belongs to the current user
+ // check if the appointment belongs to the current user
Appointment appointment = appointmentLogic
.getAppointMentById(appointmentId);
if (!appointment.getUserId().getUser_id().equals(users_id)) {
@@ -424,9 +435,10 @@ public class CalendarWebService {
"The Appointment cannot be updated by the given user");
}
} else if (authLevelManagement.checkUserLevel(user_level)) {
- //fine
+ // fine
} else {
- throw new AxisFault("Not allowed to preform that action, Authenticate the SID first");
+ throw new AxisFault(
+ "Not allowed to preform that action, Authenticate the SID first");
}
List<Map<String, String>> newList = new ArrayList<Map<String, String>>();
@@ -462,15 +474,13 @@ public class CalendarWebService {
Users user = userManagement.getUserById(users_id);
- return appointmentLogic.updateAppointment(appointmentId,
- appointmentName, appointmentDescription,
- appointmentstart.getTime(), appointmentend.getTime(),
- isDaily, isWeekly,
- isMonthly, isYearly, categoryId, remind, newList,
- users_id, baseurl, languageId, false, "", user
- .getOmTimeZone().getIcal());
-
-
+ return appointmentDao.updateAppointment(appointmentId,
+ appointmentName, appointmentDescription, appointmentstart
+ .getTime(), appointmentend.getTime(), isDaily,
+ isWeekly, isMonthly, isYearly, categoryId, remind, newList,
+ users_id, baseurl, languageId, isPasswordProtected, password, user
+ .getOmTimeZone().getIcal(), appointmentLocation);
+
} catch (Exception err) {
log.error("[updateAppointment]", err);
throw new AxisFault(err.getMessage());
Modified: incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java Sat Mar 17 09:12:55 2012
@@ -89,15 +89,16 @@ public class CalendarWebServiceFacade {
public Long saveAppointment(String SID, 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) throws AxisFault {
+ 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) throws AxisFault {
return getCalendarServiceProxy().saveAppointment(SID, appointmentName,
appointmentLocation, appointmentDescription, appointmentstart,
appointmentend, isDaily, isWeekly, isMonthly, isYearly,
- categoryId, remind, mmClient, roomType, baseUrl, languageId);
+ categoryId, remind, mmClient, roomType, baseUrl, languageId,
+ isPasswordProtected, password);
}
public Long updateAppointmentTimeOnly(String SID, Long appointmentId,
@@ -113,13 +114,13 @@ public class CalendarWebServiceFacade {
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)
- throws AxisFault {
+ String[] mmClient, Long roomType, String baseurl, Long languageId,
+ Boolean isPasswordProtected, String password) throws AxisFault {
return getCalendarServiceProxy().updateAppointment(SID, appointmentId,
appointmentName, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly, isMonthly,
isYearly, categoryId, remind, mmClient, roomType, baseurl,
- languageId);
+ languageId, isPasswordProtected, password);
}
public Long deleteAppointment(String SID, Long appointmentId,
@@ -127,22 +128,26 @@ public class CalendarWebServiceFacade {
return getCalendarServiceProxy().deleteAppointment(SID, appointmentId,
language_id);
}
-
- public Appointment getAppointmentByRoomId(String SID, Long room_id) throws AxisFault {
+
+ public Appointment getAppointmentByRoomId(String SID, Long room_id)
+ throws AxisFault {
return getCalendarServiceProxy().getAppointmentByRoomId(SID, room_id);
}
-
- public List<AppointmentCategory> getAppointmentCategoryList(String SID) throws AxisFault {
+
+ public List<AppointmentCategory> getAppointmentCategoryList(String SID)
+ throws AxisFault {
return getCalendarServiceProxy().getAppointmentCategoryList(SID);
}
-
+
public List<AppointmentReminderTyps> getAppointmentReminderTypList(
String SID) throws AxisFault {
return getCalendarServiceProxy().getAppointmentReminderTypList(SID);
}
-
- public List<Week> getAppointmentsByWeekCalendar(int firstDayInWeek, Date startDate) throws AxisFault{
- return getCalendarServiceProxy().getAppointmentsByWeekCalendar(firstDayInWeek, startDate);
+
+ public List<Week> getAppointmentsByWeekCalendar(int firstDayInWeek,
+ Date startDate) throws AxisFault {
+ return getCalendarServiceProxy().getAppointmentsByWeekCalendar(
+ firstDayInWeek, startDate);
}
-
+
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java Sat Mar 17 09:12:55 2012
@@ -86,7 +86,7 @@ public class TestAppointmentAddAppointme
users_id, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, mmClient,
- roomType, baseUrl, language_id);
+ roomType, baseUrl, language_id, false, "");
Thread.sleep(3000);
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java Sat Mar 17 09:12:55 2012
@@ -49,7 +49,7 @@ public class TestDatabaseStructureAppoin
cal.getTime();
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(1L,
- "test 5 min", "comment");
+ "test 5 min");
List<AppointmentReminderTyps> listAppoints = appointmentReminderTypDaoImpl
.getAppointmentReminderTypList();
Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestAddGroup.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestAddGroup.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestAddGroup.java Sat Mar 17 09:12:55 2012
@@ -45,7 +45,7 @@ public class TestAddGroup extends Abstra
long organisation_usersid = organisationmanagement
.addUserToOrganisation(new Long(1), organisation_id,
- new Long(1), "");
+ new Long(1));
log.error("new organisation_user: " + organisation_usersid);
Modified: incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java Sat Mar 17 09:12:55 2012
@@ -1220,19 +1220,17 @@ public class UserWebService {
* the organization id
* @param insertedby
* user id of the operating user
- * @param comment
- * any comment
* @return
*/
public Long addUserToOrganisation(String SID, Long user_id,
- Long organisation_id, Long insertedby, String comment) {
+ Long organisation_id, Long insertedby) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkWebServiceLevel(user_level)) {
return organisationmanagement.addUserToOrganisation(user_id,
- organisation_id, users_id, comment);
+ organisation_id, users_id);
} else {
return new Long(-26);
Modified: incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java?rev=1301899&r1=1301898&r2=1301899&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java Sat Mar 17 09:12:55 2012
@@ -292,10 +292,10 @@ public class UserWebServiceFacade {
}
public Long addUserToOrganisation(String SID, Long user_id,
- Long organisation_id, Long insertedby, String comment)
+ Long organisation_id, Long insertedby)
throws AxisFault {
return getUserServiceProxy().addUserToOrganisation(SID, user_id,
- organisation_id, insertedby, comment);
+ organisation_id, insertedby);
}
public SearchResult<Users> getUsersByOrganisation(String SID,