Copied: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/State.java (from r1365650, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/State.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/State.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java&r1=1365650&r2=1365668&rev=1365668&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/State.java Wed Jul 25 17:07:42 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.app.persistence.beans.adresses; +package org.openmeetings.app.persistence.beans.address; import java.io.Serializable; import java.util.Date; @@ -29,13 +29,13 @@ import javax.persistence.Id; import javax.persistence.Table; @Entity -@Table(name = "states") -public class States implements Serializable { +@Table(name = "state") +public class State implements Serializable { private static final long serialVersionUID = -1629546369219451403L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "state_id") - private Long state_id; + @Column(name = "id") + private Long id; @Column(name = "name") private String name; @Column(name = "starttime") @@ -57,12 +57,12 @@ public class States implements Serializa 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: 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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -39,8 +39,8 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.Transient; -import org.openmeetings.app.persistence.beans.adresses.Adresses; -import org.openmeetings.app.persistence.beans.adresses.States; +import org.openmeetings.app.persistence.beans.address.Address; +import org.openmeetings.app.persistence.beans.address.State; 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,15 +103,11 @@ public class Users implements Serializab @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) - @JoinColumn(name = "adresses_id", insertable = true, updatable = true) - private Adresses adresses; + @JoinColumn(name = "address_id", insertable = true, updatable = true) + private Address address; @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) @@ -159,29 +155,29 @@ public class Users implements Serializab this.user_id = user_id; } - public Adresses getAdresses() { - return adresses; + public Address getAddress() { + return address; } - public void setAdresses(Adresses adresses) { - this.adresses = adresses; + public void setAddress(Address address) { + this.address = address; } - public void setAdresses(String street, String zip, String town, - States state, String additionalname, String comment, String fax, + public void setAddress(String street, String zip, String town, + State state, String additionalname, String comment, String fax, String phone, String email) { - if (this.adresses == null) { - this.adresses = new Adresses(); + if (this.address == null) { + this.address = new Address(); } - 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); + 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); } public Date getAge() { @@ -242,14 +238,6 @@ 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; } @@ -266,14 +254,6 @@ 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; } @@ -470,6 +450,6 @@ public class Users implements Serializab } public String getPhoneForSMS() { - return getSendSMS() ? getAdresses().getPhone() : ""; + return getSendSMS() ? getAddress().getPhone() : ""; } } 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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 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.adresses.States; +import org.openmeetings.app.persistence.beans.address.State; 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<States> getStates() { + public List<State> 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("states_id").toString()) + Long.valueOf(regObject.get("state_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 states_id + * @param state_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 states_id, String town, long language_id, String phone) { + long state_id, String town, long language_id, String phone) { return userManagement.registerUser(Username, Userpass, lastname, firstname, email, age, street, additionalname, fax, zip, - states_id, town, language_id, phone, false, "", true, "", null); + state_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).getAdresses().getEmail(), subject, room_id, null, null); + usersDao.getUser(users_id).getAddress().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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -395,7 +395,7 @@ public class UserService { argObjectMap.get("additionalname").toString(), argObjectMap.get("fax").toString(), argObjectMap.get("zip").toString(), - Long.valueOf(argObjectMap.get("states_id").toString()) + Long.valueOf(argObjectMap.get("state_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("states_id") + argObjectMap.get("state_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.getAdresses().getEmail()); + true, userContactId, userToAdd.getAddress().getEmail()); String link = baseURL + "?cuser=" + hash; @@ -705,8 +705,8 @@ public class UserService { .getRequestContactTemplate(message, aLinkHTML, denyLinkHTML, profileLinkHTML); - if (userToAdd.getAdresses() != null) { - mailHandler.sendMail(userToAdd.getAdresses().getEmail(), + if (userToAdd.getAddress() != null) { + mailHandler.sendMail(userToAdd.getAddress().getEmail(), user.getFirstname() + " " + user.getLastname() + " " + fValue1193.getValue(), template); } @@ -874,7 +874,7 @@ public class UserService { Users user = userContacts.getOwner(); - if (user.getAdresses() != null) { + if (user.getAddress() != 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.getAdresses().getEmail()); + false, null, false, 0L, user.getAddress().getEmail()); - mailHandler.sendMail(user.getAdresses().getEmail(), + mailHandler.sendMail(user.getAddress().getEmail(), userContacts.getContact().getFirstname() + " " + userContacts.getContact() @@ -1030,7 +1030,7 @@ public class UserService { } - recipients.add(from.getAdresses().getEmail()); + recipients.add(from.getAddress().getEmail()); String sendJNameTimeZone = from.getOmTimeZone().getJname(); @@ -1073,7 +1073,7 @@ public class UserService { from.getFirstname() + " " + from.getLastname(), // username message, baseURL, // baseURl - from.getAdresses().getEmail(), // email + from.getAddress().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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 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 Adress, you cannot delete the - // Adress of an User - // String deleted = u.getAdresses().getDeleted() + // A User can not have a deleted Address, you cannot delete the + // Address of an User + // String deleted = u.getAddress().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.setAdresses(street, zip, + us.setAddress(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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -192,7 +192,7 @@ public class UserWebService { * any zip * @param fax * any fax - * @param states_id + * @param state_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 states_id, String town, long language_id, String baseURL) + long state_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, states_id, town, language_id, + additionalname, fax, zip, state_id, town, language_id, "", false, baseURL, true, // generate // SIP // Data @@ -284,7 +284,7 @@ public class UserWebService { * any zip * @param fax * any fax - * @param states_id + * @param state_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 states_id, String town, long language_id, String baseURL, + long state_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, states_id, town, language_id, + additionalname, fax, zip, state_id, town, language_id, "", false, baseURL, true, // generate // SIP // Data @@ -374,7 +374,7 @@ public class UserWebService { * any zip * @param fax * any fax - * @param states_id + * @param state_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 states_id, String town, long language_id, + long state_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, states_id, town, + street, additionalname, fax, zip, state_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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 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 states_id, String town, long language_id, String baseURL) + long state_id, String town, long language_id, String baseURL) throws AxisFault { return getUserServiceProxy().addNewUser(SID, username, userpass, lastname, firstname, email, additionalname, street, zip, fax, - states_id, town, language_id, baseURL); + state_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 states_id, String town, long language_id, String baseURL, + long state_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, states_id, town, language_id, baseURL, jNameTimeZone); + zip, fax, state_id, town, language_id, baseURL, jNameTimeZone); } @@ -127,7 +127,7 @@ public class UserWebServiceFacade { * @param street * @param zip * @param fax - * @param states_id + * @param state_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 states_id, String town, long language_id, + long state_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, states_id, town, language_id, jNameTimeZone, + zip, fax, state_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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -1528,44 +1528,44 @@ public class BackupExport { user.addElement("omTimeZone").addCDATA(formatString("")); } - if (u.getAdresses() != null) { + if (u.getAddress() != null) { user.addElement("additionalname").addCDATA( - formatString("" + u.getAdresses().getAdditionalname())); + formatString("" + u.getAddress().getAdditionalname())); user.addElement("comment").addCDATA( - 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() + 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() // Phone Number not done yet user.addElement("fax").addCDATA( - formatString("" + u.getAdresses().getFax())); - if (u.getAdresses().getStates() != null) { + formatString("" + u.getAddress().getFax())); + if (u.getAddress().getState() != null) { user.addElement("state_id").addCDATA( formatString("" - + u.getAdresses().getStates().getState_id() + + u.getAddress().getState().getId() .toString())); } else { user.addElement("state_id").addCDATA("1"); } user.addElement("street").addCDATA( - formatString("" + u.getAdresses().getStreet())); + formatString("" + u.getAddress().getStreet())); user.addElement("town").addCDATA( - formatString("" + u.getAdresses().getTown())); + formatString("" + u.getAddress().getTown())); user.addElement("zip").addCDATA( - formatString("" + u.getAdresses().getZip())); + formatString("" + u.getAddress().getZip())); // Email and Phone user.addElement("mail").addCDATA( - formatString("" + u.getAdresses().getEmail())); + formatString("" + u.getAddress().getEmail())); user.addElement("phone").addCDATA( - formatString("" + u.getAdresses().getPhone())); + formatString("" + u.getAddress().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.getAdresses().getDeleted() + // String deleted = u.getAdsress().getDeleted() // Phone Number not done yet user.addElement("fax").addCDATA(formatString("")); user.addElement("state_id").addCDATA("1"); 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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 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.adresses.States; +import org.openmeetings.app.persistence.beans.address.State; 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 Adress, you cannot + // A User can not have a deleted Address, you cannot // delete the - // Adress of an User - // String deleted = u.getAdresses().getDeleted() + // Address of an User + // String deleted = u.getAddress().getDeleted() // Phone Number not done yet String fax = unformatString(itemUsers.element("fax") .getText()); @@ -1003,12 +1003,12 @@ public class BackupImportController exte .getText()); } - States st = statemanagement.getStateById(state_id); + State st = statemanagement.getStateById(state_id); if (st == null) { st = statemanagement.getStateById(1L); } - us.setAdresses(street, zip, town, + us.setAddress(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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -272,22 +272,22 @@ public class Export extends HttpServlet user.addElement("level_id").setText(u.getLevel_id().toString()); user.addElement("additionalname").setText( - 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() + 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() // Phone Number not done yet - user.addElement("fax").setText(u.getAdresses().getFax()); + user.addElement("fax").setText(u.getAddress().getFax()); user.addElement("state_id").setText( - 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()); + 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()); // Email and Phone - user.addElement("mail").setText(u.getAdresses().getEmail()); - user.addElement("phone").setText(u.getAdresses().getPhone()); + user.addElement("mail").setText(u.getAddress().getEmail()); + user.addElement("phone").setText(u.getAddress().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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 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, adresses_id, appointmentId); + //GroupMemberDaoImpl.getInstance().addGroupMember(firstname, lastname, age, memberStatus, appointmentStatus, password, address_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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -52,11 +52,11 @@ public class TestAddGroup extends Abstra Users us = usersDao.getUser(new Long(1)); log.error(us.getLastname()); - log.error(us.getAdresses().getTown()); + log.error(us.getAddress().getTown()); /* - * for (Iterator it = us.getAdresses().getEmails().iterator(); - * it.hasNext();){ Adresses_Emails addrMails = (Adresses_Emails) + * for (Iterator it = us.getAddress().getEmails().iterator(); + * it.hasNext();){ Address_Emails addrMails = (Address_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=1365668&r1=1365667&r2=1365668&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 Wed Jul 25 17:07:42 2012 @@ -191,11 +191,11 @@ public class IcalHandler { * addMeetings Generate a Attendee */ // ------------------------------------------------------------------------------------------ - public HashMap<String, String> getAttendeeData(String emailAdress, + public HashMap<String, String> getAttendeeData(String emailAddress, String displayName, Boolean chair) { HashMap<String, String> oneRecord = new HashMap<String, String>(); - oneRecord.put("uri", "mailto:"; + emailAdress); + oneRecord.put("uri", "mailto:"; + emailAddress); oneRecord.put("cn", displayName); if (chair)
