Revision: 4057
Author: seba.wagner
Date: Sun Aug 14 11:04:04 2011
Log: Fixes: Templates as Beans, Templates in folder instead of JAR
http://code.google.com/p/openmeetings/source/detail?r=4057
Deleted:
/branches/dev/injection/src/app/org/openmeetings/app/templates/RTPScreenCastTemplate.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/ScreenCastTemplate.java
Modified:
/branches/dev/injection/build.xml
/branches/dev/injection/build_openmeetings_jar.xml
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/InvitationTemplate.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/RequestContactTemplate.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/VelocityLoader.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/RTPScreenCastTemplate.java
Mon Oct 12 02:51:43 2009
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.openmeetings.app.templates;
-
-public class RTPScreenCastTemplate extends VelocityLoader{
-
-}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/ScreenCastTemplate.java
Tue May 11 13:54:08 2010
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.openmeetings.app.templates;
-
-import java.io.StringWriter;
-
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
-public class ScreenCastTemplate extends VelocityLoader{
-
- private static final String tamplateName = "screencast_template.vm";
-
- private static final Logger log =
Red5LoggerFactory.getLogger(ScreenCastTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private ScreenCastTemplate() {
- super();
- }
-
- private ScreenCastTemplate(String path) {
- super(path);
- }
-
- private static ScreenCastTemplate instance = null;
-
- public static synchronized ScreenCastTemplate getInstance() {
- if (instance == null) {
- instance = new ScreenCastTemplate();
- }
- return instance;
- }
- public static synchronized ScreenCastTemplate getInstance(String path) {
- if (instance == null) {
- instance = new ScreenCastTemplate(path);
- }
- return instance;
- }
-
- public String getScreenTemplate(String rtmphostlocal, String
red5httpport, String SID, String ROOM, String DOMAIN){
- try {
- /* lets make a Context and put data into it */
-
- VelocityContext context = new VelocityContext();
-
- context.put("rtmphostlocal", rtmphostlocal); //rtmphostlocal
- context.put("red5httpport", red5httpport); //red5httpport
- context.put("webAppRootKey", "openmeetings"); //TODO: Query
webAppRootKey by Servlet
- context.put("SID", SID);
- context.put("ROOM", ROOM);
- context.put("DOMAIN", DOMAIN);
-
- /* lets render a template */
-
- StringWriter w = new StringWriter();
-
- Velocity.mergeTemplate(tamplateName, "UTF-8", context, w );
-
- return w.toString();
-
- } catch (Exception e ) {
- log.error("Problem merging template : " , e );
- //System.out.println("Problem merging template : " + e );
- }
- return null;
- }
-}
=======================================
--- /branches/dev/injection/build.xml Sun Aug 14 03:01:43 2011
+++ /branches/dev/injection/build.xml Sun Aug 14 11:04:04 2011
@@ -16,7 +16,7 @@
<property name="screen.src.dir" value="${basedir}/src/red5-screenshare"
/>
<!-- hudson config -->
- <property environment="env"/>
+ <property environment="env" />
<property name="build.number.hudson" value="${env.BUILD_NUMBER}" />
<property name="build.svn.hudson" value="${env.SVN_REVISION}" />
@@ -255,6 +255,13 @@
<fileset dir="WebContent/conf">
</fileset>
</copy>
+
+ <!-- add templates -->
+ <copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/classes">
+ <fileset dir="src/templates">
+ </fileset>
+ </copy>
+
<tstamp/>
</target>
@@ -336,20 +343,7 @@
<attribute name="Built-On" value="${build.TODAY}"/>
<attribute name="Class-Path" value="conf/
${jar.classpath}"/>
</manifest>
- </jar>
- <jar
destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib/${project.distname}-templates.jar">
- <fileset dir="${classes.dir}">
- <include name="**"/>
- <exclude name="**/org/**"/>
- <exclude name="**/*.png"/>
- <exclude name="**/*.properties"/>
- </fileset>
- <manifest>
- <attribute name="Built-By" value="OpenMeetings -
http://openmeetings.googlecode.com"/>
- <attribute name="Built-On" value="${build.TODAY}"/>
- <attribute name="Class-Path" value="conf/
${jar.classpath}"/>
- </manifest>
- </jar>
+ </jar>
<jar
destfile="${dist.dir}/red5/webapps/${project.distname}/screen/screenviewer.jar">
<fileset dir="${classes.dir}">
<include name="**/webstart/**"/>
=======================================
--- /branches/dev/injection/build_openmeetings_jar.xml Sun Aug 14 03:17:49
2011
+++ /branches/dev/injection/build_openmeetings_jar.xml Sun Aug 14 11:04:04
2011
@@ -155,19 +155,6 @@
<attribute name="Class-Path" value="conf/
${jar.classpath}"/>
</manifest>
</jar>
- <jar
destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib/${project.distname}-templates.jar">
- <fileset dir="${classes.dir}">
- <include name="**"/>
- <exclude name="**/org/**"/>
- <exclude name="**/*.png"/>
- <exclude name="**/*.properties"/>
- </fileset>
- <manifest>
- <attribute name="Built-By" value="OpenMeetings -
http://openmeetings.googlecode.com"/>
- <attribute name="Built-On" value="${build.TODAY}"/>
- <attribute name="Class-Path" value="conf/
${jar.classpath}"/>
- </manifest>
- </jar>
<jar
destfile="${dist.dir}/red5/webapps/${project.distname}/screen/screenviewer.jar">
<fileset dir="${classes.dir}">
<include name="**/webstart/**"/>
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 09:31:35 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 11:04:04 2011
@@ -180,6 +180,11 @@
<!-- Templates -->
<bean id="registerUserTemplate"
class="org.openmeetings.app.templates.RegisterUserTemplate" />
+ <bean id="feedbackTemplate"
class="org.openmeetings.app.templates.FeedbackTemplate" />
+ <bean id="invitationTemplate"
class="org.openmeetings.app.templates.InvitationTemplate" />
+ <bean id="requestContactTemplate"
class="org.openmeetings.app.templates.RequestContactTemplate" />
+ <bean id="requestContactConfirmTemplate"
class="org.openmeetings.app.templates.RequestContactConfirmTemplate" />
+ <bean id="resetPasswordTemplate"
class="org.openmeetings.app.templates.ResetPasswordTemplate" />
<!-- Thread Executor -->
<bean id="mailTaskExecutor"
class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
Sun Aug 14 04:56:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Feedbackmanagement.java
Sun Aug 14 11:04:04 2011
@@ -11,14 +11,17 @@
import org.springframework.beans.factory.annotation.Autowired;
public class Feedbackmanagement {
- private static final Logger log =
Red5LoggerFactory.getLogger(Feedbackmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
-
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ Feedbackmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
private MailHandler mailHandler;
+ @Autowired
+ private FeedbackTemplate feedbackTemplate;
public String sendFeedback(String username, String email, String message)
{
try {
@@ -26,9 +29,8 @@
cfgManagement.getConfKey(3,
"default_lang_id")
.getConf_value()).intValue();
- String template = FeedbackTemplate.getInstance()
- .getFeedBackTemplate(username, email,
message,
- default_lang_id);
+ String template =
feedbackTemplate.getFeedBackTemplate(username,
+ email, message, default_lang_id);
Fieldlanguagesvalues fValue = fieldmanagment
.getFieldByIdAndLanguage(new Long(499),
new Long(
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Sun Aug 14 09:31:35 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
Sun Aug 14 11:04:04 2011
@@ -73,6 +73,8 @@
private MailHandler mailHandler;
@Autowired
private MailiCalThread mailiCalThread;
+ @Autowired
+ private InvitationTemplate invitationTemplate;
/**
* Sending invitation within plain mail
@@ -567,9 +569,9 @@
// Long default_lang_id = Long.valueOf(cfgManagement.
//
getConfKey(3,"default_lang_id").getConf_value()).longValue();
- String template = InvitationTemplate.getInstance()
-
.getRegisterInvitationTemplate(username, message,
- invitation_link,
language_id, dStart, dEnd);
+ String template =
invitationTemplate.getRegisterInvitationTemplate(
+ username, message, invitation_link,
language_id, dStart,
+ dEnd);
System.out.println(dStart);
System.out.println(dEnd);
@@ -792,9 +794,9 @@
// Long default_lang_id = Long.valueOf(cfgManagement.
//
getConfKey(3,"default_lang_id").getConf_value()).longValue();
- String template = InvitationTemplate.getInstance()
-
.getRegisterInvitationTemplate(username, message,
- invitation_link,
language_id, starttime, endtime);
+ String template =
invitationTemplate.getRegisterInvitationTemplate(
+ username, message, invitation_link,
language_id, starttime,
+ endtime);
IcalHandler handler = new IcalHandler(
IcalHandler.ICAL_METHOD_REQUEST);
@@ -884,7 +886,7 @@
cfgManagement.getConfKey(3,
"default_lang_id")
.getConf_value()).longValue();
- String template =
InvitationTemplate.getInstance()
+ String template = invitationTemplate
.getRegisterInvitationTemplate(username, message,
invitation_link, default_lang_id, starttime,
endtime);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Aug 14 09:59:10 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Aug 14 11:04:04 2011
@@ -93,6 +93,8 @@
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
private MailHandler mailHandler;
+ @Autowired
+ private ResetPasswordTemplate resetPasswordTemplate;
/**
* query for a list of users
@@ -1495,8 +1497,8 @@
cfgManagement.getConfKey(3,
"default_lang_id").getConf_value())
.longValue();
- String template = ResetPasswordTemplate.getInstance()
- .getResetPasswordTemplate(reset_link,
default_lang_id);
+ String template =
resetPasswordTemplate.getResetPasswordTemplate(
+ reset_link, default_lang_id);
Fieldlanguagesvalues labelid517 = fieldmanagment
.getFieldByIdAndLanguage(new Long(517),
default_lang_id);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
Sun Aug 14 04:56:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/UserService.java
Sun Aug 14 11:04:04 2011
@@ -56,9 +56,9 @@
UserService.class,
ScopeApplicationAdapter.webAppRootKey);
@Autowired
- private ClientListManager clientListManager = null;
+ private final ClientListManager clientListManager = null;
@Autowired
- private ScopeApplicationAdapter scopeApplicationAdapter = null;
+ private final ScopeApplicationAdapter scopeApplicationAdapter = null;
@Autowired
private AppointmentDaoImpl appointmentDao;
@Autowired
@@ -93,6 +93,10 @@
private UserContactsDaoImpl userContactsDao;
@Autowired
private MailHandler mailHandler;
+ @Autowired
+ private RequestContactTemplate requestContactTemplate;
+ @Autowired
+ private RequestContactConfirmTemplate requestContactConfirmTemplate;
/**
* get your own user-object
@@ -480,8 +484,7 @@
if (!users_id.equals(user_idClient)) {
// Setting user deleted
- Long userId = usersDao.deleteUserID(
- user_idClient);
+ Long userId =
usersDao.deleteUserID(user_idClient);
Users user =
userManagement.checkAdmingetUserById(
user_level, userId);
@@ -604,8 +607,8 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- Long countContacts = userContactsDao
-
.checkUserContacts(userToAdd_id, users_id);
+ Long countContacts =
userContactsDao.checkUserContacts(
+ userToAdd_id, users_id);
if (countContacts != null && countContacts > 0)
{
return -45L;
@@ -617,8 +620,8 @@
CalendarPatterns
.getDateWithTimeByMiliSeconds(new Date()));
- Long userContactId = userContactsDao
- .addUserContact(userToAdd_id,
users_id, true, hash);
+ Long userContactId =
userContactsDao.addUserContact(
+ userToAdd_id, users_id, true,
hash);
Users user =
userManagement.getUserById(users_id);
@@ -660,10 +663,10 @@
baseURL = "https://"; + domain + webapp;
}
- privateMessagesDao.addPrivateMessage(
- user.getFirstname() + " " +
user.getLastname() + " "
- +
fValue1193.getValue(), message, 0L, user,
- userToAdd, userToAdd, false,
null, true, userContactId);
+ privateMessagesDao.addPrivateMessage(user.getFirstname()
+ " "
+ + user.getLastname() + " " +
fValue1193.getValue(),
+ message, 0L, user, userToAdd,
userToAdd, false, null,
+ true, userContactId);
String link = baseURL + "?cuser=" + hash;
@@ -677,7 +680,7 @@
String profileLinkHTML = "<a href='" + link +
"'>"
+ fValue1196.getValue() +
"</a><br/>";
- String template =
RequestContactTemplate.getInstance()
+ String template = requestContactTemplate
.getRequestContactTemplate(message, aLinkHTML,
denyLinkHTML,
profileLinkHTML);
@@ -809,8 +812,7 @@
return -49;
}
- return userContactsDao.deleteUserContact(
- userContactId);
+ return
userContactsDao.deleteUserContact(userContactId);
}
} catch (Exception err) {
@@ -841,15 +843,13 @@
if (pending) {
- userContactsDao.updateContactStatus(
- userContactId, false);
+
userContactsDao.updateContactStatus(userContactId, false);
userContacts = userContactsDao
.getUserContacts(userContactId);
- userContactsDao.addUserContact(
-
userContacts.getOwner().getUser_id(), users_id,
- false, "");
+
userContactsDao.addUserContact(userContacts.getOwner()
+ .getUser_id(), users_id, false,
"");
Users user = userContacts.getOwner();
@@ -877,9 +877,8 @@
+ " " +
userContacts.getContact().getLastname()
+ " " +
fValue1198.getValue();
- String template =
RequestContactConfirmTemplate
-
.getInstance().getRequestContactTemplate(
-
message);
+ String template =
requestContactConfirmTemplate
+
.getRequestContactTemplate(message);
privateMessagesDao.addPrivateMessage(
user.getFirstname() +
" " + user.getLastname()
@@ -898,8 +897,7 @@
} else {
- userContactsDao.deleteUserContact(
- userContactId);
+
userContactsDao.deleteUserContact(userContactId);
}
@@ -1023,14 +1021,14 @@
} else {
// One message to the Send
-
privateMessagesDao.addPrivateMessage(
- subject,
message, parentMessageId, from, to,
- from,
bookedRoom, room, false, 0L);
+
privateMessagesDao.addPrivateMessage(subject, message,
+
parentMessageId, from, to, from, bookedRoom,
+ room, false,
0L);
// One message to the Inbox
-
privateMessagesDao.addPrivateMessage(
- subject,
message, parentMessageId, from, to,
- to, bookedRoom,
room, false, 0L);
+
privateMessagesDao.addPrivateMessage(subject, message,
+
parentMessageId, from, to, to, bookedRoom,
+ room, false,
0L);
// One copy of the Inbox
message to the user
Long language_id =
to.getLanguage_id();
@@ -1099,9 +1097,8 @@
String firstname = meetingMember.getFirstname();
String lastname = meetingMember.getLastname();
- meetingMemberDao.addMeetingMember(firstname,
- lastname, "0", "0", appointmentId,
- meetingMember.getUser_id(), email,
invitor,
+ meetingMemberDao.addMeetingMember(firstname, lastname, "0",
"0",
+ appointmentId,
meetingMember.getUser_id(), email, invitor,
meetingMember.getOmTimeZone().getJname(), isConnectedEvent);
}
@@ -1119,13 +1116,14 @@
SearchResult searchResult = new SearchResult();
searchResult.setObjectName(Users.class.getName());
- List<PrivateMessages> userList =
privateMessagesDao.getPrivateMessagesByUser(users_id,
- search,
orderBy, start, asc, 0L, max);
+ List<PrivateMessages> userList =
privateMessagesDao
+
.getPrivateMessagesByUser(users_id, search, orderBy,
+ start, asc, 0L,
max);
searchResult.setResult(userList);
- Long resultInt = privateMessagesDao
-
.countPrivateMessagesByUser(users_id, search, 0L);
+ Long resultInt =
privateMessagesDao.countPrivateMessagesByUser(
+ users_id, search, 0L);
searchResult.setRecords(resultInt);
@@ -1150,12 +1148,14 @@
SearchResult searchResult = new SearchResult();
searchResult.setObjectName(Users.class.getName());
- List<PrivateMessages> userList =
privateMessagesDao.getSendPrivateMessagesByUser(users_id,
- search,
orderBy, start, asc, 0L, max);
+ List<PrivateMessages> userList =
privateMessagesDao
+
.getSendPrivateMessagesByUser(users_id, search,
+ orderBy, start,
asc, 0L, max);
searchResult.setResult(userList);
- Long resultInt =
privateMessagesDao.countSendPrivateMessagesByUser(users_id, search, 0L);
+ Long resultInt = privateMessagesDao
+
.countSendPrivateMessagesByUser(users_id, search, 0L);
searchResult.setRecords(resultInt);
@@ -1180,8 +1180,9 @@
SearchResult searchResult = new SearchResult();
searchResult.setObjectName(Users.class.getName());
- List<PrivateMessages> userList =
privateMessagesDao.getTrashPrivateMessagesByUser(users_id,
- search,
orderBy, start, asc, max);
+ List<PrivateMessages> userList =
privateMessagesDao
+
.getTrashPrivateMessagesByUser(users_id, search,
+ orderBy, start,
asc, max);
searchResult.setResult(userList);
@@ -1212,9 +1213,10 @@
SearchResult searchResult = new SearchResult();
searchResult.setObjectName(Users.class.getName());
- List<PrivateMessages> userList =
privateMessagesDao.getFolderPrivateMessagesByUser(users_id,
- search,
orderBy, start, asc,
-
privateMessageFolderId, max);
+ List<PrivateMessages> userList =
privateMessagesDao
+
.getFolderPrivateMessagesByUser(users_id, search,
+ orderBy, start,
asc, privateMessageFolderId,
+ max);
searchResult.setResult(userList);
@@ -1242,9 +1244,8 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- return privateMessagesDao
-
.countFolderPrivateMessagesByUser(users_id,
- privateMessageFolderId,
"");
+ return
privateMessagesDao.countFolderPrivateMessagesByUser(
+ users_id, privateMessageFolderId,
"");
}
@@ -1269,8 +1270,8 @@
.longValue());
}
- return privateMessagesDao.moveMailsToFolder(
- privateMessageIds, newFolderId);
+ return
privateMessagesDao.moveMailsToFolder(privateMessageIds,
+ newFolderId);
}
} catch (Exception err) {
@@ -1296,9 +1297,8 @@
log.debug("moveMailsToTrash :: " + isTrash);
- return privateMessagesDao
-
.updatePrivateMessagesToTrash(privateMessageIds,
- isTrash, 0L);
+ return
privateMessagesDao.updatePrivateMessagesToTrash(
+ privateMessageIds, isTrash, 0L);
}
} catch (Exception err) {
@@ -1348,9 +1348,8 @@
log.debug("markReadStatusMails :: " + isRead);
- return privateMessagesDao
-
.updatePrivateMessagesReadStatus(privateMessageIds,
- isRead);
+ return
privateMessagesDao.updatePrivateMessagesReadStatus(
+ privateMessageIds, isRead);
}
} catch (Exception err) {
@@ -1370,9 +1369,8 @@
List<Long> privateMessageIds = new
LinkedList<Long>();
privateMessageIds.add(privateMessageId);
- return privateMessagesDao
-
.updatePrivateMessagesReadStatus(privateMessageIds,
- isRead);
+ return
privateMessagesDao.updatePrivateMessagesReadStatus(
+ privateMessageIds, isRead);
// PrivateMessages privateMessage =
//
privateMessagesDao.getPrivateMessagesById(privateMessageId);
@@ -1413,8 +1411,8 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- privateMessageFolderDao
-
.addPrivateMessageFolder(folderName, users_id);
+
privateMessageFolderDao.addPrivateMessageFolder(folderName,
+ users_id);
}
@@ -1483,8 +1481,8 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- PrivateMessageFolder privateMessageFolder =
privateMessageFolderDao.getPrivateMessageFolderById(
-
privateMessageFolderId);
+ PrivateMessageFolder privateMessageFolder =
privateMessageFolderDao
+
.getPrivateMessageFolderById(privateMessageFolderId);
privateMessageFolder.setFolderName(folderName);
privateMessageFolder.setUpdated(new Date());
@@ -1510,10 +1508,11 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- PrivateMessageFolder privateMessageFolder =
privateMessageFolderDao.getPrivateMessageFolderById(
-
privateMessageFolderId);
-
-
privateMessageFolderDao.deletePrivateMessages(privateMessageFolder);
+ PrivateMessageFolder privateMessageFolder =
privateMessageFolderDao
+
.getPrivateMessageFolderById(privateMessageFolderId);
+
+ privateMessageFolderDao
+
.deletePrivateMessages(privateMessageFolder);
}
@@ -1530,7 +1529,8 @@
// users only
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
- return
userContactsDao.getContactsByShareCalendar(users_id, true);
+ return
userContactsDao.getContactsByShareCalendar(users_id,
+ true);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sun Aug 14 04:44:55 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sun Aug 14 11:04:04 2011
@@ -131,7 +131,8 @@
// init your handler here
- // The scheduled Jobs did go into the Spring-Managed Beans, see
schedulerJobs.service.xml
+ // The scheduled Jobs did go into the Spring-Managed
Beans, see
+ // schedulerJobs.service.xml
// Spring Definition does not work here, its too early,
Instance is
// not set yet
@@ -186,9 +187,9 @@
conn.getRemoteAddress(), swfURL);
// Log the User
- conferenceLogDao.addConferenceLog(
- "ClientConnect", rcm.getUser_id(),
streamId, null,
- rcm.getUserip(), rcm.getScope(),
rcm.getExternalUserId(),
+ conferenceLogDao.addConferenceLog("ClientConnect",
+ rcm.getUser_id(), streamId, null,
rcm.getUserip(),
+ rcm.getScope(), rcm.getExternalUserId(),
rcm.getExternalUserType(),
rcm.getMail(),
rcm.getFirstname(), rcm.getLastname());
@@ -1772,7 +1773,9 @@
Appointment ment = appointmentLogic
.getAppointmentByRoom(room_id);
- List<MeetingMember> members =
meetingMemberDao.getMeetingMemberByAppointmentId(ment.getAppointmentId());
+ List<MeetingMember> members = meetingMemberDao
+
.getMeetingMemberByAppointmentId(ment
+
.getAppointmentId());
Long userIdInRoomClient =
currentClient.getUser_id();
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
Sun Aug 14 11:04:04 2011
@@ -2,59 +2,49 @@
import java.io.StringWriter;
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
-public class FeedbackTemplate extends VelocityLoader{
-
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+public class FeedbackTemplate extends VelocityLoader {
+
private static final String tamplateName = "feedback.vm";
- private static final Logger log =
Red5LoggerFactory.getLogger(FeedbackTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private FeedbackTemplate() {
- super();
- }
-
- private static FeedbackTemplate instance = null;
-
- public static synchronized FeedbackTemplate getInstance() {
- if (instance == null) {
- instance = new FeedbackTemplate();
- }
- return instance;
- }
-
- public String getFeedBackTemplate(String username, String email, String
message, Integer default_lang_id){
- try {
-
- //TODO: Finish Feedback - Template
- //Fieldlanguagesvalues fValue =
fieldmanagment.getFieldByIdAndLanguage(new Long(499), new
Long(default_lang_id));
-
- /* lets make a Context and put data into it */
-
- VelocityContext context = new VelocityContext();
-
- context.put("username", username);
- context.put("email", email);
- context.put("message", message);
-
- /* lets render a template */
-
- StringWriter w = new StringWriter();
- Velocity.mergeTemplate(tamplateName, "UTF-8", context, w );
-
- return w.toString();
-
- } catch (Exception e ) {
- log.error("Problem merging template : " , e );
- //System.out.println("Problem merging template : " + e );
- }
- return null;
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ FeedbackTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ public String getFeedBackTemplate(String username, String email,
+ String message, Integer default_lang_id) {
+ try {
+
+ super.init();
+
+ // TODO: Finish Feedback - Template
+ // Fieldlanguagesvalues fValue =
+ // fieldmanagment.getFieldByIdAndLanguage(new
Long(499), new
+ // Long(default_lang_id));
+
+ /* lets make a Context and put data into it */
+
+ VelocityContext context = new VelocityContext();
+
+ context.put("username", username);
+ context.put("email", email);
+ context.put("message", message);
+
+ /* lets render a template */
+
+ StringWriter w = new StringWriter();
+ Velocity.mergeTemplate(tamplateName, "UTF-8", context,
w);
+
+ return w.toString();
+
+ } catch (Exception e) {
+ log.error("Problem merging template : ", e);
+ // System.out.println("Problem merging template : " + e
);
+ }
+ return null;
}
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/InvitationTemplate.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/InvitationTemplate.java
Sun Aug 14 11:04:04 2011
@@ -22,23 +22,12 @@
private static final Logger log = Red5LoggerFactory.getLogger(
InvitationTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
- private InvitationTemplate() {
- super();
- }
-
- private static InvitationTemplate instance = null;
-
- public static synchronized InvitationTemplate getInstance() {
- if (instance == null) {
- instance = new InvitationTemplate();
- }
- return instance;
- }
-
public String getRegisterInvitationTemplate(String user, String message,
String invitation_link, Long default_lang_id, Date
dStart, Date dEnd) {
try {
+ super.init();
+
Fieldlanguagesvalues labelid500 = fieldmanagment
.getFieldByIdAndLanguage(new Long(500),
default_lang_id);
Fieldlanguagesvalues labelid501 = fieldmanagment
@@ -97,10 +86,10 @@
public String getReminderInvitationTemplate(String user, String message,
String invitation_link, Long default_lang_id) {
- log.debug("getReminderInvitationTemplate");
-
try {
+ super.init();
+
Fieldlanguagesvalues labelid622 = fieldmanagment
.getFieldByIdAndLanguage(new Long(622),
default_lang_id);
Fieldlanguagesvalues labelid623 = fieldmanagment
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java
Sun Aug 14 11:04:04 2011
@@ -2,54 +2,42 @@
import java.io.StringWriter;
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
-public class RequestContactConfirmTemplate extends VelocityLoader{
-
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+public class RequestContactConfirmTemplate extends VelocityLoader {
+
private static final String tamplateName = "requestcontactconfirm.vm";
- private static final Logger log =
Red5LoggerFactory.getLogger(RequestContactConfirmTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private RequestContactConfirmTemplate() {
- super();
- }
-
- private static RequestContactConfirmTemplate instance = null;
-
- public static synchronized RequestContactConfirmTemplate getInstance() {
- if (instance == null) {
- instance = new RequestContactConfirmTemplate();
- }
- return instance;
- }
-
- public String getRequestContactTemplate(String message) {
- try {
-
- /* lets make a Context and put data into it */
-
- VelocityContext context = new VelocityContext();
-
- context.put("message", message);
-
- /* lets render a template */
-
- StringWriter w = new StringWriter();
- Velocity.mergeTemplate(tamplateName, "UTF-8", context, w );
-
- return w.toString();
-
- } catch (Exception e ) {
- log.error("Problem merging template : " , e );
- //System.out.println("Problem merging template : " + e );
- }
- return null;
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ RequestContactConfirmTemplate.class,
+ ScopeApplicationAdapter.webAppRootKey);
+
+ public String getRequestContactTemplate(String message) {
+ try {
+
+ super.init();
+
+ /* lets make a Context and put data into it */
+
+ VelocityContext context = new VelocityContext();
+
+ context.put("message", message);
+
+ /* lets render a template */
+
+ StringWriter w = new StringWriter();
+ Velocity.mergeTemplate(tamplateName, "UTF-8", context,
w);
+
+ return w.toString();
+
+ } catch (Exception e) {
+ log.error("Problem merging template : ", e);
+ // System.out.println("Problem merging template : " + e
);
+ }
+ return null;
}
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/RequestContactTemplate.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/RequestContactTemplate.java
Sun Aug 14 11:04:04 2011
@@ -2,58 +2,46 @@
import java.io.StringWriter;
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
-public class RequestContactTemplate extends VelocityLoader{
-
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+public class RequestContactTemplate extends VelocityLoader {
+
private static final String tamplateName = "requestcontact.vm";
- private static final Logger log =
Red5LoggerFactory.getLogger(RequestContactTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private RequestContactTemplate() {
- super();
- }
-
- private static RequestContactTemplate instance = null;
-
- public static synchronized RequestContactTemplate getInstance() {
- if (instance == null) {
- instance = new RequestContactTemplate();
- }
- return instance;
- }
-
- public String getRequestContactTemplate(String message, String
accept_link,
- String deny_link, String openmeetings_link){
- try {
-
- /* lets make a Context and put data into it */
-
- VelocityContext context = new VelocityContext();
-
- context.put("message", message);
- context.put("accept_link", accept_link);
- context.put("deny_link", deny_link);
- context.put("openmeetings_link", openmeetings_link);
-
- /* lets render a template */
-
- StringWriter w = new StringWriter();
- Velocity.mergeTemplate(tamplateName, "UTF-8", context, w );
-
- return w.toString();
-
- } catch (Exception e ) {
- log.error("Problem merging template : " , e );
- //System.out.println("Problem merging template : " + e );
- }
- return null;
+ private static final Logger log = Red5LoggerFactory
+ .getLogger(RequestContactTemplate.class,
+ ScopeApplicationAdapter.webAppRootKey);
+
+ public String getRequestContactTemplate(String message, String
accept_link,
+ String deny_link, String openmeetings_link) {
+ try {
+
+ super.init();
+
+ /* lets make a Context and put data into it */
+
+ VelocityContext context = new VelocityContext();
+
+ context.put("message", message);
+ context.put("accept_link", accept_link);
+ context.put("deny_link", deny_link);
+ context.put("openmeetings_link", openmeetings_link);
+
+ /* lets render a template */
+
+ StringWriter w = new StringWriter();
+ Velocity.mergeTemplate(tamplateName, "UTF-8", context,
w);
+
+ return w.toString();
+
+ } catch (Exception e) {
+ log.error("Problem merging template : ", e);
+ // System.out.println("Problem merging template : " + e
);
+ }
+ return null;
}
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java
Sun Aug 14 11:04:04 2011
@@ -21,23 +21,12 @@
private static final Logger log = Red5LoggerFactory.getLogger(
FeedbackTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
- private ResetPasswordTemplate() {
- super();
- }
-
- private static ResetPasswordTemplate instance = null;
-
- public static synchronized ResetPasswordTemplate getInstance() {
- if (instance == null) {
- instance = new ResetPasswordTemplate();
- }
- return instance;
- }
-
public String getResetPasswordTemplate(String reset_link,
Long default_lang_id) {
try {
+ super.init();
+
Fieldlanguagesvalues labelid513 = fieldmanagment
.getFieldByIdAndLanguage(new Long(513),
default_lang_id);
Fieldlanguagesvalues labelid514 = fieldmanagment
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/VelocityLoader.java
Sun Aug 14 08:26:33 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/VelocityLoader.java
Sun Aug 14 11:04:04 2011
@@ -19,7 +19,7 @@
VelocityLoader.class,
ScopeApplicationAdapter.webAppRootKey);
public VelocityLoader() {
- this.init();
+
}
/**
@@ -31,12 +31,10 @@
String current_dir = ScopeApplicationAdapter.webAppPath
+ File.separatorChar;
- log.debug("current_dir :: " + current_dir);
-
Velocity.init(current_dir + "WEB-INF" +
File.separatorChar
+ "velocity.properties");
} catch (Exception e) {
- log.error("Problem initializing Velocity : " + e);
+ log.error("Problem initializing Velocity : ", e);
System.out.println("Problem initializing Velocity : " +
e);
}
}
--
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.
