Author: solomax
Date: Fri Nov 14 11:21:36 2014
New Revision: 1639610
URL: http://svn.apache.org/r1639610
Log:
[OPENMEETINGS-1118] some methods are implemented, code clean up
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
Fri Nov 14 11:21:36 2014
@@ -157,7 +157,7 @@ public class AppointmentLogic {
TimeZone tZone = timezoneUtil.getTimeZone(u.getTimeZoneId());
- long language_id = u.getLanguage_id();
+ long language_id = u.getLanguageId();
// Get the required labels one time for all meeting members. The
// Language of the email will be the system default language
String labelid1158 = langDao.getString(1158L, language_id);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Fri Nov 14 11:21:36 2014
@@ -339,7 +339,7 @@ public class LdapLoginManagement {
u.setAge(new Date());
u.setShowContactDataToContacts(true);
u.setAdresses(new Address());
-
u.setLanguage_id(cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1"));
+
u.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1"));
u.setSalutations_id(1L);
}
if
("true".equals(config.getProperty(CONFIGKEY_LDAP_SYNC_PASSWD_OM, ""))) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
Fri Nov 14 11:21:36 2014
@@ -402,7 +402,7 @@ public class ConferenceService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
User user = userDao.get(users_id);
return roomTypeDao.getAll(user == null
- ?
cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1") :
user.getLanguage_id());
+ ?
cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1") :
user.getLanguageId());
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
Fri Nov 14 11:21:36 2014
@@ -147,7 +147,7 @@ public class InvitationService implement
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
Invitation inv =
(Invitation)invitationManager.getInvitationByHashCode(invitationHash, true);
- inv.getInvitee().setLanguage_id(language_id);
+ inv.getInvitee().setLanguageId(language_id);
invitationManager.sendInvitionLink(inv,
MessageType.Create, subject, message, false);
} else {
return "Need User Privileges to perfom the Action";
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Fri Nov 14 11:21:36 2014
@@ -79,7 +79,7 @@ public class MobileService implements IP
User u = userDao.login(login, password);
if (u != null) {
Sessiondata sd = sessionDao.startsession();
- Boolean bool =
sessionDao.updateUser(sd.getSession_id(), u.getId(), false, u.getLanguage_id());
+ Boolean bool =
sessionDao.updateUser(sd.getSession_id(), u.getId(), false, u.getLanguageId());
if (bool == null) {
// Exception
} else if (!bool) {
@@ -108,7 +108,7 @@ public class MobileService implements IP
result.put("firstname",
u.getFirstname());
result.put("lastname", u.getLastname());
result.put("login", u.getLogin());
- result.put("language",
u.getLanguage_id()); //TODO rights
+ result.put("language",
u.getLanguageId()); //TODO rights
}
}
} catch (Exception e) {
@@ -163,8 +163,8 @@ public class MobileService implements IP
User u = userDao.get(c.getUser_id());
//my rooms
List<Room> myl = new ArrayList<Room>();
- myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 1L,
labelDao.getString(1306L, u.getLanguage_id())));
- myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 3L,
labelDao.getString(1307L, u.getLanguage_id())));
+ myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 1L,
labelDao.getString(1306L, u.getLanguageId())));
+ myl.add(roomManager.getRoomByOwnerAndTypeId(u.getId(), 3L,
labelDao.getString(1307L, u.getLanguageId())));
myl.addAll(roomDao.getAppointedRoomsByUser(u.getId()));
for (Room r : myl) {
addRoom("my", null, false, result, r);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java
Fri Nov 14 11:21:36 2014
@@ -74,7 +74,7 @@ public class StateDao {
st.setDeleted(false);
st = em.merge(st);
- Long id = st.getState_id();
+ Long id = st.getId();
log.debug("added id " + id);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Fri Nov 14 11:21:36 2014
@@ -100,7 +100,7 @@ public class UserDao implements IDataPro
User user = new User();
user.setSalutations_id(1L); // TODO: Fix default selection to
be configurable
user.setRights(getDefaultRights());
- user.setLanguage_id(cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY,
Long.class, "1"));
+ user.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAUT_LANG_KEY,
Long.class, "1"));
user.setTimeZoneId(timezoneUtil.getTimeZone(currentUser).getID());
user.setForceTimeZoneCheck(false);
user.setSendSMS(false);
@@ -462,7 +462,7 @@ public class UserDao implements IDataPro
to.setLogin(login.length() < getMinLoginLength(cfgDao)
? UUID.randomUUID().toString() : login);
to.setFirstname(firstName);
to.setLastname(lastName);
- to.setLanguage_id(null == langId ?
owner.getLanguage_id() : langId);
+ to.setLanguageId(null == langId ? owner.getLanguageId()
: langId);
to.setOwnerId(owner.getId());
to.setAdresses(new Address());
to.getAdresses().setEmail(email);
@@ -648,7 +648,7 @@ public class UserDao implements IDataPro
u.setShowContactDataToContacts(showContactDataToContacts);
// this is needed cause the language is not a needed data at
registering
- u.setLanguage_id(language_id != 0 ? language_id : null);
+ u.setLanguageId(language_id != 0 ? language_id : null);
if (!Strings.isEmpty(userpass)) {
u.updatePassword(cfgDao, userpass);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
Fri Nov 14 11:21:36 2014
@@ -27,11 +27,12 @@ import org.apache.openmeetings.db.entity
public class UserDTO {
private Long id;
+ private String login;
+ private String password;
private String firstname;
private String lastname;
private Set<Right> rights;
- private String login;
- private Long language_id;
+ private Long languageId;
private Address adresses;
private String timeZoneId;
private Type type = Type.user;
@@ -42,7 +43,7 @@ public class UserDTO {
lastname = u.getLastname();
rights = u.getRights();
login = u.getLogin();
- language_id = u.getLanguage_id();
+ languageId = u.getLanguageId();
adresses = u.getAdresses();
timeZoneId = u.getTimeZoneId();
type = u.getType();
@@ -88,12 +89,12 @@ public class UserDTO {
this.login = login;
}
- public Long getLanguage_id() {
- return language_id;
+ public Long getLanguageId() {
+ return languageId;
}
- public void setLanguage_id(Long language_id) {
- this.language_id = language_id;
+ public void setLanguageId(Long languageId) {
+ this.languageId = languageId;
}
public Address getAdresses() {
@@ -119,4 +120,12 @@ public class UserDTO {
public void setType(Type type) {
this.type = type;
}
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
Fri Nov 14 11:21:36 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -32,19 +31,20 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@Entity
@Table(name = "address")
@Root(name="address")
-public class Address implements Serializable {
+public class Address implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long adresses_id;
+ private Long id;
@Column(name = "additionalname")
@Element(data=true, required=false)
@@ -102,12 +102,12 @@ public class Address implements Serializ
this.additionalname = additionalname;
}
- public Long getAdresses_id() {
- return adresses_id;
+ public Long getId() {
+ return id;
}
- public void setAdresses_id(Long adresses_id) {
- this.adresses_id = adresses_id;
+ public void setId(Long id) {
+ this.id = id;
}
public String getComment() {
@@ -200,7 +200,7 @@ public class Address implements Serializ
@Override
public String toString() {
- return "Address [id=" + adresses_id + ", states=" + states
+ return "Address [id=" + id + ", states=" + states
+ ", street=" + street + ", town=" + town + ",
zip=" + zip
+ ", deleted=" + deleted + ", email=" + email +
", phone="
+ phone + "]";
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
Fri Nov 14 11:21:36 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.user;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -30,19 +29,21 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@NamedQueries({
- @NamedQuery(name = "getStateById", query = "select c from State as c
where c.state_id = :state_id AND c.deleted = false"),
+ @NamedQuery(name = "getStateById", query = "select c from State as c
where c.id = :state_id AND c.deleted = false"),
@NamedQuery(name = "getStates", query = "select c from State as c where
c.deleted = false"),
@NamedQuery(name = "getStateByName", query = "select c from State as c
where lower(c.name) LIKE :name AND c.deleted = false")
})
@Table(name = "state")
-public class State implements Serializable {
+public class State implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- private Long state_id;
+ private Long id;
@Column(name = "name")
private String name;
@@ -70,12 +71,12 @@ public class State implements Serializab
this.name = name;
}
- public Long getState_id() {
- return state_id;
+ public Long getId() {
+ return id;
}
- public void setState_id(Long state_id) {
- this.state_id = state_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
Fri Nov 14 11:21:36 2014
@@ -183,8 +183,8 @@ public class User implements IDataProvid
private boolean deleted;
@Column(name = "language_id")
- @Element(data = true, required = false)
- private Long language_id;
+ @Element(name = "language_id", data = true, required = false)
+ private Long languageId;
@Column(name = "resethash")
@Element(data = true, required = false)
@@ -423,12 +423,12 @@ public class User implements IDataProvid
this.pictureuri = pictureuri;
}
- public Long getLanguage_id() {
- return language_id;
+ public Long getLanguageId() {
+ return languageId;
}
- public void setLanguage_id(Long language_id) {
- this.language_id = language_id;
+ public void setLanguageId(Long languageId) {
+ this.languageId = languageId;
}
public List<OrganisationUser> getOrganisationUsers() {
@@ -588,7 +588,7 @@ public class User implements IDataProvid
return "User [user_id=" + id + ", firstname=" + firstname
+ ", lastname=" + lastname + ", login=" + login
+ ", pictureuri=" + pictureuri + ", deleted=" +
deleted
- + ", language_id=" + language_id + ",
adresses=" + adresses
+ + ", languageId=" + languageId + ", adresses="
+ adresses
+ ", externalId=" + externalUserId + ",
externalType="
+ externalUserType + ", type=" + type + "]";
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/StateConverter.java
Fri Nov 14 11:21:36 2014
@@ -40,6 +40,6 @@ public class StateConverter extends OmCo
public void write(OutputNode node, State value) throws Exception {
node.setData(true);
- node.setValue(value == null ? "0" : "" + value.getState_id());
+ node.setValue(value == null ? "0" : "" + value.getId());
}
}
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
Fri Nov 14 11:21:36 2014
@@ -203,7 +203,7 @@ public class InvitationManager implement
private void sendInvitionLink(Appointment a, MeetingMember mm,
MessageType type, boolean ical) throws Exception {
User owner = a.getOwner();
String invitorName = owner.getFirstname() + " " +
owner.getLastname();
- Long langId = mm.getUser().getLanguage_id();
+ Long langId = mm.getUser().getLanguageId();
TimeZone tz = timezoneUtil.getTimeZone(mm.getUser());
String subject = null;
String message = null;
@@ -232,7 +232,7 @@ public class InvitationManager implement
String invitorName = owner.getFirstname() + " " +
owner.getLastname();
boolean isCanceled = (type == MessageType.Cancel);
- String template =
InvitationTemplate.getEmail(i.getInvitee().getLanguage_id(), invitorName,
message, invitation_link, isCanceled);
+ String template =
InvitationTemplate.getEmail(i.getInvitee().getLanguageId(), invitorName,
message, invitation_link, isCanceled);
String email = i.getInvitee().getAdresses().getEmail();
String replyToEmail = owner.getAdresses().getEmail();
@@ -471,7 +471,7 @@ public class InvitationManager implement
invitation.setInvitedBy(createdBy);
invitation.setInvitee(inveetee);
if (language_id != null && Type.contact ==
invitation.getInvitee().getType()) {
- invitation.getInvitee().setLanguage_id(language_id);
+ invitation.getInvitee().setLanguageId(language_id);
}
invitation.setRoom(room);
invitation.setInserted(new Date());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Fri Nov 14 11:21:36 2014
@@ -428,7 +428,7 @@ public class UserManager implements IUse
* (adress_emails_id==null) { return new
Long(-112); }
*/
- if (adr.getAdresses_id() > 0 && u.getId() > 0) {
+ if (adr.getId() > 0 && u.getId() > 0) {
return u.getId();
} else {
return -16L;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Fri Nov 14 11:21:36 2014
@@ -109,7 +109,7 @@ public class GeneralUserForm extends For
@Override
protected void onUpdate(AjaxRequestTarget
target) {
-
GeneralUserForm.this.getModelObject().setLanguage_id(lang.getId());
+
GeneralUserForm.this.getModelObject().setLanguageId(lang.getId());
}
}));
@@ -135,8 +135,7 @@ public class GeneralUserForm extends For
add(new TextField<String>("adresses.additionalname"));
add(new TextField<String>("adresses.zip"));
add(new TextField<String>("adresses.town"));
- add(new DropDownChoice<State>("adresses.states",
getBean(StateDao.class).getStates()
- , new ChoiceRenderer<State>("name",
"state_id")));
+ add(new DropDownChoice<State>("adresses.states",
getBean(StateDao.class).getStates(), new ChoiceRenderer<State>("name", "id")));
add(new TextArea<String>("adresses.comment"));
final List<OrganisationUser> orgUsers;
@@ -188,7 +187,7 @@ public class GeneralUserForm extends For
public void updateModelObject(User u) {
salutation =
getBean(SalutationDao.class).get(u.getSalutations_id(), getLanguage());
- lang = getBean(FieldLanguageDao.class).get(u.getLanguage_id());
+ lang = getBean(FieldLanguageDao.class).get(u.getLanguageId());
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Fri Nov 14 11:21:36 2014
@@ -198,7 +198,7 @@ public class RegisterDialog extends Abst
try {
getBean(IUserManager.class).registerUserInit(UserDao.getDefaultRights(), login,
password, lastName
, firstName, email, null /*
age/birthday */, "" /* street */
- , "" /* additionalname */, "" /* fax
*/, "" /* zip */, state.getState_id()
+ , "" /* additionalname */, "" /* fax
*/, "" /* zip */, state.getId()
, "" /* town */, lang.getId(), true /*
sendWelcomeMessage */
,
Arrays.asList(getBean(ConfigurationDao.class).getConfValue("default_domain_id",
Long.class, null)),
"" /* phone */, false,
sendConfirmation, TimeZone.getTimeZone(tzModel.getObject()),
@@ -252,7 +252,7 @@ public class RegisterDialog extends Abst
langField.setRequired(true).setLabel(Model.of(WebSession.getString(111)));
add(tzDropDown.setRequired(true).setLabel(Model.of(WebSession.getString(1143))));
add(stateField = new DropDownChoice<State>("state", new
PropertyModel<State>(RegisterDialog.this, "state"),
- getBean(StateDao.class).getStates(),
new ChoiceRenderer<State>("name", "state_id")));
+ getBean(StateDao.class).getStates(),
new ChoiceRenderer<State>("name", "id")));
stateField.setRequired(true).setLabel(Model.of(WebSession.getString(120)));
add(new AjaxButton("submit") { // FAKE button so
"submit-on-enter" works as expected
private static final long serialVersionUID = 1L;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Fri Nov 14 11:21:36 2014
@@ -122,7 +122,7 @@ public class InvitationDialog extends Ab
message.setObject(null);
modelTo.setObject(new ArrayList<User>());
tzId.setObject(u.getTimeZoneId());
-
lang.setObject(getBean(FieldLanguageDao.class).get(u.getLanguage_id()));
+
lang.setObject(getBean(FieldLanguageDao.class).get(u.getLanguageId()));
url.setModelObject(null);
form.setModelObject(i);
send.setEnabled(false, target);
@@ -204,7 +204,7 @@ public class InvitationDialog extends Ab
i.setInvitee(u);
if (Type.contact == u.getType()) {
//TODO not sure it is right
- u.setLanguage_id(lang.getObject().getId());
+ u.setLanguageId(lang.getObject().getId());
}
return getBean(InvitationDao.class).update(i);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Fri Nov 14 11:21:36 2014
@@ -208,7 +208,7 @@ public class MessageDialog extends Abstr
if (p.isBookedRoom()) {
Invitation i =
getBean(IInvitationManager.class).getInvitation(to, p.getRoom(),
false, null,
Valid.Period
- ,
userDao.get(getUserId()), userDao.get(getUserId()).getLanguage_id(),
+ ,
userDao.get(getUserId()), userDao.get(getUserId()).getLanguageId(),
modelStart.getObject(),
modelEnd.getObject(), null);
invitation_link =
getInvitationLink(getBean(ConfigurationDao.class).getBaseUrl(), i);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Fri Nov 14 11:21:36 2014
@@ -311,10 +311,6 @@
<bean id="serverWebService"
class="org.apache.openmeetings.webservice.ServerWebService" />
<!-- (writeXsiType=false) -->
- <!-- bean id="jsonProvider"
class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
- <property name="ignoreNamespaces" value="true" />
- </bean>
- <bean id="jaxbProvider"
class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/-->
<jaxrs:server id="server" address="/">
<jaxrs:serviceBeans>
<ref bean="userWebService"/>
@@ -324,9 +320,6 @@
<ref bean="jabberWebService"/>
<ref bean="serverWebService"/>
</jaxrs:serviceBeans>
- <!-- jaxrs:providers>
- <ref bean="jaxbProvider"/>
- </jaxrs:providers-->
</jaxrs:server>
<jaxws:endpoint id="userServiceWS" address="/UserService"
implementor="#userWebService"
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
Fri Nov 14 11:21:36 2014
@@ -167,7 +167,7 @@ public abstract class AbstractJUnitDefau
u.setLastname("lastname" + rnd);
u.setLogin("login" + rnd);
u.updatePassword(configurationDao, "pass" + rnd);
- u.setLanguage_id(1L);
+ u.setLanguageId(1L);
return u;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Fri Nov 14 11:21:36 2014
@@ -45,7 +45,7 @@ public class TestInvitation extends Abst
public void testSendInvitationLink() {
Sessiondata sessionData = sessDao.startsession();
- Long uid =
userWebService.loginUser(sessionData.getSession_id(), username, userpass);
+ Long uid = userWebService.login(sessionData.getSession_id(),
username, userpass);
User us = userDao.get(uid);
String date = new SimpleDateFormat("dd.MM.yyyy").format(new
Date());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
Fri Nov 14 11:21:36 2014
@@ -40,9 +40,9 @@ public class TestStateToLower extends Ab
assertTrue(state_alabania != null);
assertTrue(state_alabania_lower != null);
- assertTrue(state_alabania.getState_id().equals(3L));
- assertTrue(state_alabania_lower.getState_id().equals(3L));
-
assertTrue(state_alabania.getState_id().equals(state_alabania_lower.getState_id()));
+ assertTrue(state_alabania.getId().equals(3L));
+ assertTrue(state_alabania_lower.getId().equals(3L));
+
assertTrue(state_alabania.getId().equals(state_alabania_lower.getId()));
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Fri Nov 14 11:21:36 2014
@@ -576,7 +576,7 @@ public class CalendarWebService {
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
User user = userDao.get(users_id);
- long language_id = (user == null) ? 1 :
user.getLanguage_id();
+ long language_id = (user == null) ? 1 :
user.getLanguageId();
List<AppointmentReminderType> res =
appointmentReminderTypDao
.getList(language_id);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Fri Nov 14 11:21:36 2014
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import java.util.ArrayList;
import java.util.Date;
+import javax.jws.WebParam;
import javax.jws.WebService;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -41,6 +42,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.ErrorResult;
import org.apache.openmeetings.db.dto.basic.SearchResult;
+import org.apache.openmeetings.db.dto.user.UserDTO;
import org.apache.openmeetings.db.dto.user.UserSearchResult;
import org.apache.openmeetings.db.entity.basic.ErrorType;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
@@ -57,6 +59,8 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+import com.sun.istack.NotNull;
+
/**
*
* The Service contains methods to login and create hash to directly enter
@@ -69,7 +73,7 @@ import org.springframework.beans.factory
@WebService(name = "UserService")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-@Path("/UserService")
+@Path("/user")
public class UserWebService {
private static final Logger log =
Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
@@ -118,7 +122,9 @@ public class UserWebService {
*
* @return - id of the logged in user, -1 in case of the error
*/
- public Long loginUser(String SID, String username, String userpass) {
+ @GET
+ @Path("/login")
+ public Long login(@WebParam String SID, @WebParam String username,
@WebParam String userpass) {
try {
log.debug("Login user SID : " + SID);
User u = userDao.login(username, userpass);
@@ -126,7 +132,7 @@ public class UserWebService {
return -1L;
}
- boolean bool = sessiondataDao.updateUser(SID,
u.getId(), false, u.getLanguage_id());
+ boolean bool = sessiondataDao.updateUser(SID,
u.getId(), false, u.getLanguageId());
if (!bool) {
// invalid Session-Object
return -35L;
@@ -138,7 +144,7 @@ public class UserWebService {
return oe.getCode();
}
} catch (Exception err) {
- log.error("[loginUser]", err);
+ log.error("[login]", err);
}
return -1L;
}
@@ -158,7 +164,9 @@ public class UserWebService {
*
* @return - error with the code given
*/
- public ErrorResult getErrorByCode(String SID, long errorid, long
langId) {
+ @GET
+ @Path("/getErrorByCode")
+ public ErrorResult getErrorByCode(@WebParam String SID, @WebParam long
errorid, @WebParam long langId) {
try {
if (errorid < 0) {
ErrorValue eValues = errorDao.get(-1 * errorid);
@@ -215,10 +223,9 @@ public class UserWebService {
* @return - id of the user added or error code
* @throws ServiceException
*/
- public Long addNewUser(String SID, String username, String userpass,
- String lastname, String firstname, String email,
- String additionalname, String street, String zip,
String fax,
- long states_id, String town, long language_id)
+ @GET
+ @Path("/addUser")
+ public Long addUser(@WebParam String SID, @WebParam @NotNull UserDTO
userDto)
throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -227,9 +234,10 @@ public class UserWebService {
String jName_timeZone =
configurationDao.getConfValue("default.timezone", String.class, "");
- Long user_id =
userManagement.registerUser(username, userpass,
- lastname, firstname, email, new
Date(), street,
- additionalname, fax, zip,
states_id, town, language_id,
+ Long user_id =
userManagement.registerUser(userDto.getLogin(), userDto.getPassword(),
+ userDto.getLastname(),
userDto.getFirstname(), userDto.getAdresses() != null ?
userDto.getAdresses().getEmail() : "", new Date(),
userDto.getAdresses().getStreet(), //FIXME NPE signature
+
userDto.getAdresses().getAdditionalname(), userDto.getAdresses().getFax(),
userDto.getAdresses().getZip(), userDto.getAdresses().getStates().getId()
//FIXME NPE signature
+ ,
userDto.getAdresses().getTown(), userDto.getLanguageId(), //FIXME NPE signature
"", false, true, // generate
SIP Data if the config is enabled
jName_timeZone);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java?rev=1639610&r1=1639609&r2=1639610&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
Fri Nov 14 11:21:36 2014
@@ -173,7 +173,7 @@ public class RestClient {
sessionId = client.getSession().getSession_id();
- Long uId = client.loginUser(sessionId, user, pass);
+ Long uId = client.login(sessionId, user, pass);
loginSuccess = uId > 0;
