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 2012/07/26 09:31:03 UTC
svn commit: r1365902 [2/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/ WebContent/src/base/auth/
WebContent/src/base/components/dynamicCombobox/
WebContent/src/modules/admin/confadmin/ WebContent/src/modules/admin/ldap/
WebCon...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java Thu Jul 26 07:31:01 2012
@@ -47,7 +47,7 @@ import org.openmeetings.app.data.basic.d
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.data.user.dao.UserSipDataDaoImpl;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.address.Address;
+import org.openmeetings.app.persistence.beans.adresses.Adresses;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.basic.Server;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
@@ -189,7 +189,7 @@ public class Usermanagement {
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + "OR lower(u.login) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
- + "' " + "OR lower(u.address.email) LIKE '"
+ + "' " + "OR lower(u.adresses.email) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + ") ";
@@ -263,7 +263,7 @@ public class Usermanagement {
+ storePermanent);
String hql = "SELECT c from Users AS c "
+ "WHERE "
- + "(c.login LIKE :userOrEmail OR c.address.email LIKE :userOrEmail ) "
+ + "(c.login LIKE :userOrEmail OR c.adresses.email LIKE :userOrEmail ) "
+ "AND c.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
@@ -465,7 +465,7 @@ public class Usermanagement {
public Long updateUser(long user_level, Long user_id, Long level_id,
String login, String password, String lastname, String firstname,
Date age, String street, String additionalname, String zip,
- long state_id, String town, Long language_id, int availible,
+ long states_id, String town, Long language_id, int availible,
String telefon, String fax, String mobil, String email,
String comment, int status, List<Long> organisations, int title_id,
String phone, boolean sendSMS, String sip_user, String sip_pass, String sip_auth,
@@ -486,7 +486,7 @@ public class Usermanagement {
boolean checkEmail = true;
// Compare old address with new address
- if (!email.equals(us.getAddress().getEmail())) {
+ if (!email.equals(us.getAdresses().getEmail())) {
// Its a new one - check, whether another user already uses
// that one...
@@ -542,7 +542,7 @@ public class Usermanagement {
return new Long(-7);
}
}
- us.setAddress(street, zip, town, statemanagement.getStateById(state_id),
+ us.setAdresses(street, zip, town, statemanagement.getStateById(states_id),
additionalname, comment, fax, phone, email);
// emailManagement.updateUserEmail(mail.getMail().getMail_id(),user_id,
// email);
@@ -551,7 +551,7 @@ public class Usermanagement {
UserSipData userSipData = openXGHttpClient
.openSIPgUserCreateUser(firstname, "",
- lastname, us.getAddress().getEmail(),
+ lastname, us.getAdresses().getEmail(),
password, login);
if (us.getUserSipData() == null) {
@@ -821,14 +821,14 @@ public class Usermanagement {
* @param additionalname
* @param fax
* @param zip
- * @param state_id
+ * @param states_id
* @param town
* @param language_id
* @return
*/
public Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long state_id,
+ String additionalname, String fax, String zip, long states_id,
String town, long language_id, String phone, boolean sendSMS, String baseURL,
boolean generateSipUserData, String jNameTimeZone, Server server) {
@@ -838,24 +838,24 @@ public class Usermanagement {
"sendEmailWithVerficationCode", Integer.class, "0");
return registerUser(login, Userpass, lastname, firstname, email, age,
- street, additionalname, fax, zip, state_id, town, language_id,
+ street, additionalname, fax, zip, states_id, town, language_id,
phone, sendSMS, baseURL, generateSipUserData, jNameTimeZone, sendConfirmation, server);
}
public Long registerUserNoEmail(String login, String Userpass,
String lastname, String firstname, String email, Date age,
String street, String additionalname, String fax, String zip,
- long state_id, String town, long language_id, String phone, boolean sendSMS,
+ long states_id, String town, long language_id, String phone, boolean sendSMS,
boolean generateSipUserData, String jNameTimeZone, Server server) {
return registerUser(login, Userpass, lastname, firstname, email, age,
- street, additionalname, fax, zip, state_id, town, language_id,
+ street, additionalname, fax, zip, states_id, town, language_id,
phone, sendSMS, "", generateSipUserData, jNameTimeZone, false, server);
}
private Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long state_id,
+ String additionalname, String fax, String zip, long states_id,
String town, long language_id, String phone, boolean sendSMS, String baseURL,
boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation, Server server) {
try {
@@ -866,7 +866,7 @@ public class Usermanagement {
Long user_id = this.registerUserInit(3, 1, 0, 1, login,
Userpass, lastname, firstname, email, age, street,
- additionalname, fax, zip, state_id, town, language_id,
+ additionalname, fax, zip, states_id, town, language_id,
true, Arrays.asList(cfgManagement.getConfValue("default_domain_id", Long.class, null)),phone, sendSMS, baseURL,
sendConfirmation, "", "", "", generateSipUserData,
jNameTimeZone, false, "", "", false, true, server);
@@ -884,7 +884,7 @@ public class Usermanagement {
}
/**
- * Adds a user including his address-data,auth-date,mail-data
+ * Adds a user including his adress-data,auth-date,mail-data
*
* @param user_level
* @param level_id
@@ -900,7 +900,7 @@ public class Usermanagement {
* @param additionalname
* @param fax
* @param zip
- * @param state_id
+ * @param states_id
* @param town
* @param language_id
* @param phone
@@ -911,7 +911,7 @@ public class Usermanagement {
public Long registerUserInit(long user_level, long level_id, int availible,
int status, String login, String password, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long state_id,
+ 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, String sip_user, String sip_pass,
@@ -922,7 +922,7 @@ public class Usermanagement {
return registerUserInit(user_level, level_id, availible,
status, login, password, lastname,
firstname, email, age, street,
- additionalname, fax, zip, state_id,
+ additionalname, fax, zip, states_id,
town, language_id, sendWelcomeMessage,
organisations, phone, sendSMS, baseURL,
sendConfirmation, sip_user, sip_pass,
@@ -947,7 +947,7 @@ public class Usermanagement {
* @param additionalname
* @param fax
* @param zip
- * @param state_id
+ * @param states_id
* @param town
* @param language_id
* @param sendWelcomeMessage
@@ -974,7 +974,7 @@ public class Usermanagement {
public Long registerUserInit(long user_level, long level_id, int availible,
int status, String login, String password, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long state_id,
+ 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, String sip_user, String sip_pass,
@@ -1022,11 +1022,11 @@ public class Usermanagement {
if (!sendMail.equals("success"))
return new Long(-19);
}
- Address adr = new Address();
+ Adresses adr = new Adresses();
adr.setStreet(street);
adr.setZip(zip);
adr.setTown(town);
- adr.setState(statemanagement.getStateById(state_id));
+ adr.setStates(statemanagement.getStateById(states_id));
adr.setAdditionalname(additionalname);
adr.setComment("");
adr.setFax(fax);
@@ -1051,12 +1051,12 @@ public class Usermanagement {
}
/*
- * Long address_emails_id =
+ * Long adress_emails_id =
* emailManagement.registerEmail(email, address_id,""); if
- * (address_emails_id==null) { return new Long(-112); }
+ * (adress_emails_id==null) { return new Long(-112); }
*/
- if (adr.getId() > 0 && user_id > 0) {
+ if (adr.getAdresses_id() > 0 && user_id > 0) {
return user_id;
} else {
return new Long(-16);
@@ -1091,12 +1091,12 @@ public class Usermanagement {
* @param language_id
* @param Userpass
* is MD5-crypted
- * @param Address address
+ * @param Adresses adress
* @return user_id or error null
*/
public Long addUser(long level_id, int availible, int status,
String firstname, String login, String lastname, long language_id,
- String userpass, Address address, boolean sendSMS, Date age, String hash,
+ String userpass, Adresses adress, boolean sendSMS, Date age, String hash,
String sip_user, String sip_pass, String sip_auth,
boolean generateSipUserData, OmTimeZone timezone,
Boolean forceTimeZoneCheck, String userOffers, String userSearchs,
@@ -1109,7 +1109,7 @@ public class Usermanagement {
users.setLogin(login);
users.setLastname(lastname);
users.setAge(age);
- users.setAddress(address);
+ users.setAdresses(adress);
users.setSendSMS(sendSMS);
users.setAvailible(availible);
users.setLastlogin(new Date());
@@ -1132,7 +1132,7 @@ public class Usermanagement {
UserSipData userSipData = openXGHttpClient
.openSIPgUserCreateUser(firstname, "", lastname, users
- .getAddress().getEmail(), userpass, login);
+ .getAdresses().getEmail(), userpass, login);
Long userSipDataId = userSipDataDao.addUserSipData(userSipData);
@@ -1208,7 +1208,7 @@ public class Usermanagement {
public Long addUserWithExternalKey(long level_id, int availible,
int status, String firstname, String login, String lastname,
- long language_id, String userpass, Address address, Date age,
+ long language_id, String userpass, Adresses address, Date age,
String hash, String externalUserId, String externalUserType,
boolean generateSipUserData, String email, String jNameTimeZone,
String pictureuri) {
@@ -1220,9 +1220,9 @@ public class Usermanagement {
users.setAge(age);
if (address != null) {
- users.setAddress(address);
+ users.setAdresses(address);
} else {
- users.setAddress("", "", "", statemanagement.getStateById(1L), "",
+ users.setAdresses("", "", "", statemanagement.getStateById(1L), "",
"", "", "", email);
}
@@ -1241,7 +1241,7 @@ public class Usermanagement {
UserSipData userSipData = openXGHttpClient
.openSIPgUserCreateUser(firstname, "", lastname, users
- .getAddress().getEmail(), userpass, login);
+ .getAdresses().getEmail(), userpass, login);
Long userSipDataId = userSipDataDao.addUserSipData(userSipData);
@@ -1383,32 +1383,32 @@ public class Usermanagement {
String email = values.get("email").toString();
- if (!email.equals(savedUser.getAddress().getEmail())) {
+ if (!email.equals(savedUser.getAdresses().getEmail())) {
boolean checkEmail = emailManagement
.checkUserEMail(email);
if (!checkEmail) {
// mail already used by another user!
returnLong = new Long(-11);
} else {
- savedUser.getAddress().setEmail(email);
+ savedUser.getAdresses().setEmail(email);
}
}
String phone = values.get("phone").toString();
- savedUser.getAddress().setPhone(phone);
- savedUser.getAddress().setComment(
+ savedUser.getAdresses().setPhone(phone);
+ savedUser.getAdresses().setComment(
values.get("comment").toString());
- savedUser.getAddress().setStreet(
+ savedUser.getAdresses().setStreet(
values.get("street").toString());
- savedUser.getAddress().setTown(
+ savedUser.getAdresses().setTown(
values.get("town").toString());
- savedUser.getAddress().setAdditionalname(
+ savedUser.getAdresses().setAdditionalname(
values.get("additionalname").toString());
- savedUser.getAddress()
+ savedUser.getAdresses()
.setZip(values.get("zip").toString());
savedUser.setSendSMS(false);
savedUser.setForceTimeZoneCheck(false);
- savedUser.getAddress().setState(
+ savedUser.getAdresses().setStates(
statemanagement.getStateById(Long.parseLong(values
.get("state_id").toString())));
@@ -1422,7 +1422,7 @@ public class Usermanagement {
savedUser.setUserSearchs(values.get("userSearchs")
.toString());
- // savedUser.setAddress(addressmanagement.getaddressbyId(user.getAddress().getId()));
+ // savedUser.setAdresses(addressmanagement.getAdressbyId(user.getAdresses().getAdresses_id()));
if (savedUser.getUser_id() == null) {
em.persist(savedUser);
@@ -1462,7 +1462,7 @@ public class Usermanagement {
// check if Mail given
if (email.length() > 0) {
- // log.debug("getId "+addr_e.getId());
+ // log.debug("getAdresses_id "+addr_e.getAdresses_id());
Users us = usersDao.getUserByEmail(email);
if (us != null) {
this.sendHashByUser(us, appLink);
@@ -1495,7 +1495,7 @@ public class Usermanagement {
String reset_link = appLink + "?lzproxied=solo&hash="
+ us.getResethash();
- String email = us.getAddress().getEmail();
+ String email = us.getAdresses().getEmail();
Long default_lang_id = Long.valueOf(
cfgManagement.getConfKey(3, "default_lang_id").getConf_value())
@@ -1596,7 +1596,7 @@ public class Usermanagement {
String hql = "SELECT c from Users AS c "
+ "WHERE "
- + "(c.login LIKE :userOrEmail OR c.address.email LIKE :userOrEmail ) "
+ + "(c.login LIKE :userOrEmail OR c.adresses.email LIKE :userOrEmail ) "
+ "AND c.externalUserId IS NULL " + "AND c.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
@@ -1622,7 +1622,7 @@ public class Usermanagement {
log.debug("Usermanagement.getUserByEmail : " + userOrEmail);
String hql = "SELECT c from Users AS c " + "WHERE "
- + "c.address.email LIKE :userOrEmail";
+ + "c.adresses.email LIKE :userOrEmail";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("userOrEmail", userOrEmail);
@@ -1846,8 +1846,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -1857,8 +1857,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + ")";
@@ -1867,8 +1867,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")"
+ "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -1884,8 +1884,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")" + ")";
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")" + ")";
} else if (userOffers.length() != 0) {
@@ -1995,8 +1995,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -2006,8 +2006,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search) "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + ")";
@@ -2016,8 +2016,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")"
+ "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -2033,8 +2033,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")" + ")";
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")" + ")";
} else if (userOffers.length() != 0) {
@@ -2129,8 +2129,8 @@ public class Usermanagement {
+ "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.address.email) LIKE :search "
- + "OR lower(c.address.town) LIKE :search " + ")" + "OR"
+ + "OR lower(c.adresses.email) LIKE :search "
+ + "OR lower(c.adresses.town) LIKE :search " + ")" + "OR"
+ "(" + "lower(c.userOffers) LIKE :userOffers " + ")"
+ "OR" + "(" + "lower(c.userSearchs) LIKE :userSearchs "
+ ")" + ")";
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java Thu Jul 26 07:31:01 2012
@@ -159,7 +159,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -219,7 +219,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -266,7 +266,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -302,7 +302,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -344,7 +344,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -380,7 +380,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -425,7 +425,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
@@ -461,7 +461,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.address.email) LIKE :search ";
+ hql += "OR lower(c.from.adresses.email) LIKE :search ";
hql += " ) ";
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java Thu Jul 26 07:31:01 2012
@@ -32,7 +32,7 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.address.Address;
+import org.openmeetings.app.persistence.beans.adresses.Adresses;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
@@ -99,7 +99,7 @@ public class UsersDaoImpl {
Users us = getUser(USER_ID);
us.setDeleted(true);
us.setUpdatetime(new Date());
- Address adr = us.getAddress();
+ Adresses adr = us.getAdresses();
if (adr != null) {
adr.setDeleted(true);
}
@@ -187,7 +187,7 @@ public class UsersDaoImpl {
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + "OR lower(u.login) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
- + "' " + "OR lower(u.address.email) LIKE '"
+ + "' " + "OR lower(u.adresses.email) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + ") ";
@@ -247,7 +247,7 @@ public class UsersDaoImpl {
}
return us;
} catch (Exception e) {
- log.error("[getUserByName]", e);
+ log.error("[getUserByAdressesId]", e);
}
return null;
}
@@ -255,7 +255,7 @@ public class UsersDaoImpl {
public Users getUserByEmail(String email) {
try {
String hql = "SELECT u FROM Users as u "
- + " where u.address.email = :email"
+ + " where u.adresses.email = :email"
+ " AND u.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("email", email);
@@ -267,7 +267,7 @@ public class UsersDaoImpl {
}
return us;
} catch (Exception e) {
- log.error("[getUserByEmail]", e);
+ log.error("[getUserByAdressesId]", e);
}
return null;
}
@@ -293,7 +293,7 @@ public class UsersDaoImpl {
return new Long(-5);
}
} catch (Exception e) {
- log.error("[getUserByHash]", e);
+ log.error("[getUserByAdressesId]", e);
}
return new Long(-1);
}
@@ -312,7 +312,7 @@ public class UsersDaoImpl {
return u;
}
} catch (Exception e) {
- log.error("[resetPassByHash]", e);
+ log.error("[getUserByAdressesId]", e);
}
return new Long(-1);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java Thu Jul 26 07:31:01 2012
@@ -34,7 +34,7 @@ import org.openmeetings.app.data.basic.d
import org.openmeetings.app.data.user.Statemanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.ldap.config.ConfigReader;
-import org.openmeetings.app.persistence.beans.address.State;
+import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.persistence.beans.basic.LdapConfig;
import org.openmeetings.app.persistence.beans.rooms.RoomClient;
import org.openmeetings.app.persistence.beans.user.Users;
@@ -642,9 +642,14 @@ public class LdapLoginManagement {
}
if (state != null) {
- for (State oneState : statemanagement.getStates()) {
+ // Lookup for states
+ List<States> states = statemanagement.getStates();
+
+ for (int i = 0; i < states.size(); i++) {
+ States oneState = states.get(i);
+
if (oneState.getName().equals(state)) {
- state_id = oneState.getId();
+ state_id = oneState.getState_id();
break;
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java Thu Jul 26 07:31:01 2012
@@ -46,8 +46,8 @@ public class Configuration implements Se
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- private Long id;
+ @Column(name="configuration_id")
+ private Long configuration_id;
@Column(name="conf_key")
private String conf_key;
@Column(name="conf_value")
@@ -88,11 +88,11 @@ public class Configuration implements Se
this.conf_value = conf_value;
}
- public Long getId() {
- return id;
+ public Long getConfiguration_id() {
+ return configuration_id;
}
- public void setId(Long id) {
- this.id = id;
+ public void setConfiguration_id(Long configuration_id) {
+ this.configuration_id = configuration_id;
}
public Date getStarttime() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java Thu Jul 26 07:31:01 2012
@@ -27,13 +27,13 @@ import javax.persistence.Id;
import javax.persistence.Table;
@Entity
-@Table(name = "errortype")
+@Table(name = "errortypes")
public class ErrorType implements Serializable {
private static final long serialVersionUID = 1519570470483604258L;
@Id
- @Column(name = "id")
- private Long id;
+ @Column(name = "errortype_id")
+ private Long errortype_id;
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
@@ -45,12 +45,12 @@ public class ErrorType implements Serial
@Column(name = "deleted")
private boolean deleted;
- public Long getId() {
- return id;
+ public Long getErrortype_id() {
+ return errortype_id;
}
- public void setId(Long id) {
- this.id = id;
+ public void setErrortype_id(Long errortype_id) {
+ this.errortype_id = errortype_id;
}
public Date getStarttime() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java Thu Jul 26 07:31:01 2012
@@ -37,11 +37,13 @@ import javax.persistence.Table;
@Entity
@Table(name = "ldapconfig")
public class LdapConfig implements Serializable {
+
private static final long serialVersionUID = 2839158519803993035L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="id")
- public long id;
+
+ @Column(name="ldapconfig_id")
+ public long ldapConfigId;
@Column(name="name")
public String name;
@Column(name="config_file_name")
@@ -65,11 +67,11 @@ public class LdapConfig implements Seria
@Column(name="deleted")
private boolean deleted;
- public long getId() {
- return id;
+ public long getLdapConfigId() {
+ return ldapConfigId;
}
- public void setId(long id) {
- this.id = id;
+ public void setLdapConfigId(long ldapConfigId) {
+ this.ldapConfigId = ldapConfigId;
}
public String getName() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java Thu Jul 26 07:31:01 2012
@@ -39,8 +39,8 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
-import org.openmeetings.app.persistence.beans.address.Address;
-import org.openmeetings.app.persistence.beans.address.State;
+import org.openmeetings.app.persistence.beans.adresses.Adresses;
+import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.basic.Server;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
@@ -103,11 +103,15 @@ public class Users implements Serializab
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
- @JoinColumn(name = "address_id", insertable = true, updatable = true)
- private Address address;
+ @JoinColumn(name = "adresses_id", insertable = true, updatable = true)
+ private Adresses adresses;
@Transient
private Userlevel userlevel;
+ @Transient
+ private Userdata rechnungsaddressen;
+ @Transient
+ private Userdata lieferadressen;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "user_id", insertable = true, updatable = true)
@@ -155,29 +159,29 @@ public class Users implements Serializab
this.user_id = user_id;
}
- public Address getAddress() {
- return address;
+ public Adresses getAdresses() {
+ return adresses;
}
- public void setAddress(Address address) {
- this.address = address;
+ public void setAdresses(Adresses adresses) {
+ this.adresses = adresses;
}
- public void setAddress(String street, String zip, String town,
- State state, String additionalname, String comment, String fax,
+ public void setAdresses(String street, String zip, String town,
+ States state, String additionalname, String comment, String fax,
String phone, String email) {
- if (this.address == null) {
- this.address = new Address();
+ if (this.adresses == null) {
+ this.adresses = new Adresses();
}
- this.address.setStreet(street);
- this.address.setZip(zip);
- this.address.setTown(town);
- this.address.setState(state);
- this.address.setAdditionalname(additionalname);
- this.address.setComment(comment);
- this.address.setFax(fax);
- this.address.setPhone(phone);
- this.address.setEmail(email);
+ this.adresses.setStreet(street);
+ this.adresses.setZip(zip);
+ this.adresses.setTown(town);
+ this.adresses.setStates(state);
+ this.adresses.setAdditionalname(additionalname);
+ this.adresses.setComment(comment);
+ this.adresses.setFax(fax);
+ this.adresses.setPhone(phone);
+ this.adresses.setEmail(email);
}
public Date getAge() {
@@ -238,6 +242,14 @@ public class Users implements Serializab
this.level_id = level_id;
}
+ public Userdata getLieferadressen() {
+ return lieferadressen;
+ }
+
+ public void setLieferadressen(Userdata lieferadressen) {
+ this.lieferadressen = lieferadressen;
+ }
+
public String getLogin() {
return login;
}
@@ -254,6 +266,14 @@ public class Users implements Serializab
this.password = password;
}
+ public Userdata getRechnungsaddressen() {
+ return rechnungsaddressen;
+ }
+
+ public void setRechnungsaddressen(Userdata rechnungsaddressen) {
+ this.rechnungsaddressen = rechnungsaddressen;
+ }
+
public Date getRegdate() {
return regdate;
}
@@ -450,6 +470,6 @@ public class Users implements Serializab
}
public String getPhoneForSMS() {
- return getSendSMS() ? getAddress().getPhone() : "";
+ return getSendSMS() ? getAdresses().getPhone() : "";
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConfigurationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConfigurationService.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConfigurationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConfigurationService.java Thu Jul 26 07:31:01 2012
@@ -49,10 +49,10 @@ public class ConfigurationService {
return cfgManagement.getAllConf(user_level, start, max, orderby, asc);
}
- public Configuration getConfByConfigurationId(String SID,long id){
+ public Configuration getConfByConfigurationId(String SID,long configuration_id){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- return cfgManagement.getConfByConfigurationId(user_level,id);
+ return cfgManagement.getConfByConfigurationId(user_level,configuration_id);
}
public Long saveOrUpdateConfiguration(String SID, LinkedHashMap<String, ?> values){
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java Thu Jul 26 07:31:01 2012
@@ -22,7 +22,7 @@ import org.openmeetings.app.Openmeetings
import org.openmeetings.app.data.basic.ErrorManagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.beans.basic.ErrorResult;
-import org.openmeetings.app.persistence.beans.basic.ErrorValue;
+import org.openmeetings.app.persistence.beans.basic.ErrorValues;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -58,12 +58,12 @@ public class ErrorService {
if (errorid < 0) {
log.debug("errorid, language_id: " + errorid + "|" + language_id);
- ErrorValue eValues = errorManagement.getErrorValuesById(-1
+ ErrorValues eValues = errorManagement.getErrorValuesById(-1
* errorid);
if (eValues != null) {
log.debug("eValues.getFieldvalues_id() = " + eValues.getFieldvalues_id());
// log.debug(eValues.getFieldvalues().getFieldvalues_id());
- log.debug("eValues.getErrorType() = " + errorManagement.getErrorType(eValues.getType().getId()));
+ log.debug("eValues.getErrorType() = " + errorManagement.getErrorType(eValues.getErrortype_id()));
// log.debug(eValues.getErrorType().getErrortype_id());
// log.debug(eValues.getErrorType().getFieldvalues());
// log.debug(eValues.getErrorType().getFieldvalues().getFieldvalues_id());
@@ -71,7 +71,7 @@ public class ErrorService {
.getFieldByIdAndLanguage(eValues.getFieldvalues_id(),
language_id);
Fieldlanguagesvalues typeValue = fieldmanagment
- .getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getType().getId())
+ .getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getErrortype_id())
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid, errorValue.getValue(),
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.java Thu Jul 26 07:31:01 2012
@@ -78,7 +78,7 @@ public class LdapConfigService {
LdapConfig ldapConfig = new LdapConfig();
ldapConfig.setName("local DB [internal]");
- ldapConfig.setId(-1);
+ ldapConfig.setLdapConfigId(-1);
List<LdapConfig> returnldapConfigs = new LinkedList<LdapConfig>();
returnldapConfigs.add(ldapConfig);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java Thu Jul 26 07:31:01 2012
@@ -43,7 +43,7 @@ import org.openmeetings.app.data.user.St
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.ldap.LdapLoginManagement;
-import org.openmeetings.app.persistence.beans.address.State;
+import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.basic.LdapConfig;
import org.openmeetings.app.persistence.beans.basic.Naviglobal;
@@ -721,7 +721,7 @@ public class MainService implements IPen
*
* @return List of State-Objects or null
*/
- public List<State> getStates() {
+ public List<States> getStates() {
return statemanagement.getStates();
}
@@ -811,7 +811,7 @@ public class MainService implements IPen
regObject.get("additionalname").toString(),
regObject.get("fax").toString(), regObject.get("zip")
.toString(),
- Long.valueOf(regObject.get("state_id").toString())
+ Long.valueOf(regObject.get("states_id").toString())
.longValue(), regObject.get("town").toString(),
Long.valueOf(regObject.get("language_id").toString())
.longValue(), "", false, baseURL, true,
@@ -839,7 +839,7 @@ public class MainService implements IPen
* @param additionalname
* @param fax
* @param zip
- * @param state_id
+ * @param states_id
* @param town
* @param language_id
* @return new users_id OR null if an exception, -1 if an error, -4 if mail
@@ -850,10 +850,10 @@ public class MainService implements IPen
public Long registerUser(String SID, String Username, String Userpass,
String lastname, String firstname, String email, Date age,
String street, String additionalname, String fax, String zip,
- long state_id, String town, long language_id, String phone) {
+ long states_id, String town, long language_id, String phone) {
return userManagement.registerUser(Username, Userpass, lastname,
firstname, email, age, street, additionalname, fax, zip,
- state_id, town, language_id, phone, false, "", true, "", null);
+ states_id, town, language_id, phone, false, "", true, "", null);
}
/**
@@ -897,7 +897,7 @@ public class MainService implements IPen
Long user_level = userManagement.getUserLevelByID(users_id);
return invitationManagement.sendInvitionLink(user_level,
username, message, domain, room, roomtype, baseurl, email,
- usersDao.getUser(users_id).getAddress().getEmail(), subject, room_id, null, null);
+ usersDao.getUser(users_id).getAdresses().getEmail(), subject, room_id, null, null);
}
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java Thu Jul 26 07:31:01 2012
@@ -395,7 +395,7 @@ public class UserService {
argObjectMap.get("additionalname").toString(),
argObjectMap.get("fax").toString(),
argObjectMap.get("zip").toString(),
- Long.valueOf(argObjectMap.get("state_id").toString())
+ Long.valueOf(argObjectMap.get("states_id").toString())
.longValue(),
argObjectMap.get("town").toString(),
new Long(argObjectMap.get("language_id").toString()),
@@ -442,7 +442,7 @@ public class UserService {
argObjectMap.get("additionalname").toString(),
argObjectMap.get("zip").toString(),
Long.valueOf(
- argObjectMap.get("state_id")
+ argObjectMap.get("states_id")
.toString()).longValue(),
argObjectMap.get("town").toString(),
new Long(argObjectMap.get("language_id").toString()),
@@ -687,7 +687,7 @@ public class UserService {
privateMessagesDao.addPrivateMessage(user.getFirstname() + " "
+ user.getLastname() + " " + fValue1193.getValue(),
message, 0L, user, userToAdd, userToAdd, false, null,
- true, userContactId, userToAdd.getAddress().getEmail());
+ true, userContactId, userToAdd.getAdresses().getEmail());
String link = baseURL + "?cuser=" + hash;
@@ -705,8 +705,8 @@ public class UserService {
.getRequestContactTemplate(message, aLinkHTML,
denyLinkHTML, profileLinkHTML);
- if (userToAdd.getAddress() != null) {
- mailHandler.sendMail(userToAdd.getAddress().getEmail(),
+ if (userToAdd.getAdresses() != null) {
+ mailHandler.sendMail(userToAdd.getAdresses().getEmail(),
user.getFirstname() + " " + user.getLastname()
+ " " + fValue1193.getValue(), template);
}
@@ -874,7 +874,7 @@ public class UserService {
Users user = userContacts.getOwner();
- if (user.getAddress() != null) {
+ if (user.getAdresses() != null) {
Long language_id = user.getLanguage_id();
if (language_id == null) {
@@ -905,9 +905,9 @@ public class UserService {
user.getFirstname() + " " + user.getLastname()
+ " " + fValue1198.getValue(), message,
0L, userContacts.getContact(), user, user,
- false, null, false, 0L, user.getAddress().getEmail());
+ false, null, false, 0L, user.getAdresses().getEmail());
- mailHandler.sendMail(user.getAddress().getEmail(),
+ mailHandler.sendMail(user.getAdresses().getEmail(),
userContacts.getContact().getFirstname()
+ " "
+ userContacts.getContact()
@@ -1030,7 +1030,7 @@ public class UserService {
}
- recipients.add(from.getAddress().getEmail());
+ recipients.add(from.getAdresses().getEmail());
String sendJNameTimeZone = from.getOmTimeZone().getJname();
@@ -1073,7 +1073,7 @@ public class UserService {
from.getFirstname() + " " + from.getLastname(), // username
message,
baseURL, // baseURl
- from.getAddress().getEmail(), // email
+ from.getAdresses().getEmail(), // email
subject, // subject
room_id, // room_id
"public",
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java Thu Jul 26 07:31:01 2012
@@ -105,9 +105,9 @@ public class UserImport {
String additionalname = itemUsers.element("additionalname")
.getText();
String comment = itemUsers.element("comment").getText();
- // A User can not have a deleted Address, you cannot delete the
- // Address of an User
- // String deleted = u.getAddress().getDeleted()
+ // A User can not have a deleted Adress, you cannot delete the
+ // Adress of an User
+ // String deleted = u.getAdresses().getDeleted()
// Phone Number not done yet
String fax = itemUsers.element("fax").getText();
Long state_id = Long.valueOf(
@@ -147,7 +147,7 @@ public class UserImport {
// check for duplicate Login or mail:
if (usersDao.checkUserLogin(us.getLogin()) && mailCheck) {
- us.setAddress(street, zip,
+ us.setAdresses(street, zip,
town, statemanagement.getStateById(state_id), additionalname, comment, fax, phone, email);
userManagement.addUser(us);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java Thu Jul 26 07:31:01 2012
@@ -34,7 +34,7 @@ import org.openmeetings.app.data.user.Or
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.basic.Configuration;
-import org.openmeetings.app.persistence.beans.basic.ErrorValue;
+import org.openmeetings.app.persistence.beans.basic.ErrorValues;
import org.openmeetings.app.persistence.beans.basic.RemoteSessionObject;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
@@ -143,7 +143,7 @@ public class UserWebService {
public ErrorResult getErrorByCode(String SID, long errorid, long language_id) {
try {
if (errorid < 0) {
- ErrorValue eValues = errorManagement
+ ErrorValues eValues = errorManagement
.getErrorValuesById(errorid * (-1));
if (eValues != null) {
Fieldlanguagesvalues errorValue = fieldmanagment
@@ -151,7 +151,7 @@ public class UserWebService {
eValues.getFieldvalues_id(), language_id);
Fieldlanguagesvalues typeValue = fieldmanagment
.getFieldByIdAndLanguage(errorManagement
- .getErrorType(eValues.getType().getId())
+ .getErrorType(eValues.getErrortype_id())
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid, errorValue.getValue(),
@@ -192,7 +192,7 @@ public class UserWebService {
* any zip
* @param fax
* any fax
- * @param state_id
+ * @param states_id
* a valid states_id
* @param town
* any town
@@ -208,7 +208,7 @@ public class UserWebService {
public Long addNewUser(String SID, String username, String userpass,
String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
- long state_id, String town, long language_id, String baseURL)
+ long states_id, String town, long language_id, String baseURL)
throws AxisFault {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -226,7 +226,7 @@ public class UserWebService {
Long user_id = userManagement.registerUser(username, userpass,
lastname, firstname, email, new Date(), street,
- additionalname, fax, zip, state_id, town, language_id,
+ additionalname, fax, zip, states_id, town, language_id,
"", false, baseURL, true, // generate
// SIP
// Data
@@ -284,7 +284,7 @@ public class UserWebService {
* any zip
* @param fax
* any fax
- * @param state_id
+ * @param states_id
* a valid states_id
* @param town
* any town
@@ -302,7 +302,7 @@ public class UserWebService {
public Long addNewUserWithTimeZone(String SID, String username,
String userpass, String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
- long state_id, String town, long language_id, String baseURL,
+ long states_id, String town, long language_id, String baseURL,
String jNameTimeZone) throws AxisFault {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -312,7 +312,7 @@ public class UserWebService {
Long user_id = userManagement.registerUser(username, userpass,
lastname, firstname, email, new Date(), street,
- additionalname, fax, zip, state_id, town, language_id,
+ additionalname, fax, zip, states_id, town, language_id,
"", false, baseURL, true, // generate
// SIP
// Data
@@ -374,7 +374,7 @@ public class UserWebService {
* any zip
* @param fax
* any fax
- * @param state_id
+ * @param states_id
* a valid states_id
* @param town
* any town
@@ -392,7 +392,7 @@ public class UserWebService {
public Long addNewUserWithExternalType(String SID, String username,
String userpass, String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
- long state_id, String town, long language_id,
+ long states_id, String town, long language_id,
String jNameTimeZone, String externalUserId, String externalUserType)
throws AxisFault {
try {
@@ -411,7 +411,7 @@ public class UserWebService {
// This will send no email to the users
Long user_id = userManagement.registerUserNoEmail(username,
userpass, lastname, firstname, email, new Date(),
- street, additionalname, fax, zip, state_id, town,
+ street, additionalname, fax, zip, states_id, town,
language_id, "", false, true, // generate SIP Data if
// the config is enabled
jNameTimeZone, null); //FIXME
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java Thu Jul 26 07:31:01 2012
@@ -94,21 +94,21 @@ public class UserWebServiceFacade {
public Long addNewUser(String SID, String username, String userpass,
String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
- long state_id, String town, long language_id, String baseURL)
+ long states_id, String town, long language_id, String baseURL)
throws AxisFault {
return getUserServiceProxy().addNewUser(SID, username, userpass,
lastname, firstname, email, additionalname, street, zip, fax,
- state_id, town, language_id, baseURL);
+ states_id, town, language_id, baseURL);
}
public Long addNewUserWithTimeZone(String SID, String username,
String userpass, String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
- long state_id, String town, long language_id, String baseURL,
+ long states_id, String town, long language_id, String baseURL,
String jNameTimeZone) throws AxisFault {
return getUserServiceProxy().addNewUserWithTimeZone(SID, username,
userpass, lastname, firstname, email, additionalname, street,
- zip, fax, state_id, town, language_id, baseURL, jNameTimeZone);
+ zip, fax, states_id, town, language_id, baseURL, jNameTimeZone);
}
@@ -127,7 +127,7 @@ public class UserWebServiceFacade {
* @param street
* @param zip
* @param fax
- * @param state_id
+ * @param states_id
* @param town
* @param language_id
* @param jNameTimeZone
@@ -139,12 +139,12 @@ public class UserWebServiceFacade {
public Long addNewUserWithExternalType(String SID, String username,
String userpass, String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
- long state_id, String town, long language_id,
+ long states_id, String town, long language_id,
String jNameTimeZone, String externalUserId, String externalUserType)
throws AxisFault {
return getUserServiceProxy().addNewUserWithExternalType(SID, username,
userpass, lastname, firstname, email, additionalname, street,
- zip, fax, state_id, town, language_id, jNameTimeZone,
+ zip, fax, states_id, town, language_id, jNameTimeZone,
externalUserId, externalUserType);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java Thu Jul 26 07:31:01 2012
@@ -1528,44 +1528,44 @@ public class BackupExport {
user.addElement("omTimeZone").addCDATA(formatString(""));
}
- if (u.getAddress() != null) {
+ if (u.getAdresses() != null) {
user.addElement("additionalname").addCDATA(
- formatString("" + u.getAddress().getAdditionalname()));
+ formatString("" + u.getAdresses().getAdditionalname()));
user.addElement("comment").addCDATA(
- formatString("" + u.getAddress().getComment()));
- // A User can not have a deleted Address, you cannot delete the
- // Address of an User
- // String deleted = u.getAddress().getDeleted()
+ formatString("" + u.getAdresses().getComment()));
+ // A User can not have a deleted Adress, you cannot delete the
+ // Adress of an User
+ // String deleted = u.getAdresses().getDeleted()
// Phone Number not done yet
user.addElement("fax").addCDATA(
- formatString("" + u.getAddress().getFax()));
- if (u.getAddress().getState() != null) {
+ formatString("" + u.getAdresses().getFax()));
+ if (u.getAdresses().getStates() != null) {
user.addElement("state_id").addCDATA(
formatString(""
- + u.getAddress().getState().getId()
+ + u.getAdresses().getStates().getState_id()
.toString()));
} else {
user.addElement("state_id").addCDATA("1");
}
user.addElement("street").addCDATA(
- formatString("" + u.getAddress().getStreet()));
+ formatString("" + u.getAdresses().getStreet()));
user.addElement("town").addCDATA(
- formatString("" + u.getAddress().getTown()));
+ formatString("" + u.getAdresses().getTown()));
user.addElement("zip").addCDATA(
- formatString("" + u.getAddress().getZip()));
+ formatString("" + u.getAdresses().getZip()));
// Email and Phone
user.addElement("mail").addCDATA(
- formatString("" + u.getAddress().getEmail()));
+ formatString("" + u.getAdresses().getEmail()));
user.addElement("phone").addCDATA(
- formatString("" + u.getAddress().getPhone()));
+ formatString("" + u.getAdresses().getPhone()));
} else {
user.addElement("additionalname").addCDATA(formatString(""));
user.addElement("comment").addCDATA(formatString(""));
// A User can not have a deleted address, you cannot delete the
// address of an User without deleting the user
// only SOAP users might have a null
- // String deleted = u.getAdsress().getDeleted()
+ // String deleted = u.getAdresses().getDeleted()
// Phone Number not done yet
user.addElement("fax").addCDATA(formatString(""));
user.addElement("state_id").addCDATA("1");
@@ -1635,7 +1635,7 @@ public class BackupExport {
for (Configuration cfg : configs) {
Element cfgElem = configsElem.addElement("config");
- cfgElem.addElement("id").addCDATA(formatString("" + cfg.getId()));
+ cfgElem.addElement("id").addCDATA(formatString("" + cfg.getConfiguration_id()));
cfgElem.addElement("comment").addCDATA(formatString("" + cfg.getComment()));
cfgElem.addElement("key").addCDATA(formatString(cfg.getConf_key()));
cfgElem.addElement("value").addCDATA(formatString(cfg.getConf_value()));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java Thu Jul 26 07:31:01 2012
@@ -60,7 +60,7 @@ import org.openmeetings.app.data.user.da
import org.openmeetings.app.data.user.dao.PrivateMessagesDaoImpl;
import org.openmeetings.app.data.user.dao.UserContactsDaoImpl;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.address.State;
+import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.basic.LdapConfig;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
@@ -959,10 +959,10 @@ public class BackupImportController exte
.element("additionalname").getText());
String comment = unformatString(itemUsers.element(
"comment").getText());
- // A User can not have a deleted Address, you cannot
+ // A User can not have a deleted Adress, you cannot
// delete the
- // Address of an User
- // String deleted = u.getAddress().getDeleted()
+ // Adress of an User
+ // String deleted = u.getAdresses().getDeleted()
// Phone Number not done yet
String fax = unformatString(itemUsers.element("fax")
.getText());
@@ -1003,12 +1003,12 @@ public class BackupImportController exte
.getText());
}
- State st = statemanagement.getStateById(state_id);
+ States st = statemanagement.getStateById(state_id);
if (st == null) {
st = statemanagement.getStateById(1L);
}
- us.setAddress(street, zip, town,
+ us.setAdresses(street, zip, town,
st, additionalname, comment, fax,
phone, email);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java Thu Jul 26 07:31:01 2012
@@ -272,22 +272,22 @@ public class Export extends HttpServlet
user.addElement("level_id").setText(u.getLevel_id().toString());
user.addElement("additionalname").setText(
- u.getAddress().getAdditionalname());
- user.addElement("comment").setText(u.getAddress().getComment());
- // A User can not have a deleted Address, you cannot delete the
- // Address of an User
- // String deleted = u.getAddress().getDeleted()
+ u.getAdresses().getAdditionalname());
+ user.addElement("comment").setText(u.getAdresses().getComment());
+ // A User can not have a deleted Adress, you cannot delete the
+ // Adress of an User
+ // String deleted = u.getAdresses().getDeleted()
// Phone Number not done yet
- user.addElement("fax").setText(u.getAddress().getFax());
+ user.addElement("fax").setText(u.getAdresses().getFax());
user.addElement("state_id").setText(
- u.getAddress().getState().getId().toString());
- user.addElement("street").setText(u.getAddress().getStreet());
- user.addElement("town").setText(u.getAddress().getTown());
- user.addElement("zip").setText(u.getAddress().getZip());
+ u.getAdresses().getStates().getState_id().toString());
+ user.addElement("street").setText(u.getAdresses().getStreet());
+ user.addElement("town").setText(u.getAdresses().getTown());
+ user.addElement("zip").setText(u.getAdresses().getZip());
// Email and Phone
- user.addElement("mail").setText(u.getAddress().getEmail());
- user.addElement("phone").setText(u.getAddress().getPhone());
+ user.addElement("mail").setText(u.getAdresses().getEmail());
+ user.addElement("phone").setText(u.getAdresses().getPhone());
Element user_organisations = user.addElement("organisations");
// List<String> organisations = new LinkedList();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java Thu Jul 26 07:31:01 2012
@@ -43,7 +43,7 @@ public class TestDatabaseStructureUsersS
log.debug("[records]"+ users.getRecords());
//GroupMemberDaoImpl.getInstance().addGroupMember("Ad", "dir", Calendar.getInstance().getTime(), "1", "2", "interpol155", 1L, 1L);
- //GroupMemberDaoImpl.getInstance().addGroupMember(firstname, lastname, age, memberStatus, appointmentStatus, password, address_id, appointmentId);
+ //GroupMemberDaoImpl.getInstance().addGroupMember(firstname, lastname, age, memberStatus, appointmentStatus, password, adresses_id, appointmentId);
//GroupMemberDaoImpl.getInstance().getGroupMemberById(1L);
//GroupMemberDaoImpl.getInstance().deleteGroupMember(2L);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/domain/TestAddGroup.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/domain/TestAddGroup.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/domain/TestAddGroup.java Thu Jul 26 07:31:01 2012
@@ -52,11 +52,11 @@ public class TestAddGroup extends Abstra
Users us = usersDao.getUser(new Long(1));
log.error(us.getLastname());
- log.error(us.getAddress().getTown());
+ log.error(us.getAdresses().getTown());
/*
- * for (Iterator it = us.getAddress().getEmails().iterator();
- * it.hasNext();){ Address_Emails addrMails = (Address_Emails)
+ * for (Iterator it = us.getAdresses().getEmails().iterator();
+ * it.hasNext();){ Adresses_Emails addrMails = (Adresses_Emails)
* it.next(); log.error(addrMails.getMail().getEmail()); }
* log.error("size of domains: "+us.getOrganisation_users().size()); for
* (Iterator it2 = us.getOrganisation_users().iterator();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/IcalHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/IcalHandler.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/IcalHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/IcalHandler.java Thu Jul 26 07:31:01 2012
@@ -191,11 +191,11 @@ public class IcalHandler {
* addMeetings Generate a Attendee
*/
// ------------------------------------------------------------------------------------------
- public HashMap<String, String> getAttendeeData(String emailAddress,
+ public HashMap<String, String> getAttendeeData(String emailAdress,
String displayName, Boolean chair) {
HashMap<String, String> oneRecord = new HashMap<String, String>();
- oneRecord.put("uri", "mailto:" + emailAddress);
+ oneRecord.put("uri", "mailto:" + emailAdress);
oneRecord.put("cn", displayName);
if (chair)