Revision: 4157
Author: solomax666
Date: Wed Aug 31 10:27:24 2011
Log: - meetingMemberLogic converted to bean
http://code.google.com/p/openmeetings/source/detail?r=4157
Modified:
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MeetingMemberService.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
=======================================
---
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Wed Aug 31 10:02:46 2011
+++
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Wed Aug 31 10:27:24 2011
@@ -69,6 +69,7 @@
<bean id="recordingDao"
class="org.openmeetings.app.data.record.dao.RecordingDaoImpl"/>
<bean id="appointmentDao"
class="org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl"/>
<bean id="appointmentLogic"
class="org.openmeetings.app.data.calendar.management.AppointmentLogic"/>
+ <bean id="meetingMemberLogic"
class="org.openmeetings.app.data.calendar.management.MeetingMemberLogic"/>
<bean id="sessionManagement"
class="org.openmeetings.app.data.basic.Sessionmanagement"/>
<bean id="userManagement"
class="org.openmeetings.app.data.user.Usermanagement"/>
<bean id="roomModeratorsDao"
class="org.openmeetings.app.data.conference.dao.RoomModeratorsDaoImpl"/>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Wed Aug 31 10:27:24 2011
@@ -57,6 +57,8 @@
private UsersDaoImpl usersDao;
@Autowired
private Invitationmanagement invitationManagement;
+ @Autowired
+ private MeetingMemberLogic meetingMemberLogic;
/*
* insert, update, delete, select
@@ -525,7 +527,7 @@
if (!found) {
// Not in List in client delete it
-
MeetingMemberLogic.getInstance().deleteMeetingMember(
+ meetingMemberLogic.deleteMeetingMember(
memberRemote.getMeetingMemberId(), users_id,
language_id);
//
meetingMemberDao.deleteMeetingMember(memberRemote.getMeetingMemberId());
@@ -570,7 +572,7 @@
"jNameTimeZone").toString();
// Not In Remote List available
- intern OR extern user
-
MeetingMemberLogic.getInstance().addMeetingMember(
+
meetingMemberLogic.addMeetingMember(
clientMember.get("firstname").toString(),
clientMember.get("lastname").toString(),
"0", // member
- Status
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Wed Aug 31 10:27:24 2011
@@ -48,6 +48,8 @@
private Invitationmanagement invitationManagement;
@Autowired
private MeetingMemberDaoImpl meetingMemberDao;
+ @Autowired
+ private MeetingMemberLogic meetingMemberLogic;
public List<Appointment> getAppointmentByRange(Long userId, Date
starttime,
Date endtime) {
@@ -204,7 +206,7 @@
String invitorName = user.getFirstname() + " " +
user.getLastname()
+ " [" + user.getAdresses().getEmail() +
"]";
- MeetingMemberLogic.getInstance().addMeetingMember(
+ meetingMemberLogic.addMeetingMember(
user.getFirstname(), user.getLastname(), "",
"", id,
userId, user.getAdresses().getEmail(),
baseUrl, userId,
true, language_id, false, "",
jNameMemberTimeZone,
@@ -231,7 +233,7 @@
.toString();
// Not In Remote List available -
intern OR extern user
-
MeetingMemberLogic.getInstance().addMeetingMember(
+ meetingMemberLogic.addMeetingMember(
clientMember.get("firstname").toString(),
clientMember.get("lastname").toString(),
"0",
@@ -302,7 +304,7 @@
if (members != null) {
for (int i = 0; i < members.size(); i++) {
log.debug("deleting member " +
members.get(i).getEmail());
-
MeetingMemberLogic.getInstance().deleteMeetingMember(
+ meetingMemberLogic.deleteMeetingMember(
members.get(i).getMeetingMemberId(), users_id,
language_id);
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Wed Aug 31 10:27:24 2011
@@ -27,7 +27,7 @@
private static final Logger log = Red5LoggerFactory.getLogger(
MeetingMemberLogic.class,
ScopeApplicationAdapter.webAppRootKey);
- private static MeetingMemberLogic instance = null;
+
@Autowired
private AppointmentLogic appointmentLogic;
@Autowired
@@ -43,14 +43,6 @@
@Autowired
private MeetingMemberDaoImpl meetingMemberDao;
- public static synchronized MeetingMemberLogic getInstance() {
- if (instance == null) {
- instance = new MeetingMemberLogic();
- }
-
- return instance;
- }
-
/**
* @author becherer
* @param firstname
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MeetingMemberService.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/MeetingMemberService.java
Wed Aug 31 10:27:24 2011
@@ -19,37 +19,8 @@
private Usermanagement userManagement;
@Autowired
private AuthLevelmanagement authLevelManagement;
-
- // public Long _addMeetingMember(String SID, String firstname, String
- // lastname, String memberStatus,
- // String appointmentStatus, Long appointmentId, Long userid, String
email,
- // String baseUrl,
- // Long language_id, Boolean isPasswordProtected, String password){
- //
- // log.debug("addMeetingMember baseUrl = " + baseUrl);
- //
- //
- // try{
- //
- // Long users_id = Sessionmanagement.getInstance().checkSession(SID);
- // Long user_level = userManagement.getUserLevelByID(users_id);
- // if (authLevelManagement.checkUserLevel(user_level)) {
- //
- // Long id = MeetingMemberLogic.getInstance().addMeetingMember(
firstname,
- // lastname, memberStatus,
- // appointmentStatus, appointmentId, userid, email, baseUrl, users_id,
- // false,
- // language_id, isPasswordProtected, password);
- //
- // log.debug("addMeetingmember : newId : " + id);
- // return id;
- // }
- // } catch (Exception err) {
- // log.error("[addMeetingMember]",err);
- // }
- // return null;
- //
- // }
+ @Autowired
+ private MeetingMemberLogic meetingMemberLogic;
public Long updateMeetingMember(String SID, Long meetingMemberId,
String firstname, String lastname, String memberStatus,
@@ -62,7 +33,7 @@
Long user_level =
userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkUserLevel(user_level)) {
- return
MeetingMemberLogic.getInstance().updateMeetingMember(
+ return meetingMemberLogic.updateMeetingMember(
meetingMemberId, firstname,
lastname, memberStatus,
appointmentStatus,
appointmentId, userid, email);
}
@@ -83,7 +54,7 @@
Long user_level =
userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkUserLevel(user_level)) {
- return
MeetingMemberLogic.getInstance().deleteMeetingMember(
+ return meetingMemberLogic.deleteMeetingMember(
meetingMemberId, users_id,
language_id);
}
} catch (Exception err) {
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
Wed Aug 31 10:27:24 2011
@@ -58,13 +58,8 @@
private ConferenceService conferenceService;
@Autowired
private ClientListManager clientListManager;
-
- // TODO: Not implemented yet
- // public List<Rooms_Organisation> getRoomsByOrganisationAndType(String
SID,
- // long organisation_id, long roomtypes_id) {
- // return conferenceService.getRoomsByOrganisationAndType(SID,
- // organisation_id, roomtypes_id);
- // }
+ @Autowired
+ private MeetingMemberLogic meetingMemberLogic;
public Rooms[] getRoomsPublic(String SID, Long roomtypes_id)
throws AxisFault {
@@ -1466,7 +1461,7 @@
return -1L;
}
// Not In Remote List available - extern user
- Long memberId = MeetingMemberLogic.getInstance()
+ Long memberId = meetingMemberLogic
.addMeetingMember(firstname, lastname,
"0", "0",
appointment.getAppointmentId(), null, email,
baseUrl, null,
new Boolean(false), language_id,
@@ -1503,7 +1498,7 @@
}
// Not In Remote List available - extern user
- Long memberId = MeetingMemberLogic.getInstance()
+ Long memberId = meetingMemberLogic
.addMeetingMember(firstname, lastname,
"0", "0",
appointment.getAppointmentId(), null, email,
baseUrl, null,
new Boolean(false), language_id,
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
