Revision: 4068
Author: seba.wagner
Date: Thu Aug 18 11:34:11 2011
Log: Fix Errortype and Install
http://code.google.com/p/openmeetings/source/detail?r=4068
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorType.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/user/Users.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Thu Aug 18 10:09:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Thu Aug 18 11:34:11 2011
@@ -18,7 +18,8 @@
@Transactional
public class ErrorManagement {
- private static final Logger log =
Red5LoggerFactory.getLogger(ErrorManagement.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ ErrorManagement.class,
ScopeApplicationAdapter.webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -36,7 +37,7 @@
Long newerrortype_id = eType.getErrortype_id();
return newerrortype_id;
} catch (Exception ex2) {
- log.error("[addErrorType]: " + ex2);
+ log.error("[addErrorType]: ", ex2);
}
return null;
}
@@ -51,7 +52,7 @@
List<ErrorType> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
- log.error("[getErrorTypes]: " + ex2);
+ log.error("[getErrorTypes]: ", ex2);
}
return null;
}
@@ -59,25 +60,27 @@
public ErrorType getErrorType(Long errortype_id) {
try {
String hql = "select c from ErrorType as c "
- + "WHERE c.deleted <> :deleted AND c.errortype_id =
:errortype_id";
+ + "WHERE c.deleted <> :deleted AND
c.errortype_id = :errortype_id";
Query query = em.createQuery(hql);
query.setParameter("deleted", "true");
query.setParameter("errortype_id", errortype_id);
- return (ErrorType)query.getSingleResult();
+ return (ErrorType) query.getSingleResult();
} catch (Exception ex2) {
log.error("[getErrorType]", ex2);
}
return null;
}
-
- public Long addErrorValues(Long errorvalues_id, Long errortype_id, Long
fieldvalues_id) {
+
+ public Long addErrorValues(Long errorvalues_id, Long errortype_id,
+ Long fieldvalues_id) {
try {
ErrorValues eValue = new ErrorValues();
eValue.setErrorvalues_id(errorvalues_id);
eValue.setErrorType(getErrorType(errortype_id));
eValue.setDeleted("false");
eValue.setStarttime(new Date());
-
eValue.setFieldvalues(fieldmanagment.getFieldvaluesById(fieldvalues_id));
+ eValue.setFieldvalues(fieldmanagment
+ .getFieldvaluesById(fieldvalues_id));
eValue = em.merge(eValue);
return eValue.getErrorvalues_id();
} catch (Exception ex2) {
@@ -91,7 +94,8 @@
ErrorValues eValue = new ErrorValues();
eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
-
eValue.setFieldvalues(fieldmanagment.getFieldvaluesById(fieldvalues_id));
+ eValue.setFieldvalues(fieldmanagment
+ .getFieldvaluesById(fieldvalues_id));
eValue = em.merge(eValue);
Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
@@ -111,7 +115,7 @@
Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
- log.error("[addErrorType]: " + ex2);
+ log.error("[addErrorType]: ", ex2);
}
return null;
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
Thu Aug 18 11:34:11 2011
@@ -475,7 +475,7 @@
long id = orgUser.getOrganisation_users_id();
- em.refresh(usersDao.getUser(user_id));
+ em.flush();
return id;
} else {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Usermanagement.java
Thu Aug 18 11:34:11 2011
@@ -480,8 +480,7 @@
String userOffers, String userSearchs, Boolean
showContactData,
Boolean showContactDataToContacts) {
- if (authLevelManagement.checkUserLevel(user_level)
- && user_id != 0) {
+ if (authLevelManagement.checkUserLevel(user_level) && user_id
!= 0) {
try {
Users us = usersDao.getUser(user_id);
@@ -513,6 +512,14 @@
if (checkName && checkEmail) {
// log.info("user_id " + user_id);
+ // add or delete organisations from
this user
+ if (organisations != null) {
+
organisationmanagement.updateUserOrganisationsByUser(
+ us,
organisations);
+ }
+
+ em.refresh(us);
+
us.setLastname(lastname);
us.setFirstname(firstname);
us.setAge(age);
@@ -547,12 +554,6 @@
additionalname,
comment, fax, email, phone);
//
emailManagement.updateUserEmail(mail.getMail().getMail_id(),user_id,
// email);
-
- // add or delete organisations from
this user
- if (organisations != null) {
-
organisationmanagement.updateUserOrganisationsByUser(
- us,
organisations);
- }
if (generateSipUserData) {
@@ -619,7 +620,6 @@
// if (!em.contains(us)) {
em.merge(us);
- em.refresh(us);
// }
// }
@@ -1167,6 +1167,9 @@
users.setDeleted("false");
users = em.merge(users);
+
+ em.flush();
+
Long user_id = users.getUser_id();
return user_id;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorType.java
Thu Aug 18 10:09:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/basic/ErrorType.java
Thu Aug 18 11:34:11 2011
@@ -5,74 +5,66 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.FetchType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
-
@Entity
@Table(name = "errortypes")
public class ErrorType implements Serializable {
private static final long serialVersionUID = 1519570470483604258L;
@Id
- @Column(name="errortype_id")
+ @Column(name = "errortype_id")
private Long errortype_id;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="fieldvalues_id", updatable=false, insertable=false)
- private Fieldvalues fieldvalues;
-
- @Column(name="starttime")
+ @Column(name = "fieldvalues_id")
+ private Long fieldvalues_id;
+
+ @Column(name = "starttime")
private Date starttime;
- @Column(name="updatetime")
+ @Column(name = "updatetime")
private Date updatetime;
- @Column(name="deleted")
+ @Column(name = "deleted")
private String deleted;
public Long getErrortype_id() {
return errortype_id;
}
+
public void setErrortype_id(Long errortype_id) {
this.errortype_id = errortype_id;
}
-
+
public Date getStarttime() {
return starttime;
}
+
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
-
+
public Date getUpdatetime() {
return updatetime;
}
+
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
-
+
public String getDeleted() {
return deleted;
}
+
public void setDeleted(String deleted) {
this.deleted = deleted;
}
- public Fieldvalues getFieldvalues() {
- return fieldvalues;
- }
- public void setFieldvalues(Fieldvalues fieldvalues) {
- this.fieldvalues = fieldvalues;
- }
-
public Long getFieldvalues_id() {
- return fieldvalues.getFieldvalues_id();
- }
-
+ return this.fieldvalues_id;
+ }
+
public void setFieldvalues_id(Long fieldvalues_id) {
- fieldvalues.setFieldvalues_id(fieldvalues_id);
- }
-}
+ this.fieldvalues_id = fieldvalues_id;
+ }
+
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
Sun Aug 14 11:32:30 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/domain/Organisation_Users.java
Thu Aug 18 11:34:11 2011
@@ -24,7 +24,7 @@
private Long organisation_users_id;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "organisation_id")
+ @JoinColumn(name = "organisation_id", insertable = true, updatable =
true)
private Organisation organisation;
@Column(name = "user_id")
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/user/Users.java
Sat Jul 30 04:55:23 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/user/Users.java
Thu Aug 18 11:34:11 2011
@@ -4,75 +4,74 @@
import java.util.Date;
import java.util.List;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
-import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
-import org.openmeetings.app.persistence.beans.basic.Sessiondata;
-import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.ManyToOne;
import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.openmeetings.app.persistence.beans.adresses.Adresses;
+import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
+import org.openmeetings.app.persistence.beans.basic.Sessiondata;
+import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
+
@Entity
@Table(name = "users")
public class Users implements Serializable {
-
private static final long serialVersionUID = -2265479712596674065L;
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="user_id")
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "user_id")
private Long user_id;
- @Column(name="age")
+ @Column(name = "age")
private Date age;
- @Column(name="availible")
+ @Column(name = "availible")
private Integer availible;
- @Column(name="firstname")
+ @Column(name = "firstname")
private String firstname;
- @Column(name="lastlogin")
+ @Column(name = "lastlogin")
private Date lastlogin;
- @Column(name="lastname")
+ @Column(name = "lastname")
private String lastname;
- @Column(name="lasttrans")
+ @Column(name = "lasttrans")
private Long lasttrans;
- @Column(name="level_id")
+ @Column(name = "level_id")
private Long level_id;
- @Column(name="login")
+ @Column(name = "login")
private String login;
- @Column(name="password")
+ @Column(name = "password")
private String password;
- @Column(name="regdate")
+ @Column(name = "regdate")
private Date regdate;
- @Column(name="status")
+ @Column(name = "status")
private Integer status;
- @Column(name="title_id")
+ @Column(name = "title_id")
private Integer title_id;
- @Column(name="starttime")
+ @Column(name = "starttime")
private Date starttime;
- @Column(name="updatetime")
+ @Column(name = "updatetime")
private Date updatetime;
- @Column(name="pictureuri")
+ @Column(name = "pictureuri")
private String pictureuri;
- @Column(name="deleted")
+ @Column(name = "deleted")
private String deleted;
- @Column(name="language_id")
+ @Column(name = "language_id")
private Long language_id;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="adresses_id", insertable=true, updatable=true)
+ @JoinColumn(name = "adresses_id", insertable = true, updatable = true)
private Adresses adresses;
- @Column(name="resethash")
+ @Column(name = "resethash")
private String resethash;
- @Column(name="activatehash")
+ @Column(name = "activatehash")
private String activatehash;
-
+
@Transient
private Userlevel userlevel;
@@ -80,71 +79,75 @@
private Userdata rechnungsaddressen;
@Transient
private Userdata lieferadressen;
- private Usergroups[] usergroups;
+ private Usergroups[] usergroups;
@OneToMany(fetch = FetchType.EAGER)
- @JoinColumn(name="user_id")
- private List<Organisation_Users> organisation_users;
-
+ @JoinColumn(name = "user_id", insertable = true, updatable = true)
+ private List<Organisation_Users> organisation_users;
+
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="userSipDataId", insertable=true, updatable=true)
- private UserSipData userSipData;
-
- //Vars to simulate external Users
- @Column(name="externalUserId")
- private Long externalUserId;
- @Column(name="externalUserType")
- private String externalUserType;
-
+ @JoinColumn(name = "userSipDataId", insertable = true, updatable = true)
+ private UserSipData userSipData;
+
+ // Vars to simulate external Users
+ @Column(name = "externalUserId")
+ private Long externalUserId;
+ @Column(name = "externalUserType")
+ private String externalUserType;
+
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="omtimezoneId", insertable=true, updatable=true)
- private OmTimeZone omTimeZone; //In UTC +/- hours
-
+ @JoinColumn(name = "omtimezoneId", insertable = true, updatable = true)
+ private OmTimeZone omTimeZone; // In UTC +/- hours
+
@Transient
- private Sessiondata sessionData;
- @Column(name="forceTimeZoneCheck")
- private Boolean forceTimeZoneCheck;
-
- @Column(name="user_offers")
- private String userOffers;
- @Column(name="user_searchs")
- private String userSearchs;
- @Column(name="show_contact_data")
- private Boolean showContactData;
- @Column(name="show_contact_data_to_contacts")
- private Boolean showContactDataToContacts;
-
+ private Sessiondata sessionData;
+ @Column(name = "forceTimeZoneCheck")
+ private Boolean forceTimeZoneCheck;
+
+ @Column(name = "user_offers")
+ private String userOffers;
+ @Column(name = "user_searchs")
+ private String userSearchs;
+ @Column(name = "show_contact_data")
+ private Boolean showContactData;
+ @Column(name = "show_contact_data_to_contacts")
+ private Boolean showContactDataToContacts;
+
public Users() {
super();
// TODO Auto-generated constructor stub
}
-
+
public Long getUser_id() {
return user_id;
}
+
public void setUser_id(Long user_id) {
this.user_id = user_id;
- }
+ }
public Adresses getAdresses() {
return adresses;
}
+
public void setAdresses(Adresses adresses) {
this.adresses = adresses;
}
-
+
public Date getAge() {
return age;
}
+
public void setAge(Date age) {
- if(age==null)
- age=new Date();
+ if (age == null)
+ age = new Date();
this.age = age;
}
-
+
public Integer getAvailible() {
return availible;
}
+
public void setAvailible(Integer availible) {
this.availible = availible;
}
@@ -152,6 +155,7 @@
public String getFirstname() {
return firstname;
}
+
public void setFirstname(String firstname) {
this.firstname = firstname;
}
@@ -159,6 +163,7 @@
public Date getLastlogin() {
return lastlogin;
}
+
public void setLastlogin(Date lastlogin) {
this.lastlogin = lastlogin;
}
@@ -166,27 +171,31 @@
public String getLastname() {
return lastname;
}
+
public void setLastname(String lastname) {
this.lastname = lastname;
}
-
+
public Long getLasttrans() {
return lasttrans;
}
+
public void setLasttrans(Long lasttrans) {
this.lasttrans = lasttrans;
}
-
+
public Long getLevel_id() {
return level_id;
}
+
public void setLevel_id(Long level_id) {
this.level_id = level_id;
}
-
+
public Userdata getLieferadressen() {
return lieferadressen;
}
+
public void setLieferadressen(Userdata lieferadressen) {
this.lieferadressen = lieferadressen;
}
@@ -194,6 +203,7 @@
public String getLogin() {
return login;
}
+
public void setLogin(String login) {
this.login = login;
}
@@ -201,70 +211,79 @@
public String getPassword() {
return password;
}
+
public void setPassword(String password) {
this.password = password;
}
-
+
public Userdata getRechnungsaddressen() {
return rechnungsaddressen;
}
+
public void setRechnungsaddressen(Userdata rechnungsaddressen) {
this.rechnungsaddressen = rechnungsaddressen;
}
-
+
public Date getRegdate() {
return regdate;
}
+
public void setRegdate(Date regdate) {
this.regdate = regdate;
}
-
+
public Integer getStatus() {
return status;
}
+
public void setStatus(Integer status) {
this.status = status;
}
-
+
public Integer getTitle_id() {
return title_id;
}
+
public void setTitle_id(Integer title_id) {
this.title_id = title_id;
}
-
+
public Usergroups[] getUsergroups() {
return usergroups;
}
+
public void setUsergroups(Usergroups[] usergroups) {
this.usergroups = usergroups;
}
-
+
public Userlevel getUserlevel() {
return userlevel;
}
+
public void setUserlevel(Userlevel userlevel) {
this.userlevel = userlevel;
- }
-
-
+ }
+
public Date getStarttime() {
return starttime;
}
+
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
-
+
public Date getUpdatetime() {
return updatetime;
}
+
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
-
+
public String getDeleted() {
return deleted;
}
+
public void setDeleted(String deleted) {
this.deleted = deleted;
}
@@ -272,6 +291,7 @@
public String getPictureuri() {
return pictureuri;
}
+
public void setPictureuri(String pictureuri) {
this.pictureuri = pictureuri;
}
@@ -279,21 +299,24 @@
public Long getLanguage_id() {
return language_id;
}
+
public void setLanguage_id(Long language_id) {
this.language_id = language_id;
}
-
public List<Organisation_Users> getOrganisation_users() {
return organisation_users;
}
- public void setOrganisation_users(List<Organisation_Users>
organisation_users) {
+
+ public void setOrganisation_users(
+ List<Organisation_Users> organisation_users) {
this.organisation_users = organisation_users;
}
public String getResethash() {
return resethash;
}
+
public void setResethash(String resethash) {
this.resethash = resethash;
}
@@ -301,6 +324,7 @@
public String getActivatehash() {
return activatehash;
}
+
public void setActivatehash(String activatehash) {
this.activatehash = activatehash;
}
@@ -308,6 +332,7 @@
public Long getExternalUserId() {
return externalUserId;
}
+
public void setExternalUserId(Long externalUserId) {
this.externalUserId = externalUserId;
}
@@ -315,14 +340,15 @@
public String getExternalUserType() {
return externalUserType;
}
+
public void setExternalUserType(String externalUserType) {
this.externalUserType = externalUserType;
}
-
public Sessiondata getSessionData() {
return sessionData;
}
+
public void setSessionData(Sessiondata sessionData) {
this.sessionData = sessionData;
}
@@ -330,6 +356,7 @@
public UserSipData getUserSipData() {
return userSipData;
}
+
public void setUserSipData(UserSipData userSipData) {
this.userSipData = userSipData;
}
@@ -337,13 +364,15 @@
public OmTimeZone getOmTimeZone() {
return omTimeZone;
}
+
public void setOmTimeZone(OmTimeZone omTimeZone) {
this.omTimeZone = omTimeZone;
}
-
+
public Boolean getForceTimeZoneCheck() {
return forceTimeZoneCheck;
}
+
public void setForceTimeZoneCheck(Boolean forceTimeZoneCheck) {
this.forceTimeZoneCheck = forceTimeZoneCheck;
}
@@ -351,6 +380,7 @@
public String getUserOffers() {
return userOffers;
}
+
public void setUserOffers(String userOffers) {
this.userOffers = userOffers;
}
@@ -358,6 +388,7 @@
public String getUserSearchs() {
return userSearchs;
}
+
public void setUserSearchs(String userSearchs) {
this.userSearchs = userSearchs;
}
@@ -365,6 +396,7 @@
public Boolean getShowContactData() {
return showContactData;
}
+
public void setShowContactData(Boolean showContactData) {
this.showContactData = showContactData;
}
@@ -372,9 +404,9 @@
public Boolean getShowContactDataToContacts() {
return showContactDataToContacts;
}
+
public void setShowContactDataToContacts(Boolean
showContactDataToContacts) {
this.showContactDataToContacts = showContactDataToContacts;
}
-
-
-}
+
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Thu Aug 18 10:09:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Thu Aug 18 11:34:11 2011
@@ -16,7 +16,8 @@
*
*/
public class ErrorService {
- private static final Logger log =
Red5LoggerFactory.getLogger(ErrorService.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ ErrorService.class,
ScopeApplicationAdapter.webAppRootKey);
@Autowired
private Fieldmanagment fieldmanagment;
@@ -39,7 +40,8 @@
if (errorid < 0) {
log.debug("errorid, language_id: " + errorid + "|" +
language_id);
- ErrorValues eValues =
errorManagement.getErrorValuesById(-1 * errorid);
+ ErrorValues eValues =
errorManagement.getErrorValuesById(-1
+ * errorid);
if (eValues != null) {
log.debug("" + eValues.getFieldvalues());
//
log.debug(eValues.getFieldvalues().getFieldvalues_id());
@@ -47,16 +49,20 @@
//
log.debug(eValues.getErrorType().getErrortype_id());
//
log.debug(eValues.getErrorType().getFieldvalues());
//
log.debug(eValues.getErrorType().getFieldvalues().getFieldvalues_id());
- Fieldlanguagesvalues errorValue =
-
fieldmanagment.getFieldByIdAndLanguage(eValues.getFieldvalues().getFieldvalues_id(),
language_id);
- Fieldlanguagesvalues typeValue =
-
fieldmanagment.getFieldByIdAndLanguage(eValues.getErrorType().getFieldvalues().getFieldvalues_id(),
language_id);
+ Fieldlanguagesvalues errorValue = fieldmanagment
+
.getFieldByIdAndLanguage(eValues.getFieldvalues()
+
.getFieldvalues_id(), language_id);
+ Fieldlanguagesvalues typeValue = fieldmanagment
+
.getFieldByIdAndLanguage(eValues.getErrorType()
+
.getFieldvalues_id(), language_id);
if (errorValue != null) {
- return new ErrorResult(errorid, errorValue.getValue(),
typeValue.getValue());
+ return new ErrorResult(errorid,
errorValue.getValue(),
+ typeValue.getValue());
}
}
} else {
- return new ErrorResult(errorid, "Error ... please check your
input", "Error");
+ return new ErrorResult(errorid,
+ "Error ... please check your input",
"Error");
}
return null;
=======================================
---
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
Thu Aug 18 11:34:11 2011
@@ -119,8 +119,7 @@
.getFieldvalues_id(), language_id);
Fieldlanguagesvalues typeValue =
fieldmanagment
.getFieldByIdAndLanguage(eValues.getErrorType()
-
.getFieldvalues().getFieldvalues_id(),
-
language_id);
+
.getFieldvalues_id(), language_id);
if (errorValue != null) {
return new ErrorResult(errorid,
errorValue.getValue(),
typeValue.getValue());
@@ -145,8 +144,7 @@
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
Configuration conf =
cfgManagement.getConfKey(3L,
"default.timezone");
@@ -201,8 +199,7 @@
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
Long user_id =
userManagement.registerUser(username, userpass,
lastname, firstname, email, new
Date(), street,
@@ -432,8 +429,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl, email);
@@ -492,8 +488,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl,
@@ -536,8 +531,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl,
@@ -570,8 +564,8 @@
showAudioVideoTest = true;
}
- String hash = soapLoginDao.addSOAPLogin(SID,
- room_id, becomeModerator, showAudioVideoTest, false, //
allowSameURLMultipleTimes
+ String hash = soapLoginDao.addSOAPLogin(SID,
room_id,
+ becomeModerator, showAudioVideoTest, false, //
allowSameURLMultipleTimes
null, // recording_id
false, //
showNickNameDialogAsInt
"room", // LandingZone,
@@ -602,8 +596,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl,
@@ -636,8 +629,8 @@
showAudioVideoTest = true;
}
- String hash = soapLoginDao.addSOAPLogin(SID,
- room_id, becomeModerator, showAudioVideoTest, true, //
allowSameURLMultipleTimes
+ String hash = soapLoginDao.addSOAPLogin(SID,
room_id,
+ becomeModerator, showAudioVideoTest, true, //
allowSameURLMultipleTimes
null, // recording_id
false, //
showNickNameDialogAsInt
"room", // LandingZone,
@@ -667,8 +660,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl,
@@ -707,8 +699,8 @@
allowRecordingBool = true;
}
- String hash = soapLoginDao.addSOAPLogin(SID,
- room_id, becomeModerator, showAudioVideoTest, true, //
allowSameURLMultipleTimes
+ String hash = soapLoginDao.addSOAPLogin(SID,
room_id,
+ becomeModerator, showAudioVideoTest, true, //
allowSameURLMultipleTimes
null, // recording_id
false, //
showNickNameDialogAsInt
"room", // LandingZone,
@@ -736,8 +728,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl,
@@ -760,8 +751,8 @@
sessionManagement.updateUserRemoteSession(SID,
xmlString);
- String hash = soapLoginDao.addSOAPLogin(SID,
- null, false, true, true, //
allowSameURLMultipleTimes
+ String hash = soapLoginDao.addSOAPLogin(SID,
null, false, true,
+ true, //
allowSameURLMultipleTimes
null, // recording_id
false, //
showNickNameDialogAsInt
"dashboard", // LandingZone,
@@ -796,8 +787,7 @@
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, lastname,
profilePictureUrl,
@@ -836,9 +826,9 @@
showNickNameDialog = true;
}
- String hash = soapLoginDao.addSOAPLogin(SID,
- room_id, becomeModerator,
showAudioVideoTest, true,
- null, showNickNameDialog,
"room", // LandingZone,
+ String hash = soapLoginDao.addSOAPLogin(SID,
room_id,
+ becomeModerator,
showAudioVideoTest, true, null,
+ showNickNameDialog, "room", //
LandingZone,
true // allowRecording
);
@@ -863,8 +853,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new
RemoteSessionObject(
username, firstname, "", "",
"", externalUserId,
@@ -887,8 +876,8 @@
sessionManagement.updateUserRemoteSession(SID,
xmlString);
- String hash = soapLoginDao.addSOAPLogin(SID,
- null, false, false, true, //
allowSameURLMultipleTimes
+ String hash = soapLoginDao.addSOAPLogin(SID,
null, false,
+ false, true, //
allowSameURLMultipleTimes
recording_id, // recording_id
false, //
showNickNameDialogAsInt
"room", // LandingZone,
@@ -913,8 +902,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
return
organisationmanagement.addUserToOrganisation(user_id,
organisation_id, users_id,
comment);
@@ -934,8 +922,7 @@
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkWebServiceLevel(
- user_level)) {
+ if
(authLevelManagement.checkWebServiceLevel(user_level)) {
return organisationmanagement
.getUsersSearchResultByOrganisationId(organisation_id,
start, max,
orderby, asc);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
