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/07 07:52:22 UTC
svn commit: r1520728 - in /openmeetings/trunk/singlewebapp: docs/
src/main/java/org/apache/openmeetings/data/calendar/daos/
src/main/java/org/apache/openmeetings/persistence/beans/calendar/
Author: solomax
Date: Sat Sep 7 05:52:22 2013
New Revision: 1520728
URL: http://svn.apache.org/r1520728
Log:
[OPENMEETINGS-777] refactoring, tests are fixed
Modified:
openmeetings/trunk/singlewebapp/docs/RoomService.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1520728&r1=1520727&r2=1520728&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Sat Sep 7 05:52:22 2013
@@ -5086,7 +5086,7 @@ limitations under the License.
,
String paramName
,
- String paramValue
+ Object paramValue
)
</i><br/>
<p>
@@ -5132,7 +5132,7 @@ limitations under the License.
<tr>
<td valign="top">
- String
+ Object
</td>
<td valign="top">paramValue</td>
<td valign="top"></td>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1520728&r1=1520727&r2=1520728&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Sat Sep 7 05:52:22 2013
@@ -129,7 +129,7 @@ public class AppointmentDao {
String hql = "select a from Appointment a WHERE a.id = :id ";
TypedQuery<Appointment> query = em.createQuery(hql, Appointment.class);
- query.setParameter("appointmentId", appointmentId);
+ query.setParameter("id", appointmentId);
Appointment appoint = null;
try {
@@ -197,7 +197,7 @@ public class AppointmentDao {
ap.setIsWeekly(isWeekly);
ap.setIsMonthly(isMonthly);
ap.setIsYearly(isYearly);
- ap.setLanguage_id(language_id);
+ ap.setLanguageId(language_id);
ap.setPasswordProtected(isPasswordProtected);
ap.setPassword(password);
ap.setOwner(usersDao.get(userId));
@@ -367,7 +367,7 @@ public class AppointmentDao {
appointment.setIsWeekly(isWeekly);
appointment.setIsMonthly(isMonthly);
appointment.setIsYearly(isYearly);
- appointment.setLanguage_id(language_id);
+ appointment.setLanguageId(language_id);
appointment.setPasswordProtected(isPasswordProtected);
appointment.setPassword(password);
// ap.setUserId(usersDao.getUser(userId));
@@ -456,7 +456,7 @@ public class AppointmentDao {
ap.setIsWeekly(isWeekly);
ap.setIsMonthly(isMonthly);
ap.setIsYearly(isYearly);
- ap.setLanguage_id(language_id);
+ ap.setLanguageId(language_id);
ap.setPasswordProtected(isPasswordProtected);
ap.setPassword(password);
// ap.setUserId(usersDao.getUser(userId));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1520728&r1=1520727&r2=1520728&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/Appointment.java Sat Sep 7 05:52:22 2013
@@ -98,28 +98,28 @@ public class Appointment implements Seri
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- @Element(data=true)
+ @Element(name = "appointmentId", data = true)
private Long id;
@Column(name = "appointmentname")
- @Element(data=true, required=false)
+ @Element(name="appointmentName", data=true, required=false)
private String title;
@Column(name = "location")
- @Element(data=true, required=false)
+ @Element(name="appointmentLocation", data=true, required=false)
private String location;
@Column(name = "appointment_starttime")
- @Element(data=true)
+ @Element(name="appointmentStarttime", data=true)
private Date start;
@Column(name = "appointment_endtime")
- @Element(data=true)
+ @Element(name="appointmentEndtime", data=true)
private Date end;
@Lob
@Column(name = "description", length=2048)
- @Element(data=true, required=false)
+ @Element(name="appointmentDescription", data=true, required=false)
private String description;
@ManyToOne(fetch = FetchType.EAGER)
@@ -183,11 +183,11 @@ public class Appointment implements Seri
private List<MeetingMember> meetingMembers;
@Column(name = "language_id")
- @Element(data=true, required=false)
- private Long language_id;
+ @Element(name="language_id", data=true, required=false)
+ private Long languageId;
@Column(name = "is_password_protected")
- @Element(data=true, required=false)
+ @Element(name="isPasswordProtected", data=true, required=false)
private boolean passwordProtected;
@Column(name = "password")
@@ -364,12 +364,12 @@ public class Appointment implements Seri
this.icalId = icalId;
}
- public Long getLanguage_id() {
- return language_id;
+ public Long getLanguageId() {
+ return languageId;
}
- public void setLanguage_id(Long languageId) {
- language_id = languageId;
+ public void setLanguageId(Long languageId) {
+ this.languageId = languageId;
}
public boolean isPasswordProtected() {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java?rev=1520728&r1=1520727&r2=1520728&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java Sat Sep 7 05:52:22 2013
@@ -46,7 +46,7 @@ public class MeetingMember implements Se
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- @Element(data = true)
+ @Element(name = "meetingMemberId", data = true)
private Long id;
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)