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 2014/04/09 01:32:34 UTC
svn commit: r1585864 [2/3] - in /openmeetings: branches/3.0.x/docs/
branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/basic/
branches/3.0.x/src/db/java/org/apache/openmeetings/...
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Tue Apr 8 23:32:32 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.data.calendar.management;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_URL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.ArrayList;
@@ -43,6 +46,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -136,6 +140,44 @@ public class AppointmentLogic {
return null;
}
+ private void sendReminder(User u, Appointment a) throws Exception {
+ Invitation i = new Invitation();
+ i.setInvitedBy(u);
+ i.setInvitee(u);
+ i.setAppointment(a);
+ sendReminder(u, a, i);
+ }
+
+ private void sendReminder(User u, Appointment a, Invitation inv) throws Exception {
+ if (inv == null) {
+ log.error(String.format("Error retrieving Invitation for member %s in Appointment %s"
+ , u.getAdresses().getEmail(), a.getTitle()));
+ return;
+ }
+
+ TimeZone tZone = timezoneUtil.getTimeZone(u.getTimeZoneId());
+
+ long language_id = u.getLanguage_id();
+ // Get the required labels one time for all meeting members. The
+ // Language of the email will be the system default language
+ String labelid1158 = fieldManager.getString(1158L, language_id);
+ String labelid1153 = fieldManager.getString(1153L, language_id);
+ String labelid1154 = fieldManager.getString(1154L, language_id);
+
+ String subject = generateSubject(labelid1158, a, tZone);
+ String smsSubject = generateSMSSubject(labelid1158, a);
+
+ String message = generateMessage(labelid1158, a, language_id, labelid1153, labelid1154, tZone);
+
+ invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false);
+
+ invitationManager.sendInvitationReminderSMS(u.getAdresses().getPhone(), smsSubject, language_id);
+ if (inv.getHash() != null) {
+ inv.setUpdated(new Date());
+ invitationDao.update(inv);
+ }
+ }
+
/**
* Sending Reminder in Simple mail format 5 minutes before Meeting begins
*/
@@ -143,7 +185,12 @@ public class AppointmentLogic {
public void doScheduledMeetingReminder() throws Exception {
// log.debug("doScheduledMeetingReminder");
- Integer minutesReminderSend = configurationDao.getConfValue("number.minutes.reminder.send", Integer.class
+ String baseUrl = configurationDao.getConfValue(CONFIG_APPLICATION_BASE_URL, String.class, DEFAULT_BASE_URL);
+ if (baseUrl == null || baseUrl.length() < 1) {
+ log.error("Error retrieving baseUrl for application");
+ return;
+ }
+ Integer minutesReminderSend = configurationDao.getConfValue(CONFIG_APPOINTMENT_REMINDER_MINUTES, Integer.class
, "" + DEFAULT_MINUTES_REMINDER_SEND);
if (minutesReminderSend == null) {
throw new Exception("minutesReminderSend is null!");
@@ -169,7 +216,7 @@ public class AppointmentLogic {
Calendar aNow = Calendar.getInstance(ownerZone);
Calendar aStart = a.startCalendar(ownerZone);
aStart.add(Calendar.MINUTE, -minutesReminderSend);
- if (aStart.before(aNow)) {
+ if (aStart.after(aNow)) {
// to early to send reminder
continue;
}
@@ -179,6 +226,7 @@ public class AppointmentLogic {
List<MeetingMember> members = a.getMeetingMembers();
+ sendReminder(a.getOwner(), a);
if (members == null) {
log.debug("doScheduledMeetingReminder : no members in meeting!");
continue;
@@ -191,36 +239,7 @@ public class AppointmentLogic {
Invitation inv = mm.getInvitation();
- if (inv == null) {
- log.error(String.format("Error retrieving Invitation for member %s in Appointment %s"
- , mm.getUser().getAdresses().getEmail(), a.getTitle()));
- continue;
- }
-
- if (inv.getBaseUrl() == null || inv.getBaseUrl().length() < 1) {
- log.error("Error retrieving baseUrl from Invitation ID : " + inv.getId());
- continue;
- }
-
- TimeZone tZone = timezoneUtil.getTimeZone(mm.getTimeZoneId());
-
- long language_id = mm.getUser().getLanguage_id();
- // Get the required labels one time for all meeting members. The
- // Language of the email will be the system default language
- String labelid1158 = fieldManager.getString(1158L, language_id);
- String labelid1153 = fieldManager.getString(1153L, language_id);
- String labelid1154 = fieldManager.getString(1154L, language_id);
-
- String subject = generateSubject(labelid1158, a, tZone);
- String smsSubject = generateSMSSubject(labelid1158, a);
-
- String message = generateMessage(labelid1158, a, language_id, labelid1153, labelid1154, tZone);
-
- invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false);
-
- invitationManager.sendInvitationReminderSMS(mm.getUser().getAdresses().getPhone(), smsSubject, language_id);
- inv.setUpdated(new Date());
- invitationDao.update(inv);
+ sendReminder(mm.getUser(), a, inv);
}
}
}
@@ -258,7 +277,7 @@ public class AppointmentLogic {
StringBuilder message = new StringBuilder(labelid1158);
message.append(" ").append(ment.getTitle());
- if (ment.getDescription().length() != 0) {
+ if (ment.getDescription() != null && ment.getDescription().length() > 0) {
message.append(fieldManager.getString(1152L, language_id)).append(ment.getDescription());
}
@@ -276,7 +295,7 @@ public class AppointmentLogic {
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, Long languageId,
Boolean isPasswordProtected, String password, long roomId, Long users_id) {
Appointment a = new Appointment();
a.setTitle(appointmentName);
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java Tue Apr 8 23:32:32 2014
@@ -28,6 +28,7 @@ import java.util.TimeZone;
import java.util.Vector;
import org.apache.openmeetings.data.basic.FieldManager;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.IInvitationManager;
import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
@@ -69,6 +70,8 @@ public class InvitationManager implement
private SMSHandler smsHandler;
@Autowired
private TimezoneUtil timezoneUtil;
+ @Autowired
+ private ConfigurationDao configDao;
/**
* Sending invitation within plain mail
@@ -76,7 +79,6 @@ public class InvitationManager implement
* @param user_level
* @param username
* @param message
- * @param baseurl
* @param email
* @param subject
* @param rooms_id
@@ -92,18 +94,18 @@ public class InvitationManager implement
// ---------------------------------------------------------------------------------------------------------
public Invitation getInvitation(User inveetee, Room room
, boolean isPasswordProtected, String invitationpass, Valid valid,
- User createdBy, String baseUrl, Long language_id, Date gmtTimeStart, Date gmtTimeEnd
+ User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment)
{
Invitation i = getInvitation(null, inveetee, room, isPasswordProtected, invitationpass, valid, createdBy
- , baseUrl, language_id, gmtTimeStart, gmtTimeEnd, appointment);
+ , language_id, gmtTimeStart, gmtTimeEnd, appointment);
i = invitationDao.update(i);
return i;
}
public Invitation getInvitation(Invitation _invitation, User inveetee, Room room
, boolean isPasswordProtected, String invitationpass, Valid valid,
- User createdBy, String baseUrl, Long language_id, Date gmtTimeStart, Date gmtTimeEnd
+ User createdBy, Long language_id, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment) {
Invitation invitation = _invitation;
@@ -124,10 +126,6 @@ public class InvitationManager implement
}
invitation.setUsed(false);
- log.debug(baseUrl);
- if (baseUrl != null) {
- invitation.setBaseUrl(baseUrl);
- }
invitation.setValid(valid);
// valid period of Invitation
@@ -162,11 +160,11 @@ public class InvitationManager implement
* @param member
* @param a
*/
- public void processInvitation(Appointment a, MeetingMember member, MessageType type, String baseUrl) {
- processInvitation(a, member, type, baseUrl, true);
+ public void processInvitation(Appointment a, MeetingMember member, MessageType type) {
+ processInvitation(a, member, type, true);
}
- public void processInvitation(Appointment a, MeetingMember mm, MessageType type, String baseUrl, boolean sendMail) {
+ public void processInvitation(Appointment a, MeetingMember mm, MessageType type, boolean sendMail) {
if (a.getRemind() == null) {
log.error("Appointment doesn't have reminder set!");
return;
@@ -186,7 +184,7 @@ public class InvitationManager implement
try {
mm.setInvitation(getInvitation(mm.getInvitation()
, mm.getUser(), a.getRoom(), a.isPasswordProtected(), a.getPassword()
- , Valid.Period, a.getOwner(), baseUrl, null, a.getStart(), a.getEnd(), a));
+ , Valid.Period, a.getOwner(), null, a.getStart(), a.getEnd(), a));
if (sendMail) {
sendInvitionLink(a, mm, type, remindType > 2);
}
@@ -314,7 +312,6 @@ public class InvitationManager implement
* @param mm
* @param a
* @param message
- * @param baseurl
* @param subject
* @throws Exception
*/
@@ -345,7 +342,7 @@ public class InvitationManager implement
}
public void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception {
- String invitation_link = LinkHelper.getInvitationLink(i);
+ String invitation_link = LinkHelper.getInvitationLink(configDao.getBaseUrl(), i);
User owner = i.getInvitedBy();
String invitorName = owner.getFirstname() + " " + owner.getLastname();
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java Tue Apr 8 23:32:32 2014
@@ -567,9 +567,9 @@ public class UserManager implements IUse
public Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, long states_id,
- String town, long language_id, String phone, boolean sendSMS, String baseURL,
- boolean generateSipUserData, String jNameTimeZone) {
+ String town, long language_id, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone) {
+ String baseURL = configurationDao.getBaseUrl();
boolean sendConfirmation = baseURL != null
&& !baseURL.isEmpty()
&& 1 == configurationDao.getConfValue(
@@ -577,7 +577,7 @@ public class UserManager implements IUse
return registerUser(login, Userpass, lastname, firstname, email, age,
street, additionalname, fax, zip, states_id, town, language_id,
- phone, sendSMS, baseURL, generateSipUserData, jNameTimeZone, sendConfirmation);
+ phone, sendSMS, generateSipUserData, jNameTimeZone, sendConfirmation);
}
public Long registerUserNoEmail(String login, String Userpass,
@@ -588,13 +588,13 @@ public class UserManager implements IUse
return registerUser(login, Userpass, lastname, firstname, email, age,
street, additionalname, fax, zip, states_id, town, language_id,
- phone, sendSMS, "", generateSipUserData, jNameTimeZone, false);
+ phone, sendSMS, generateSipUserData, jNameTimeZone, false);
}
private Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, long states_id,
- String town, long language_id, String phone, boolean sendSMS, String baseURL,
+ String town, long language_id, String phone, boolean sendSMS,
boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation) {
try {
// Checks if FrontEndUsers can register
@@ -607,8 +607,7 @@ public class UserManager implements IUse
additionalname, fax, zip, states_id, town, language_id,
true, Arrays.asList(configurationDao.getConfValue(
"default_domain_id", Long.class, null)), phone,
- sendSMS, baseURL,
- sendConfirmation, jNameTimeZone, false, "", "", false, true);
+ sendSMS, sendConfirmation, jNameTimeZone, false, "", "", false, true);
if (user_id > 0 && sendConfirmation) {
return new Long(-40);
@@ -652,7 +651,7 @@ public class UserManager implements IUse
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, long states_id,
String town, long language_id, boolean sendWelcomeMessage,
- List<Long> organisations, String phone, boolean sendSMS, String baseURL,
+ List<Long> organisations, String phone, boolean sendSMS,
Boolean sendConfirmation, String iCalTz, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
Boolean showContactDataToContacts) throws Exception {
@@ -661,8 +660,7 @@ public class UserManager implements IUse
firstname, email, age, street,
additionalname, fax, zip, states_id,
town, language_id, sendWelcomeMessage,
- organisations, phone, sendSMS, baseURL,
- sendConfirmation,
+ organisations, phone, sendSMS, sendConfirmation,
timezoneUtil.getTimeZone(iCalTz),
forceTimeZoneCheck,
userOffers, userSearchs, showContactData,
@@ -691,7 +689,6 @@ public class UserManager implements IUse
* @param organisations
* @param phone
* @param sendSMS
- * @param baseURL
* @param sendConfirmation
* @param timezone
* @param forceTimeZoneCheck
@@ -709,8 +706,7 @@ public class UserManager implements IUse
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, long states_id,
String town, long language_id, boolean sendWelcomeMessage,
- List<Long> organisations, String phone, boolean sendSMS, String baseURL,
- Boolean sendConfirmation,
+ List<Long> organisations, String phone, boolean sendSMS, Boolean sendConfirmation,
TimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
Boolean showContactDataToContacts, String activatedHash) throws Exception {
@@ -726,17 +722,15 @@ public class UserManager implements IUse
boolean checkEmail = usersDao.checkUserEMail(email, null);
if (checkName && checkEmail) {
- String link = baseURL;
+ String link = configurationDao.getBaseUrl();
String hash = activatedHash;
if (hash == null){
hash = ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(login
+ CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
- link += baseURL + "activateUser?u=" + hash;
+ link += "activateUser?u=" + hash;
}
if (sendWelcomeMessage && email.length() != 0) {
- // We need to pass the baseURL to check if this is
- // really set to be send
String sendMail = emailManagement.sendMail(login,
password, email, link, sendConfirmation);
if (!sendMail.equals("success"))
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java Tue Apr 8 23:32:32 2014
@@ -687,7 +687,6 @@ public class LdapLoginManagement impleme
// Ids
phone,
false,
- "",// BaseURL is empty as we do not send an Email here
false,// send verification code
iCalTz,
false, // forceTimeZoneCheck
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java Tue Apr 8 23:32:32 2014
@@ -63,24 +63,12 @@ public class InvitationService implement
log.debug("InvitationService resultReceived" + arg0);
}
- private String getBaseUrl(String baseUrl) {
- String url = null;
- if (baseUrl != null) {
- url = baseUrl.toLowerCase();
- if (url.endsWith("swf")) {
- url = url.substring(0, url.length() - 4);
- }
- }
- return url;
- }
-
/**
* send an invitation to another user by Mail
*
* @param SID
* @param username
* @param message
- * @param baseurl
* @param email
* @param subject
* @param room_id
@@ -97,7 +85,7 @@ public class InvitationService implement
* @return - invitation object in case of success, "Sys - Error" string or null in case of error
*/
public Object sendInvitationHash(String SID, String username,
- String message, String baseurl, String email, String subject,
+ String message, String email, String subject,
Long room_id, String conferencedomain, Boolean isPasswordProtected,
String invitationpass, Integer valid, Date validFromDate,
String validFromTime, Date validToDate, String validToTime,
@@ -151,7 +139,7 @@ public class InvitationService implement
User invitee = userDao.getContact(email, users_id);
Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id),
isPasswordProtected, invitationpass, Valid.fromInt(valid)
- , userDao.get(users_id), getBaseUrl(baseurl), language_id,
+ , userDao.get(users_id), language_id,
dFrom, dTo, null);
if (invitation != null) {
@@ -174,14 +162,13 @@ public class InvitationService implement
return null;
}
- public String sendInvitationByHash(String SID, String invitationHash, String message, String baseurl, String subject
+ public String sendInvitationByHash(String SID, String invitationHash, String message, String subject
, Long language_id) throws Exception {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
if (AuthLevelUtil.checkUserLevel(user_level)) {
Invitation inv = (Invitation)invitationManager.getInvitationByHashCode(invitationHash, true);
- inv.setBaseUrl(getBaseUrl(baseurl));
inv.getInvitee().setLanguage_id(language_id);
invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false);
} else {
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/UserService.java Tue Apr 8 23:32:32 2014
@@ -447,13 +447,6 @@ public class UserService implements IUse
log.info("validFromDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(start));
log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(end));
- String baseURL = "http://" + domain + ":" + port + webapp;
- if (port.equals("80")) {
- baseURL = "http://" + domain + webapp;
- } else if (port.equals("443")) {
- baseURL = "https://" + domain + webapp;
- }
-
Appointment a = new Appointment();
a.setTitle(subject);
a.setDescription(message);
@@ -476,7 +469,7 @@ public class UserService implements IUse
mm.setUser(userDao.getContact(email, users_id));
a.getMeetingMembers().add(mm);
}
- a = appointmentDao.update(a, baseURL, users_id);
+ a = appointmentDao.update(a, users_id);
for (MeetingMember mm : a.getMeetingMembers()) {
User to = mm.getUser();
Room room = a.getRoom();
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java Tue Apr 8 23:32:32 2014
@@ -25,19 +25,21 @@ import org.apache.openmeetings.db.entity
public class LinkHelper {
- public static String getInvitationLink(Invitation i) {
- String link = i.getBaseUrl();
+ public static String getInvitationLink(String baseUrl, Invitation i) {
+ String link = baseUrl;
if (link == null) {
return null;
}
- if (i.getInvitee().getType() == Type.contact) {
- link += "?invitationHash=" + i.getHash();
-
- if (i.getInvitee().getLanguage_id() > 0) {
- link += "&language=" + i.getInvitee().getLanguage_id().toString();
+ if (i.getRoom() != null) {
+ if (i.getInvitee().getType() == Type.contact) {
+ link += "?invitationHash=" + i.getHash();
+
+ if (i.getInvitee().getLanguage_id() > 0) {
+ link += "&language=" + i.getInvitee().getLanguage_id().toString();
+ }
+ } else {
+ link = getRoomUrlFragment(i.getRoom().getRooms_id()).getLink();
}
- } else {
- link = getRoomUrlFragment(i.getRoom().getRooms_id()).getLink(i.getBaseUrl());
}
return link;
}
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Tue Apr 8 23:32:32 2014
@@ -44,7 +44,6 @@ import org.springframework.beans.factory
public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
private static final Logger log = Red5LoggerFactory.getLogger(AbstractJUnitDefaults.class);
- public static final String OM_URL = "http://testserver.apache.org/openmeetings";
protected static final String username = "swagner";
protected static final String userpass = "qweqwe";
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Tue Apr 8 23:32:32 2014
@@ -66,15 +66,14 @@ public class TestAppointmentAddAppointme
"first" + i + ".last" + i + "@webbase-design.de", "Etc/GMT+1");
}
Long language_id = 1L;
- String baseUrl = "http://localhost:5080/openmeetings/";
Long roomType = 1L;
Appointment a = appointmentLogic.getAppointment(appointmentName,
appointmentLocation, appointmentDescription,
start, end, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, mmClient,
- roomType, baseUrl, language_id, false, "", -1, users_id);
- a = appointmentDao.update(a, baseUrl, users_id);
+ roomType, language_id, false, "", -1, users_id);
+ a = appointmentDao.update(a, users_id);
Thread.sleep(3000);
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java Tue Apr 8 23:32:32 2014
@@ -77,9 +77,9 @@ public class TestDatabaseStructureGetApp
mm3.setAppointment(a3);
a3.getMeetingMembers().add(mm3);
- a1 = appointmentDao.update(a1, OM_URL, userId);
- a2 = appointmentDao.update(a2, OM_URL, userId);
- a3 = appointmentDao.update(a3, OM_URL, userId);
+ a1 = appointmentDao.update(a1, userId);
+ a2 = appointmentDao.update(a2, userId);
+ a3 = appointmentDao.update(a3, userId);
int a1found = 0, a2found = 0, a3found = 0;
for (Appointment a : appointmentDao.getAppointmentsByRange(userId, rangeStart.getTime(), rangeEnd.getTime())) {
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java Tue Apr 8 23:32:32 2014
@@ -48,7 +48,7 @@ public class TestGetAppointment extends
Appointment a1 = getAppointment(now.getTime(), a1End.getTime());
a1.setTitle("GetAppointment");
- a1 = appointmentDao.update(a1, OM_URL, userId);
+ a1 = appointmentDao.update(a1, userId);
Appointment a = appointmentDao.get(a1.getId());
assertNotNull("Failed to get Appointment By id", a);
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java Tue Apr 8 23:32:32 2014
@@ -49,7 +49,7 @@ public class TestInvitation extends Abst
User us = (User) userManager.loginUser(sessionData.getSession_id(), username, userpass, null, null, false);
- invitationService.sendInvitationHash(sessionData.getSession_id(), username, "message", "baseurl", "sebawagner@apache.org",
+ invitationService.sendInvitationHash(sessionData.getSession_id(), username, "message", "sebawagner@apache.org",
"subject", 1L, "", false, "", 1, new Date(), "12:00", new Date(), "14:00", 1L, us.getTimeZoneId(), true);
} catch (Exception err) {
Modified: openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original)
+++ openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Tue Apr 8 23:32:32 2014
@@ -33,8 +33,14 @@ public class OpenmeetingsVariables {
public static final String CONFIG_IGNORE_BAD_SSL = "oauth2.ignore_bad_ssl";
public static final String CONFIG_DEFAULT_LANDING_ZONE = "default.landing.zone";
public static final String CONFIG_DEFAULT_LDAP_ID = "ldap_default_id";
- public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based
public static final String CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY = "redirect.url.for.external.users";
+ public static final String CONFIG_APPOINTMENT_REMINDER_MINUTES = "number.minutes.reminder.send";
+ public static final String CONFIG_APPLICATION_BASE_URL = "application.base.url";
+
+ public static int DEFAULT_MINUTES_REMINDER_SEND = 15;
+ public static String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";
+
+ public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based
public static String webAppRootKey = null;
public static String webAppRootPath = null;
public static String configKeyCryptClassName = null;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java Tue Apr 8 23:32:32 2014
@@ -94,7 +94,6 @@ public class WebSession extends Abstract
private DateFormat ISO8601FORMAT = new SimpleDateFormat(ISO8601_FORMAT_STRING); //FIXME not thread safe
private DateFormat sdf;
private Dashboard dashboard;
- private String baseUrl = null;
private Locale browserLocale = null;
private Long recordingId;
private Long loginError = null;
@@ -372,14 +371,6 @@ public class WebSession extends Abstract
return d;
}
- public static String getBaseUrl() {
- return get().baseUrl;
- }
-
- public void setBaseUrl(String baseUrl){
- this.baseUrl = baseUrl;
- }
-
public Locale getBrowserLocale(){
return browserLocale;
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java Tue Apr 8 23:32:32 2014
@@ -34,7 +34,6 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.MenuPanel;
import org.apache.openmeetings.web.user.AboutDialog;
import org.apache.openmeetings.web.user.ChatPanel;
-import org.apache.openmeetings.web.util.BaseUrlAjaxBehavior;
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -144,8 +143,6 @@ public class MainPage extends BaseInited
WebSession.get().setArea(null);
}
});
-
- add(new BaseUrlAjaxBehavior());
}
public void updateContents(OmUrlFragment f, AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Tue Apr 8 23:32:32 2014
@@ -20,12 +20,12 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.mail.MailHandler;
@@ -188,7 +188,7 @@ public class ForgetPasswordDialog extend
@Override
protected void onSubmit(AjaxRequestTarget target) {
resetUser(type == Type.email ? name : "", type == Type.login ? name : ""
- , getBaseUrl() + getRequestCycle().urlFor(ResetPage.class, new PageParameters()).toString().substring(2));
+ , getBean(ConfigurationDao.class).getBaseUrl() + getRequestCycle().urlFor(ResetPage.class, new PageParameters()).toString().substring(2));
}
/**
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Tue Apr 8 23:32:32 2014
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.db
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
@@ -41,7 +40,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.pages.ActivatePage;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -56,7 +54,6 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -153,7 +150,7 @@ public class RegisterDialog extends Abst
}
public void onOpen(AjaxRequestTarget target) {
- String baseURL = getBaseUrl();
+ String baseURL = getBean(ConfigurationDao.class).getBaseUrl();
sendEmailAtRegister = 1 == getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister", Integer.class,
"0");
sendConfirmation = baseURL != null
@@ -199,15 +196,12 @@ public class RegisterDialog extends Abst
String hash = ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(
login + CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
- String redirectPage = getRequestCycle().urlFor(ActivatePage.class, new PageParameters().add("u", hash))
- .toString().substring(2);
- String baseURL = getBaseUrl() + redirectPage;
try {
getBean(IUserManager.class).registerUserInit(3, 1, 0, 1, login, password, lastName, firstName, email,
null /* age/birthday */, "" /* street */, "" /* additionalname */, "" /* fax */, "" /* zip */, state.getState_id(),
"" /* town */, lang.getLanguage_id(), true /* sendWelcomeMessage */,
Arrays.asList(getBean(ConfigurationDao.class).getConfValue("default_domain_id", Long.class, null)),
- "" /* phone */, false, baseURL, sendConfirmation, TimeZone.getTimeZone(tzModel.getObject()),
+ "" /* phone */, false, sendConfirmation, TimeZone.getTimeZone(tzModel.getObject()),
false /* forceTimeZoneCheck */, "" /* userOffers */, "" /* userSearchs */, false /* showContactData */,
true /* showContactDataToContacts */, hash);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Tue Apr 8 23:32:32 2014
@@ -38,7 +38,6 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.SwfPage;
-import org.apache.openmeetings.web.util.BaseUrlAjaxBehavior;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
@@ -90,7 +89,6 @@ public class SignInDialog extends Abstra
public SignInDialog(String id) {
super(id, WebSession.getString(108));
add(form = new SignInForm("signin"));
- add(new BaseUrlAjaxBehavior());
add(new AjaxClientInfoBehavior());
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Tue Apr 8 23:32:32 2014
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.RoomTypeDropDown.getRoomTypes;
@@ -136,7 +135,7 @@ public class AppointmentDialog extends A
}
protected void deleteAppointment(AjaxRequestTarget target) {
- getBean(AppointmentDao.class).delete(getModelObject(), getBaseUrl(), getUserId());
+ getBean(AppointmentDao.class).delete(getModelObject(), getUserId());
calendar.refresh(target);
}
@@ -209,7 +208,7 @@ public class AppointmentDialog extends A
}
}
a.setMeetingMembers(attendees);
- getBean(AppointmentDao.class).update(a, getBaseUrl(), getUserId());
+ getBean(AppointmentDao.class).update(a, getUserId());
target.add(feedback);
calendar.refresh(target);
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Tue Apr 8 23:32:32 2014
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import static org.apache.openmeetings.web.app.WebSession.getClientTimeZone;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -229,7 +228,7 @@ public class CalendarPanel extends UserP
cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
a.setEnd(cal.getTime());
- dao.update(a, getBaseUrl(), getUserId());
+ dao.update(a, getUserId());
//FIXME add feedback info
}
@@ -242,7 +241,7 @@ public class CalendarPanel extends UserP
cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
a.setEnd(cal.getTime());
- dao.update(a, getBaseUrl(), getUserId());
+ dao.update(a, getUserId());
//FIXME add feedback info
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Tue Apr 8 23:32:32 2014
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
import static org.apache.openmeetings.db.entity.user.PrivateMessage.SENT_FOLDER_ID;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.RoomTypeDropDown.getRoomTypes;
@@ -32,6 +31,7 @@ import java.util.Date;
import java.util.List;
import org.apache.openmeetings.data.conference.InvitationManager;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -208,10 +208,10 @@ public class MessageDialog extends Abstr
if (p.isBookedRoom()) {
Invitation i = getBean(InvitationManager.class).getInvitation(to, p.getRoom(),
false, null, Valid.Period
- , userDao.get(getUserId()), getBaseUrl(), userDao.get(getUserId()).getLanguage_id(),
+ , userDao.get(getUserId()), userDao.get(getUserId()).getLanguage_id(),
modelStart.getObject(), modelEnd.getObject(), null);
- invitation_link = LinkHelper.getInvitationLink(i);
+ invitation_link = LinkHelper.getInvitationLink(getBean(ConfigurationDao.class).getBaseUrl(), i);
if (invitation_link == null) {
invitation_link = "";
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java Tue Apr 8 23:32:32 2014
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.util
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANDING_ZONE;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getSid;
import static org.apache.openmeetings.web.user.profile.SettingsPanel.EDIT_PROFILE_TAB_ID;
@@ -295,10 +294,6 @@ public class OmUrlFragment implements Se
}
public String getLink() {
- return getLink(getBaseUrl());
- }
-
- public String getLink(String baseUrl) {
- return baseUrl + "#" + getArea().name() + "/" + getType();
+ return getBean(ConfigurationDao.class).getBaseUrl() + "#" + getArea().name() + "/" + getType();
}
}
Modified: openmeetings/trunk/singlewebapp/docs/CalendarService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/CalendarService.html?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/CalendarService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/CalendarService.html Tue Apr 8 23:32:32 2014
@@ -417,8 +417,6 @@
,
Long roomType
,
- String baseUrl
- ,
Long languageId
,
Boolean isPasswordProtected
@@ -571,14 +569,6 @@
<tr>
<td valign="top">
- String
- </td>
- <td valign="top">baseUrl</td>
- <td valign="top">the base URL for the invitations</td>
- </tr>
-
- <tr>
- <td valign="top">
Long
</td>
<td valign="top">languageId</td>
@@ -606,7 +596,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?SID=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseUrl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE">http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?SID=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&am
p;appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseUrl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?SID=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE">http://localhost:5080/openmeetings/services/CalendarService/saveAppointment?SID=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appoi
ntmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE&roomId=VALUE</a>
</div>
<div class="method">
<div class="method_header">
@@ -624,8 +614,6 @@
,
Date appointmentend
,
- String baseurl
- ,
Long languageId
)
</i><br/>
@@ -680,14 +668,6 @@
<tr>
<td valign="top">
- String
- </td>
- <td valign="top">baseurl</td>
- <td valign="top">the base URL for the invitations that will be send by email</td>
- </tr>
-
- <tr>
- <td valign="top">
Long
</td>
<td valign="top">languageId</td>
@@ -698,7 +678,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/CalendarService/updateAppointmentTimeOnly?SID=VALUE&appointmentId=VALUE&appointmentstart=VALUE&appointmentend=VALUE&baseurl=VALUE&languageId=VALUE">http://localhost:5080/openmeetings/services/CalendarService/updateAppointmentTimeOnly?SID=VALUE&appointmentId=VALUE&appointmentstart=VALUE&appointmentend=VALUE&baseurl=VALUE&languageId=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/CalendarService/updateAppointmentTimeOnly?SID=VALUE&appointmentId=VALUE&appointmentstart=VALUE&appointmentend=VALUE&languageId=VALUE">http://localhost:5080/openmeetings/services/CalendarService/updateAppointmentTimeOnly?SID=VALUE&appointmentId=VALUE&appointmentstart=VALUE&appointmentend=VALUE&languageId=VALUE</a>
</div>
<div class="method">
<div class="method_header">
@@ -738,8 +718,6 @@
,
Long roomType
,
- String baseurl
- ,
Long languageId
,
Boolean isPasswordProtected
@@ -896,14 +874,6 @@
<tr>
<td valign="top">
- String
- </td>
- <td valign="top">baseUrl</td>
- <td valign="top">the base URL for the invitations</td>
- </tr>
-
- <tr>
- <td valign="top">
Long
</td>
<td valign="top">languageId</td>
@@ -931,7 +901,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/CalendarService/updateAppointment?SID=VALUE&appointmentId=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseurl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE">http://localhost:5080/openmeetings/services/CalendarService/updateAppointment?SID=VALUE&appointmentId=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&
amp;appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&baseurl=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/CalendarService/updateAppointment?SID=VALUE&appointmentId=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE">http://localhost:5080/openmeetings/services/CalendarService/updateAppointment?SID=VALUE&appointmentId=VALUE&appointmentName=VALUE&appointmentLocation=VALUE&appointmentDescription=VALUE&a
mp;appointmentstart=VALUE&appointmentend=VALUE&isDaily=VALUE&isWeekly=VALUE&isMonthly=VALUE&isYearly=VALUE&categoryId=VALUE&remind=VALUE&mmClient=VALUE&roomType=VALUE&languageId=VALUE&isPasswordProtected=VALUE&password=VALUE</a>
</div>
<div class="method">
<div class="method_header">
Modified: openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html (original)
+++ openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html Tue Apr 8 23:32:32 2014
@@ -625,6 +625,20 @@
3.0.x
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ application.base.url
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ http://localhost:5080/openmeetings
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ Base URL your OPenmeetings installation will be accessible at.
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ 3.0.x
+ </td>
+ </tr>
</table>
</blockquote>
</td></tr>
Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Tue Apr 8 23:32:32 2014
@@ -3849,8 +3849,6 @@
,
String message
,
- String baseurl
- ,
String email
,
String subject
@@ -3928,15 +3926,6 @@
<td valign="top">
String
</td>
- <td valign="top">baseurl</td>
- <td valign="top">the baseURL for the Infivations link in the Mail Body if
- sendMail is true</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
<td valign="top">email</td>
<td valign="top">the Email to send the invitation to if sendMail is true</td>
</tr>
@@ -4048,7 +4037,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/RoomService/sendInvitationHash?SID=VALUE&username=VALUE&message=VALUE&baseurl=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&validFromDate=VALUE&validFromTime=VALUE&validToDate=VALUE&validToTime=VALUE&language_id=VALUE&sendMail=VALUE">http://localhost:5080/openmeetings/services/RoomService/sendInvitationHash?SID=VALUE&username=VALUE&message=VALUE&baseurl=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VA
LUE&valid=VALUE&validFromDate=VALUE&validFromTime=VALUE&validToDate=VALUE&validToTime=VALUE&language_id=VALUE&sendMail=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/RoomService/sendInvitationHash?SID=VALUE&username=VALUE&message=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&validFromDate=VALUE&validFromTime=VALUE&validToDate=VALUE&validToTime=VALUE&language_id=VALUE&sendMail=VALUE">http://localhost:5080/openmeetings/services/RoomService/sendInvitationHash?SID=VALUE&username=VALUE&message=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&validFromDate=VALUE&vali
dFromTime=VALUE&validToDate=VALUE&validToTime=VALUE&language_id=VALUE&sendMail=VALUE</a>
</div>
<div class="method">
<div class="method_header">
@@ -4064,8 +4053,6 @@
,
String message
,
- String baseurl
- ,
String email
,
String subject
@@ -4139,15 +4126,6 @@
<td valign="top">
String
</td>
- <td valign="top">baseurl</td>
- <td valign="top">the baseURL for the Infivations link in the Mail Body if
- sendMail is true</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
<td valign="top">email</td>
<td valign="top">the Email to send the invitation to if sendMail is true</td>
</tr>
@@ -4241,7 +4219,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/RoomService/sendInvitationHashWithDateObject?SID=VALUE&username=VALUE&message=VALUE&baseurl=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&fromDate=VALUE&toDate=VALUE&language_id=VALUE&sendMail=VALUE">http://localhost:5080/openmeetings/services/RoomService/sendInvitationHashWithDateObject?SID=VALUE&username=VALUE&message=VALUE&baseurl=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&fromDate=VALUE&toDate=VALUE&
language_id=VALUE&sendMail=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/RoomService/sendInvitationHashWithDateObject?SID=VALUE&username=VALUE&message=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&fromDate=VALUE&toDate=VALUE&language_id=VALUE&sendMail=VALUE">http://localhost:5080/openmeetings/services/RoomService/sendInvitationHashWithDateObject?SID=VALUE&username=VALUE&message=VALUE&email=VALUE&subject=VALUE&room_id=VALUE&conferencedomain=VALUE&isPasswordProtected=VALUE&invitationpass=VALUE&valid=VALUE&fromDate=VALUE&toDate=VALUE&language_id=VALUE&sendMail=VALUE</a>
</div>
<div class="method">
<div class="method_header">
@@ -4666,8 +4644,6 @@
,
String email
,
- String baseUrl
- ,
Long language_id
)
</i><br/>
@@ -4731,15 +4707,6 @@
<tr>
<td valign="top">
- String
- </td>
- <td valign="top">baseUrl</td>
- <td valign="top">The baseUrl, this is important to send the correct link in the
- invitation to the meeting member</td>
- </tr>
-
- <tr>
- <td valign="top">
Long
</td>
<td valign="top">language_id</td>
@@ -4751,7 +4718,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/RoomService/addMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&baseUrl=VALUE&language_id=VALUE">http://localhost:5080/openmeetings/services/RoomService/addMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&baseUrl=VALUE&language_id=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/RoomService/addMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&language_id=VALUE">http://localhost:5080/openmeetings/services/RoomService/addMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&language_id=VALUE</a>
</div>
<div class="method">
<div class="method_header">
@@ -4771,8 +4738,6 @@
,
String email
,
- String baseUrl
- ,
Long language_id
,
String jNameTimeZone
@@ -4840,15 +4805,6 @@
<tr>
<td valign="top">
- String
- </td>
- <td valign="top">baseUrl</td>
- <td valign="top">The baseUrl, this is important to send the correct link in the
- invitation to the meeting member</td>
- </tr>
-
- <tr>
- <td valign="top">
Long
</td>
<td valign="top">language_id</td>
@@ -4876,7 +4832,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/RoomService/addExternalMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&baseUrl=VALUE&language_id=VALUE&jNameTimeZone=VALUE&invitorName=VALUE">http://localhost:5080/openmeetings/services/RoomService/addExternalMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&baseUrl=VALUE&language_id=VALUE&jNameTimeZone=VALUE&invitorName=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/RoomService/addExternalMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&language_id=VALUE&jNameTimeZone=VALUE&invitorName=VALUE">http://localhost:5080/openmeetings/services/RoomService/addExternalMeetingMemberRemindToRoom?SID=VALUE&room_id=VALUE&firstname=VALUE&lastname=VALUE&email=VALUE&language_id=VALUE&jNameTimeZone=VALUE&invitorName=VALUE</a>
</div>
<div class="method">
<div class="method_header">
Modified: openmeetings/trunk/singlewebapp/docs/UserService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/UserService.html Tue Apr 8 23:32:32 2014
@@ -359,8 +359,6 @@
String town
,
long language_id
- ,
- String baseURL
)
</i><br/>
<p>
@@ -485,21 +483,11 @@
<td valign="top">the language_id</td>
</tr>
- <tr>
- <td valign="top">
- String
- </td>
- <td valign="top">baseURL</td>
- <td valign="top">the baseURL is needed to send the Initial Email correctly to
- that User, otherwise the Link in the EMail that the new User
- will reveive is not valid</td>
- </tr>
-
</tbody>
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE</a>
</div>
<div class="method">
<div class="method_header">
@@ -535,8 +523,6 @@
,
long language_id
,
- String baseURL
- ,
String jNameTimeZone
)
</i><br/>
@@ -666,16 +652,6 @@
<td valign="top">
String
</td>
- <td valign="top">baseURL</td>
- <td valign="top">the baseURL is needed to send the Initial Email correctly to
- that User, otherwise the Link in the EMail that the new User
- will reveive is not valid</td>
- </tr>
-
- <tr>
- <td valign="top">
- String
- </td>
<td valign="top">jNameTimeZone</td>
<td valign="top">the name of the timezone for the user</td>
</tr>
@@ -684,7 +660,7 @@
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE</a>
+ <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&jNameTimeZone=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&jNameTimeZone=VALUE</a>
</div>
<div class="method">
<div class="method_header">
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java Tue Apr 8 23:32:32 2014
@@ -19,7 +19,6 @@
package org.apache.openmeetings.axis.services;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
import java.util.ArrayList;
import java.util.Calendar;
@@ -44,7 +43,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.AuthLevelUtil;
-import org.apache.openmeetings.web.app.WebSession;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -261,8 +259,6 @@ public class CalendarWebService {
* =2,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1
* @param roomType
* the room type for the calendar event
- * @param baseUrl
- * the base URL for the invitations
* @param languageId
* the language id of the calendar event, notification emails
* will be send in this language
@@ -278,10 +274,10 @@ 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, Long languageId,
Boolean isPasswordProtected, String password, long roomId) {
//Seems to be create
- log.debug("saveAppointMent SID:" + SID + ", baseUrl : " + baseUrl);
+ log.debug("saveAppointMent SID:" + SID);
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -292,8 +288,8 @@ public class CalendarWebService {
if (AuthLevelUtil.checkUserLevel(user_level)) {
Appointment a = appointmentLogic.getAppointment(appointmentName, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly, isMonthly, isYearly, categoryId, remind,
- mmClient, roomType, baseUrl, languageId, isPasswordProtected, password, roomId, users_id);
- return appointmentDao.update(a, baseUrl, users_id).getId();
+ mmClient, roomType, languageId, isPasswordProtected, password, roomId, users_id);
+ return appointmentDao.update(a, users_id).getId();
} else {
log.error("saveAppointment : wrong user level");
}
@@ -315,15 +311,13 @@ public class CalendarWebService {
* start yyyy-mm-dd
* @param appointmentend
* end yyyy-mm-dd
- * @param baseurl
- * the base URL for the invitations that will be send by email
* @param languageId
* the language id
*
* @return - id of appointment updated
*/
public Long updateAppointmentTimeOnly(String SID, Long appointmentId,
- Date appointmentstart, Date appointmentend, String baseurl,
+ Date appointmentstart, Date appointmentend,
Long languageId) {
try {
@@ -338,9 +332,8 @@ public class CalendarWebService {
if (!a.getStart().equals(appointmentstart) || !a.getEnd().equals(appointmentend)) {
a.setStart(appointmentstart);
a.setEnd(appointmentend);
- WebSession.get().setBaseUrl(baseurl); //TODO verify !!!!!
//FIXME this might change the owner!!!!!
- return appointmentDao.update(a, baseurl, users_id).getId();
+ return appointmentDao.update(a, users_id).getId();
}
}
} catch (Exception err) {
@@ -394,8 +387,6 @@ public class CalendarWebService {
* =2,firstname,lastname,hans.tier@gmail.com,1,Etc/GMT+1
* @param roomType
* the room type for the calendar event
- * @param baseUrl
- * the base URL for the invitations
* @param languageId
* the language id of the calendar event, notification emails
* will be send in this language
@@ -411,7 +402,7 @@ 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,
+ String[] mmClient, Long roomType, Long languageId,
Boolean isPasswordProtected, String password) throws AxisFault {
try {
@@ -442,7 +433,6 @@ public class CalendarWebService {
a.setIsYearly(isYearly);
a.setCategory(appointmentCategoryDao.get(categoryId));
a.setRemind(appointmentReminderTypDao.get(remind));
- WebSession.get().setBaseUrl(baseurl); //TODO verify !!!!!
a.getRoom().setComment(appointmentDescription);
a.getRoom().setName(appointmentName);
a.getRoom().setRoomtype(roomTypeDao.get(roomType));
@@ -455,7 +445,7 @@ public class CalendarWebService {
mm.setAppointment(a);
a.getMeetingMembers().add(mm);
}
- return appointmentDao.update(a, baseurl, users_id).getId();
+ return appointmentDao.update(a, users_id).getId();
} catch (Exception err) {
log.error("[updateAppointment]", err);
throw new AxisFault(err.getMessage());
@@ -496,7 +486,7 @@ public class CalendarWebService {
} else {
throw new AxisFault("Not allowed to preform that action, Authenticate the SID first");
}
- appointmentDao.delete(a, getBaseUrl(), users_id); //FIXME check this !!!!
+ appointmentDao.delete(a, users_id);
return a.getId();
} catch (Exception err) {
log.error("[deleteAppointment]", err);
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java Tue Apr 8 23:32:32 2014
@@ -62,21 +62,18 @@ public class CalendarWebServiceFacade ex
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, Long languageId,
Boolean isPasswordProtected, String password, long roomId) throws AxisFault {
return getBean(CalendarWebService.class).saveAppointment(SID, appointmentName,
appointmentLocation, appointmentDescription, appointmentstart,
appointmentend, isDaily, isWeekly, isMonthly, isYearly,
- categoryId, remind, mmClient, roomType, baseUrl, languageId,
- isPasswordProtected, password, roomId);
+ categoryId, remind, mmClient, roomType, languageId, isPasswordProtected, password, roomId);
}
public Long updateAppointmentTimeOnly(String SID, Long appointmentId,
- Date appointmentstart, Date appointmentend, String baseurl,
- Long languageId) throws AxisFault {
+ Date appointmentstart, Date appointmentend, Long languageId) throws AxisFault {
return getBean(CalendarWebService.class).updateAppointmentTimeOnly(SID,
- appointmentId, appointmentstart, appointmentend, baseurl,
- languageId);
+ appointmentId, appointmentstart, appointmentend, languageId);
}
public Long updateAppointment(String SID, Long appointmentId,
@@ -84,13 +81,12 @@ public class CalendarWebServiceFacade ex
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,
+ String[] mmClient, Long roomType, Long languageId,
Boolean isPasswordProtected, String password) throws AxisFault {
return getBean(CalendarWebService.class).updateAppointment(SID, appointmentId,
appointmentName, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly, isMonthly,
- isYearly, categoryId, remind, mmClient, roomType, baseurl,
- languageId, isPasswordProtected, password);
+ isYearly, categoryId, remind, mmClient, roomType, languageId, isPasswordProtected, password);
}
public Long deleteAppointment(String SID, Long appointmentId,
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1585864&r1=1585863&r2=1585864&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java Tue Apr 8 23:32:32 2014
@@ -144,9 +144,7 @@ public class JabberWebService {
if (AuthLevelUtil.checkUserLevel(user_level)) {
User invitee = userDao.getContact(username, username, username, users_id);
Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id),
- false, "", Valid.OneTime
- , userDao.get(users_id), "", 1L,
- null, null, null);
+ false, "", Valid.OneTime, userDao.get(users_id), 1L, null, null, null);
return ((invitation == null) ? null : invitation.getHash());
} else {