Author: solomax
Date: Tue Sep 17 05:45:10 2013
New Revision: 1523909
URL: http://svn.apache.org/r1523909
Log:
[OPENMEETINGS-777] redundant library producing errors removed from ivy.xml;
Entities updated to work as expected
Modified:
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1523909&r1=1523908&r2=1523909&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Tue Sep 17 05:45:10 2013
@@ -64,9 +64,6 @@
<dependency org="org.springframework"
name="spring-context-support" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="cglib" name="cglib" rev="2.2.2"
transitive="false">
- <include type="jar" />
- </dependency>
<!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
<dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec" rev="1.1" conf="mainlib.ext->*"
transitive="false"/>
<!-- END OF mainlib -->
@@ -407,6 +404,7 @@
</dependency>
<exclude org="javax.servlet" module="servlet-api" type="*"
ext="*" conf="*" matcher="exact"/>
+ <exclude org="cglib" module="cglib-nodep" type="*" ext="*"
conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1523909&r1=1523908&r2=1523909&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
Tue Sep 17 05:45:10 2013
@@ -35,8 +35,8 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.room.Invitation;
-import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.utils.TimezoneUtil;
@@ -311,33 +311,17 @@ public class InvitationManager {
}
private String formatUpdateSubject(Long language_id, Appointment
appointment, TimeZone timezone) {
- try {
-
- String message = fieldManager.getString(1155L,
language_id) + " "
- + appointment.getTitle();
-
- if (appointment.getDescription().length() != 0) {
-
- Fieldlanguagesvalues labelid1152 = fieldManager
- .getFieldByIdAndLanguage(new
Long(1152), language_id);
- message += labelid1152.getValue()
- + appointment.getDescription();
-
- }
-
- message += " "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getStart(),
timezone)
- + " - "
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
- appointment.getEnd(),
timezone);
+ String message = fieldManager.getString(1155L, language_id) + "
"
+ + appointment.getTitle();
- return message;
+ message += " "
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
+ appointment.getStart(),
timezone)
+ + " - "
+ +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
+ appointment.getEnd(), timezone);
- } catch (Exception err) {
- log.error("Could not format update subject");
- return "Error formatUpdateSubject";
- }
+ return message;
}
private String formatUpdateMessage(Long language_id,
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java?rev=1523909&r1=1523908&r2=1523909&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
Tue Sep 17 05:45:10 2013
@@ -27,6 +27,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.NamedQueries;
import javax.persistence.NamedQuery;
@@ -74,6 +75,7 @@ public class ChatMessage implements Seri
private User toUser;
@Column(name = "message")
+ @Lob
@Element(name = "message", data = true, required = false)
private String message;
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1523909&r1=1523908&r2=1523909&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
Tue Sep 17 05:45:10 2013
@@ -47,7 +47,7 @@ import org.simpleframework.xml.Root;
, query="SELECT mm FROM MeetingMember mm WHERE mm.deleted =
false AND mm.id = :id")
, @NamedQuery(name="getMeetingMembers", query="SELECT mm FROM
MeetingMember mm")
, @NamedQuery(name="getMeetingMemberIdsByAppointment"
- , query="SELECT mm.id FROM MeetingMember mm WHERE mm.deleted =
false AND app.appointment.id = :id")
+ , query="SELECT mm.id FROM MeetingMember mm WHERE mm.deleted =
false AND mm.appointment.id = :id")
})
@Root(name = "meetingmember")
public class MeetingMember implements Serializable {
