You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/25 19:07:44 UTC
svn commit: r1365668 [1/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/ WebContent/src/base/auth/
WebContent/src/base/components/dynamicCombobox/
WebContent/src/modules/admin/roomadmin/
WebContent/src/modules/admin/useradmin/ W...
Author: solomax
Date: Wed Jul 25 17:07:42 2012
New Revision: 1365668
URL: http://svn.apache.org/viewvc?rev=1365668&view=rev
Log:
OPENMEETINGS-107 partially fixed
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/
- copied from r1365650, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/Address.java
- copied, changed from r1365650, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/State.java
- copied, changed from r1365650, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/States.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/Adresses.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/States.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/dynamicCombobox/countryCombobox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/addAttendee.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/domain/TestAddGroup.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/mail/IcalHandler.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx Wed Jul 25 17:07:42 2012
@@ -168,7 +168,7 @@
this.parent.regObject["additionalname"]='';
this.parent.regObject["fax"]='';
this.parent.regObject["zip"]='';
- this.parent.regObject["states_id"]=Number(this.parent._state.getValue());
+ this.parent.regObject["state_id"]=Number(this.parent._state.getValue());
this.parent.regObject["town"]='';
this.parent.regObject["language_id"]=this.parent.languages.getValue();
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/dynamicCombobox/countryCombobox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/dynamicCombobox/countryCombobox.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/dynamicCombobox/countryCombobox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/dynamicCombobox/countryCombobox.lzx Wed Jul 25 17:07:42 2012
@@ -61,7 +61,7 @@
</method>
<labeldTextListItem datapath="countrySet:/item" text="$path{ 'name/text()' }"
- value="$path{ 'state_id/text()' }" />
+ value="$path{ 'id/text()' }" />
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Wed Jul 25 17:07:42 2012
@@ -869,7 +869,7 @@
for (var i=0;i<canvas.statesInitValues.length;i++){
var st = canvas.statesInitValues[i].name.toLowerCase();
if (st.startsWith(str))a.push(canvas.statesInitValues[i]);
- //this.addItem(canvas.statesInitValues[i].name,canvas.statesInitValues[i].state_id);
+ //this.addItem(canvas.statesInitValues[i].name,canvas.statesInitValues[i].id);
}
return a;
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx Wed Jul 25 17:07:42 2012
@@ -711,7 +711,7 @@
obj:records[i],
isSuperModerator:records[i].isSuperModerator,
userId:records[i].user.user_id,
- email:records[i].user.adresses.email,
+ email:records[i].user.address.email,
uName:records[i].user.firstname+' '+records[i].user.lastname
});
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx Wed Jul 25 17:07:42 2012
@@ -53,8 +53,8 @@
this.town.setAttribute('text','');
this.userpass1.setAttribute('text','');
var defaultstate = canvas.getCountryRecord(1);
- this.state.addAndSelectItem(defaultstate.name,defaultstate.state_id);
- this.adress_comment.setAttribute('text','');
+ this.state.addAndSelectItem(defaultstate.name,defaultstate.id);
+ this.address_comment.setAttribute('text','');
this.status.selectItem(String('1'));
this.forceTimeZoneCheck.setValue(false);
@@ -137,16 +137,16 @@
this.firstname.setAttribute('text',obj.firstname);
this.lastname.setAttribute('text',obj.lastname);
this.userpass1.setAttribute('text','');
- this.email.setAttribute('text',obj.adresses.email);
- this.phone.setAttribute('text',obj.adresses.phone);
+ this.email.setAttribute('text',obj.address.email);
+ this.phone.setAttribute('text',obj.address.phone);
this.sendSMS.setValue(obj["sendSMS"] && obj.sendSMS!= null && obj.sendSMS);
this.age.setAttribute('text',parseDateToString(obj.age));
- this.street.setAttribute('text',obj.adresses.street);
- this.house.setAttribute('text',obj.adresses.additionalname);
- this.zip.setAttribute('text',obj.adresses.zip);
- this.town.setAttribute('text',obj.adresses.town);
- this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
- this.adress_comment.setAttribute('text',obj.adresses.comment);
+ this.street.setAttribute('text',obj.address.street);
+ this.house.setAttribute('text',obj.address.additionalname);
+ this.zip.setAttribute('text',obj.address.zip);
+ this.town.setAttribute('text',obj.address.town);
+ this.state.addAndSelectItem(obj.address.state.name,String(obj.address.state.id));
+ this.address_comment.setAttribute('text',obj.address.comment);
this.status.selectItem(String(obj.status));
this.salutation.selectItem(String(obj.title_id));
this._timeZone.selectItem(String(obj.omTimeZone.jname));
@@ -256,8 +256,8 @@
this.sendObject["additionalname"] = this.parent.house.getText();
this.sendObject["zip"] = this.parent.zip.getText();
this.sendObject["town"] = this.parent.town.getText();
- this.sendObject["states_id"] = this.parent.state.getValue();
- this.sendObject["comment"] = this.parent.adress_comment.getText();
+ this.sendObject["state_id"] = this.parent.state.getValue();
+ this.sendObject["comment"] = this.parent.address_comment.getText();
this.sendObject["telefon"] = '';
this.sendObject["fax"] = '';
var date = this.parent.age.getText();
@@ -426,7 +426,7 @@
</resetCombobox>
<labelText labelid="142" width="200" y="550" resize="false" x="2"/>
- <customScrollEdittext name="adress_comment" y="550" x="120" width="270"
+ <customScrollEdittext name="address_comment" y="550" x="120" width="270"
height="70" />
<labelText labelid="161" width="200" y="630" resize="false" x="2"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx Wed Jul 25 17:07:42 2012
@@ -376,19 +376,6 @@
}
}
-
- // var x = Math.round(value.childList[i].coordX);
- // var y = Math.round(value.childList[i].coordY);
- // var name = value.childList[i].description;
-
- //var x = value.resultAddress[i].x;
- //var y = value.resultAddress[i].y;
- //var name = value.resultAddress[i].street+" "+value.resultAddress[i].houseNumber+","+value.resultAddress[i].postCode+" "+value.resultAddress[i].city+" ("+value.resultAddress[i].cityDistrict+" "+value.resultAddress[i].country+" )";
- //////if ($debug) //Debug.write("name,x,y ",name,x,y);
- //this.parent._ausgabelisteMapAdress.addtableItem(x,y,name);
-
- //this.sendInitialWidthUpdate();
-
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx Wed Jul 25 17:07:42 2012
@@ -63,8 +63,8 @@
if($debug) Debug.write("dashboard/getUserSelf: ",value);
parent._username.setAttribute('text',canvas.getLabelName(376)+" "+value.firstname+' '+value.lastname);
- if (value.adresses != null && value.adresses.town != null) {
- parent._langAndCountry._town.setAttribute("text","<u>" + value.adresses.town + "</u>");
+ if (value.address != null && value.address.town != null) {
+ parent._langAndCountry._town.setAttribute("text","<u>" + value.address.town + "</u>");
}
if (value.omTimeZone != null) {
parent._langAndCountry._timeZone.setAttribute("text","<u>" + value.omTimeZone.jname + "</u>");
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx Wed Jul 25 17:07:42 2012
@@ -132,11 +132,11 @@
userObject["login"] = canvas.thishib.currentInvitation.invitedEMail;
userObject["firstname"] = "";
userObject["lastname"] = canvas.thishib.currentInvitation.invitedEMail;
- userObject["adresses"] = new Array();
- //userObject["adresses"]["emails"] = new Array();
- userObject["adresses"]["email"] = canvas.thishib.currentInvitation.invitedEMail;
- //userObject["adresses"]["emails"][0]["mail"] = new Array();
- //userObject["adresses"]["emails"][0]["mail"]["email"] = canvas.thishib.currentInvitation.invitedEMail;
+ userObject["address"] = new Array();
+ //userObject["address"]["emails"] = new Array();
+ userObject["address"]["email"] = canvas.thishib.currentInvitation.invitedEMail;
+ //userObject["address"]["emails"][0]["mail"] = new Array();
+ //userObject["address"]["emails"][0]["mail"]["email"] = canvas.thishib.currentInvitation.invitedEMail;
hib.userobject = userObject;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/addAttendee.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/addAttendee.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/addAttendee.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/addAttendee.lzx Wed Jul 25 17:07:42 2012
@@ -90,7 +90,7 @@
this.addHeaderItemOrdered(146,70,"u.user_id",false,false); //labelid,width,orderBy,asc,isSelected
this.addHeaderItemOrdered(148,136,"u.firstname",false,false);
this.addHeaderItemOrdered(149,136,"u.lastname",false,true);
- this.addHeaderItemOrdered(137,138,"u.adresses.email",false,false);
+ this.addHeaderItemOrdered(137,138,"u.address.email",false,false);
this.getAllUserBySearchRange.doCall();
</handler>
@@ -145,7 +145,7 @@
obj:records[i],
userId:records[i].user_id,
login:records[i].login,
- email:records[i].adresses.email,
+ email:records[i].address.email,
firstname:records[i].firstname,
lastname:records[i].lastname,
omTimeZone:records[i].omTimeZone
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx Wed Jul 25 17:07:42 2012
@@ -66,15 +66,15 @@
//this.username.setAttribute('text',obj.login);
this.firstname.setAttribute('text',obj.firstname);
this.lastname.setAttribute('text',obj.lastname);
- this.email.setAttribute('text',obj.adresses.email);
- this.phone.setAttribute('text', obj.adresses.phone);
+ this.email.setAttribute('text',obj.address.email);
+ this.phone.setAttribute('text', obj.address.phone);
this.age.setAttribute('text',parseDateToString(obj.age));
- this.street.setAttribute('text',obj.adresses.street);
- this.house.setAttribute('text',obj.adresses.additionalname);
- this.zip.setAttribute('text',obj.adresses.zip);
- this.town.setAttribute('text',obj.adresses.town);
- this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
- this.adress_comment.setAttribute('text',obj.adresses.comment);
+ this.street.setAttribute('text',obj.address.street);
+ this.house.setAttribute('text',obj.address.additionalname);
+ this.zip.setAttribute('text',obj.address.zip);
+ this.town.setAttribute('text',obj.address.town);
+ this.state.addAndSelectItem(obj.address.state.name,String(obj.address.state.id));
+ this.address_comment.setAttribute('text',obj.address.comment);
this.salutation.selectItem(String(obj.title_id));
this._timeZone.selectItem(String(obj.omTimeZone.jname));
this.languages.selectItem(String(obj.language_id));
@@ -161,7 +161,7 @@
this.parent.userObj.zip = this.parent.zip.getText();
this.parent.userObj.town = this.parent.town.getText();
this.parent.userObj.state_id = this.parent.state.getValue();
- this.parent.userObj.comment = this.parent.adress_comment.getText();
+ this.parent.userObj.comment = this.parent.address_comment.getText();
this.parent.userObj.age = this.parent.age.getDate();
this.parent.userObj.title_id = Number(this.parent.salutation.getValue());
this.parent.userObj.jnameTimeZone = parent._timeZone.getValue();
@@ -188,7 +188,7 @@
canvas.setUserData(g);
if ($debug) Debug.write("this.parent.userObj: ",this.parent.userObj);
- if ($debug) Debug.write("this.parent.userObj.adresses.states ",this.parent.userObj.adresses.states);
+ if ($debug) Debug.write("this.parent.userObj.address.state ",this.parent.userObj.address.state);
</method>
<netparam><method name="getValue"> return canvas.sessionId; </method></netparam>
<netparam><method name="getValue">return this.parent.parent.userObj;</method></netparam>
@@ -283,9 +283,9 @@
resultId="state_id" resultName="name" /> -->
- <!-- 142:Adress-Info -->
+ <!-- 142:Address-Info -->
<labelText labelid="142" width="200" y="430" resize="false" x="2"/>
- <customEdittext name="adress_comment" y="430" x="120" width="270"
+ <customEdittext name="address_comment" y="430" x="120" width="270"
height="100" text="" multiline="true"/>
<!-- 161:Organisations -->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx Wed Jul 25 17:07:42 2012
@@ -41,7 +41,7 @@
if (this.userObject != null) {
var tString = this.userObject.firstname + ' ' + this.userObject.lastname + ' '
- + '<' + this.userObject.adresses.email + '>';
+ + '<' + this.userObject.address.email + '>';
this._to.sendUpdateText = false;
this._to.setAttribute("text",tString);
@@ -61,7 +61,7 @@
if($debug) Debug.write("[admin]userValueForm/getUserById: ",value.lastname);
parent.userObject = value;
var tString = value.firstname + ' ' + value.lastname + ' '
- + '<' + value.adresses.email + '>';
+ + '<' + value.address.email + '>';
parent._to.sendUpdateText = false;
parent._to.setAttribute("text",tString);
@@ -283,7 +283,7 @@
if (canvas.userContacts[i].contact.firstname.startsWith(tString)
|| canvas.userContacts[i].contact.lastname.startsWith(tString)
- || canvas.userContacts[i].contact.adresses.email.startsWith(tString) ) {
+ || canvas.userContacts[i].contact.address.email.startsWith(tString) ) {
tResultA.push(canvas.userContacts[i]);
@@ -296,7 +296,7 @@
for (var k=0;k<tResultA.length;k++) {
- this._list.addItem(tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.adresses.email + '>', tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.adresses.email + '>');
+ this._list.addItem(tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.address.email + '>', tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.address.email + '>');
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx Wed Jul 25 17:07:42 2012
@@ -640,7 +640,7 @@
for (var k=0;k<value.result.length;k++) {
value.result[k].strTime = parseDateToStringTime(value.result[k].inserted);
- value.result[k].userName = value.result[k].from.firstname+' '+value.result[k].from.lastname+' <'+value.result[k].from.adresses.email+'>';
+ value.result[k].userName = value.result[k].from.firstname+' '+value.result[k].from.lastname+' <'+value.result[k].from.address.email+'>';
value.result[k].itemSelected = false;
if (!value.result[k].isRead) {
parent.countUnRead++;
@@ -678,7 +678,7 @@
for (var k=0;k<value.result.length;k++) {
value.result[k].strTime = parseDateToStringTime(value.result[k].inserted);
- value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.adresses.email+'>';
+ value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.address.email+'>';
value.result[k].itemSelected = false;
}
@@ -713,7 +713,7 @@
for (var k=0;k<value.result.length;k++) {
value.result[k].strTime = parseDateToStringTime(value.result[k].inserted);
- value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.adresses.email+'>';
+ value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.address.email+'>';
value.result[k].itemSelected = false;
}
@@ -751,7 +751,7 @@
for (var k=0;k<value.result.length;k++) {
value.result[k].strTime = parseDateToStringTime(value.result[k].inserted);
- value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.adresses.email+'>';
+ value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.address.email+'>';
value.result[k].itemSelected = false;
}
@@ -1055,9 +1055,9 @@
this._answer_area.setAttribute("visibility","visible");
- this.from.setAttribute("text",refObj.from.firstname+' '+refObj.from.lastname+' <'+refObj.from.adresses.email+'>');
+ this.from.setAttribute("text",refObj.from.firstname+' '+refObj.from.lastname+' <'+refObj.from.address.email+'>');
if (refObj.to != null) {
- this.to.setAttribute("text",refObj.to.firstname+' '+refObj.to.lastname+' <'+refObj.to.adresses.email+'>');
+ this.to.setAttribute("text",refObj.to.firstname+' '+refObj.to.lastname+' <'+refObj.to.address.email+'>');
} else {
this.to.setAttribute("text","");
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx Wed Jul 25 17:07:42 2012
@@ -229,12 +229,12 @@
<method name="showUserContactData">
<![CDATA[
- var tString = this.userObject.adresses.street + " " + this.userObject.adresses.additionalname + "<br/>";
- tString += this.userObject.adresses.zip + " " + this.userObject.adresses.town + "<br/>";
- tString += this.userObject.adresses.states.name + "<br/><br/>";
- tString += this.userObject.adresses.email + "<br/>";
- tString += this.userObject.adresses.phone + "<br/><br/>";
- tString += this.userObject.adresses.comment + "<br/>";
+ var tString = this.userObject.address.street + " " + this.userObject.address.additionalname + "<br/>";
+ tString += this.userObject.address.zip + " " + this.userObject.address.town + "<br/>";
+ tString += this.userObject.address.state.name + "<br/><br/>";
+ tString += this.userObject.address.email + "<br/>";
+ tString += this.userObject.address.phone + "<br/><br/>";
+ tString += this.userObject.address.comment + "<br/>";
this.userContactData.setAttribute("text",tString);
Modified: incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Wed Jul 25 17:07:42 2012
@@ -360,7 +360,7 @@ limitations under the License.
,
String fax
,
- long states_id
+ long state_id
,
String town
,
@@ -471,7 +471,7 @@ limitations under the License.
<td valign="top">
long
</td>
- <td valign="top">states_id</td>
+ <td valign="top">state_id</td>
<td valign="top">a valid states_id</td>
</tr>
@@ -505,7 +505,7 @@ limitations under the License.
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUser?&&&&&&&&&&&&&</a>
+ <a href="http://localhost:5080/openmeetings/services/UserService/addNewUser?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&state_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUser?&&&&&&&&&&&&&</a>
</div>
<div class="method">
<div class="method_header">
@@ -535,7 +535,7 @@ limitations under the License.
,
String fax
,
- long states_id
+ long state_id
,
String town
,
@@ -648,7 +648,7 @@ limitations under the License.
<td valign="top">
long
</td>
- <td valign="top">states_id</td>
+ <td valign="top">state_id</td>
<td valign="top">a valid states_id</td>
</tr>
@@ -690,7 +690,7 @@ limitations under the License.
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?&&&&&&&&&&&&&&</a>
+ <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&state_id=VALUE&town=VALUE&language_id=VALUE&baseURL=VALUE&jNameTimeZone=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUserWithTimeZone?&&&&&&&&&&&&&&</a>
</div>
<div class="method">
<div class="method_header">
@@ -720,7 +720,7 @@ limitations under the License.
,
String fax
,
- long states_id
+ long state_id
,
String town
,
@@ -839,7 +839,7 @@ limitations under the License.
<td valign="top">
long
</td>
- <td valign="top">states_id</td>
+ <td valign="top">state_id</td>
<td valign="top">a valid states_id</td>
</tr>
@@ -887,7 +887,7 @@ limitations under the License.
</table>
<br/>
REST Sample Call/URL:<br/>
- <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&states_id=VALUE&town=VALUE&language_id=VALUE&jNameTimeZone=VALUE&externalUserId=VALUE&externalUserType=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?&&&&&&&&&&&&&&&</a>
+ <a href="http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?SID=VALUE&username=VALUE&userpass=VALUE&lastname=VALUE&firstname=VALUE&email=VALUE&additionalname=VALUE&street=VALUE&zip=VALUE&fax=VALUE&state_id=VALUE&town=VALUE&language_id=VALUE&jNameTimeZone=VALUE&externalUserId=VALUE&externalUserType=VALUE">http://localhost:5080/openmeetings/services/UserService/addNewUserWithExternalType?&&&&&&&&&&&&&&&</a>
</div>
<div class="method">
<div class="method_header">
Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Wed Jul 25 17:07:42 2012
@@ -22,8 +22,8 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
- <class>org.openmeetings.app.persistence.beans.adresses.States</class>
+ <class>org.openmeetings.app.persistence.beans.address.Address</class>
+ <class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Wed Jul 25 17:07:42 2012
@@ -22,8 +22,8 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
- <class>org.openmeetings.app.persistence.beans.adresses.States</class>
+ <class>org.openmeetings.app.persistence.beans.address.Address</class>
+ <class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Wed Jul 25 17:07:42 2012
@@ -22,8 +22,8 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
- <class>org.openmeetings.app.persistence.beans.adresses.States</class>
+ <class>org.openmeetings.app.persistence.beans.address.Address</class>
+ <class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Wed Jul 25 17:07:42 2012
@@ -22,8 +22,8 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
- <class>org.openmeetings.app.persistence.beans.adresses.States</class>
+ <class>org.openmeetings.app.persistence.beans.address.Address</class>
+ <class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Wed Jul 25 17:07:42 2012
@@ -22,8 +22,8 @@
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
- <class>org.openmeetings.app.persistence.beans.adresses.States</class>
+ <class>org.openmeetings.app.persistence.beans.address.Address</class>
+ <class>org.openmeetings.app.persistence.beans.address.State</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java Wed Jul 25 17:07:42 2012
@@ -477,7 +477,7 @@ public class AppointmentDaoImpl {
Users user = userManagement.getUserById(users_id);
String invitorName = user.getFirstname() + " " + user.getLastname()
- + " [" + user.getAdresses().getEmail() + "]";
+ + " [" + user.getAddress().getEmail() + "]";
List<MeetingMember> meetingsRemoteMembers = meetingMemberDao
.getMeetingMemberByAppointmentId(ap.getAppointmentId());
@@ -665,7 +665,7 @@ public class AppointmentDaoImpl {
// Adding Invitor Name
Users user = userManagement.getUserById(users_id);
String invitorName = user.getFirstname() + " " + user.getLastname()
- + " [" + user.getAdresses().getEmail() + "]";
+ + " [" + user.getAddress().getEmail() + "]";
// Send notification of updated Event
for (MeetingMember memberRemote : meetingsRemoteMembers) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java Wed Jul 25 17:07:42 2012
@@ -204,12 +204,12 @@ public class AppointmentLogic {
isPasswordProtected, password, false, user.getOmTimeZone().getJname());
String invitorName = user.getFirstname() + " " + user.getLastname()
- + " [" + user.getAdresses().getEmail() + "]";
+ + " [" + user.getAddress().getEmail() + "]";
// Add the creator of the meeting calendar event
meetingMemberLogic.addMeetingMember(user.getFirstname(), user
.getLastname(), "", "", appointmentId, userId, user
- .getAdresses().getEmail(), user.getPhoneForSMS(), baseUrl, userId, true,
+ .getAddress().getEmail(), user.getPhoneForSMS(), baseUrl, userId, true,
language_id, isPasswordProtected, password, timezone, user.getOmTimeZone(),
invitorName);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java Wed Jul 25 17:07:42 2012
@@ -188,7 +188,7 @@ public class Invitationmanagement {
if (invitationId > 0) {
if (sendMail) {
- this.sendInvitionLink(us.getAdresses().getEmail(),
+ this.sendInvitionLink(us.getAddress().getEmail(),
username, message, baseurl,
email, subject, invitation.getHash(),
validFrom, validTo, language_id, fromUserField);
@@ -254,7 +254,7 @@ public class Invitationmanagement {
} else if (appointment.getRemind().getTypId() == 2) {
log.debug("ReminderType simple mail -> sending simple mail...");
sendInvitationCancelMail(member.getEmail(),
- member.getAppointment(), user.getAdresses().getEmail(),
+ member.getAppointment(), user.getAddress().getEmail(),
subject, message);
} else if (appointment.getRemind().getTypId() == 3) {
try {
@@ -334,7 +334,7 @@ public class Invitationmanagement {
+ "<br/>";
String invitorName = user.getFirstname() + " " + user.getLastname()
- + " [" + user.getAdresses().getEmail() + "]";
+ + " [" + user.getAddress().getEmail() + "]";
Fieldlanguagesvalues labelid1156 = fieldmanagment
.getFieldByIdAndLanguage(new Long(1156), language_id);
@@ -396,7 +396,7 @@ public class Invitationmanagement {
// nothing
if (appointment.getRemind().getTypId() == 2) {
sendInvitationUpdateMail(member.getEmail(), appointment, user
- .getAdresses().getEmail(), subject, message);
+ .getAddress().getEmail(), subject, message);
} else if (appointment.getRemind().getTypId() == 3) {
try {
sendInvitationIcalUpdateMail(member.getEmail(),
@@ -757,7 +757,7 @@ public class Invitationmanagement {
atts.add(attendeeInDerHashMap);
HashMap<String, String> attendeeList = handler.getAttendeeData(user
- .getAdresses().getEmail(), user.getLogin(), invitor);
+ .getAddress().getEmail(), user.getLogin(), invitor);
handler.addNewMeeting(startdate, enddate,
point.getAppointmentName(), atts,
@@ -765,7 +765,7 @@ public class Invitationmanagement {
log.debug(handler.getICalDataAsString());
- mailiCalThread.doSend(email, user.getAdresses().getEmail(), subject, handler.getIcalAsByteArray(),
+ mailiCalThread.doSend(email, user.getAddress().getEmail(), subject, handler.getIcalAsByteArray(),
message);
return null;
@@ -804,14 +804,14 @@ public class Invitationmanagement {
atts.add(attendeeInDerHashMap);
HashMap<String, String> attendeeList = handler.getAttendeeData(user
- .getAdresses().getEmail(), user.getLogin(), invitor);
+ .getAddress().getEmail(), user.getLogin(), invitor);
handler.addNewMeeting(starttime, endtime, point.getAppointmentName(), atts,
subject, attendeeList, point.getIcalId(), timeZone);
log.debug(handler.getICalDataAsString());
- mailiCalThread.doSend(email, user.getAdresses().getEmail(), subject, handler.getIcalAsByteArray(),
+ mailiCalThread.doSend(email, user.getAddress().getEmail(), subject, handler.getIcalAsByteArray(),
message);
return null;
@@ -877,7 +877,7 @@ public class Invitationmanagement {
.getAttendeeData(email, username, invitor);
String replyToEmail = null;
if (user != null) {
- replyToEmail = user.getAdresses().getEmail();
+ replyToEmail = user.getAddress().getEmail();
organizerAttendee = handler.getAttendeeData(replyToEmail, user.getLogin(), invitor);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java Wed Jul 25 17:07:42 2012
@@ -25,7 +25,7 @@ import javax.persistence.TypedQuery;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
+import org.openmeetings.app.persistence.beans.address.Address;
import org.openmeetings.app.templates.RegisterUserTemplate;
import org.openmeetings.utils.mail.MailHandler;
import org.red5.logging.Red5LoggerFactory;
@@ -52,7 +52,7 @@ public class Emailmanagement {
private RegisterUserTemplate registerUserTemplate;
/**
- * sends a mail adress to the user with his account data
+ * sends a mail address to the user with his account data
*
* @param Username
* @param Userpass
@@ -116,8 +116,8 @@ public class Emailmanagement {
if (email.length() == 0)
return true;
log.debug("checkUserMail: " + email);
- TypedQuery<Adresses> query = em
- .createQuery("select c from Adresses as c where c.email LIKE :email AND c.deleted <> :deleted", Adresses.class);
+ TypedQuery<Address> query = em
+ .createQuery("select c from Address as c where c.email LIKE :email AND c.deleted <> :deleted", Address.class);
query.setParameter("email", email);
query.setParameter("deleted", true);
int count = query.getResultList().size();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Statemanagement.java Wed Jul 25 17:07:42 2012
@@ -26,7 +26,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.adresses.States;
+import org.openmeetings.app.persistence.beans.address.State;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -45,7 +45,7 @@ public class Statemanagement {
private EntityManager em;
/**
- * adds a new State to the states table with no short name and code
+ * adds a new State to the state table with no short name and code
*
* @param name
* @return the id of the new state or null if an error occurred
@@ -55,7 +55,7 @@ public class Statemanagement {
}
/**
- * adds a new State to the states table
+ * adds a new State to the state table
*
* @param name the name of the country
* @param shortName the short name of the country
@@ -65,7 +65,7 @@ public class Statemanagement {
public Long addState(String name, String shortName, int code) {
try {
- States st = new States();
+ State st = new State();
st.setName(name);
st.setShortName(shortName);
st.setCode(code);
@@ -73,7 +73,7 @@ public class Statemanagement {
st.setDeleted(false);
st = em.merge(st);
- Long id = st.getState_id();
+ Long id = st.getId();
log.debug("added id " + id);
@@ -87,16 +87,16 @@ public class Statemanagement {
/**
* selects a state by its id
*
- * @param state_id
+ * @param id
* @return the state-object or null
*/
- public States getStateById(long state_id) {
+ public State getStateById(long id) {
try {
- TypedQuery<States> query = em
- .createQuery("select c from States as c where c.state_id = :state_id AND c.deleted <> :deleted", States.class);
- query.setParameter("state_id", state_id);
+ TypedQuery<State> query = em
+ .createQuery("select c from State as c where c.id = :id AND c.deleted <> :deleted", State.class);
+ query.setParameter("id", id);
query.setParameter("deleted", true);
- List<States> ll = query.getResultList();
+ List<State> ll = query.getResultList();
if (ll.size() > 0) {
return ll.get(0);
}
@@ -111,12 +111,12 @@ public class Statemanagement {
*
* @return List of State Objects or null
*/
- public List<States> getStates() {
+ public List<State> getStates() {
try {
- TypedQuery<States> query = em
- .createQuery("select c from States as c where c.deleted <> :deleted", States.class);
+ TypedQuery<State> query = em
+ .createQuery("select c from State as c where c.deleted <> :deleted", State.class);
query.setParameter("deleted", true);
- List<States> ll = query.getResultList();
+ List<State> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
log.error("getStates", ex2);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java Wed Jul 25 17:07:42 2012
@@ -47,7 +47,7 @@ import org.openmeetings.app.data.basic.d
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.data.user.dao.UserSipDataDaoImpl;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
+import org.openmeetings.app.persistence.beans.address.Address;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.basic.Server;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
@@ -189,7 +189,7 @@ public class Usermanagement {
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + "OR lower(u.login) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
- + "' " + "OR lower(u.adresses.email) LIKE '"
+ + "' " + "OR lower(u.address.email) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + ") ";
@@ -263,7 +263,7 @@ public class Usermanagement {
+ storePermanent);
String hql = "SELECT c from Users AS c "
+ "WHERE "
- + "(c.login LIKE :userOrEmail OR c.adresses.email LIKE :userOrEmail ) "
+ + "(c.login LIKE :userOrEmail OR c.address.email LIKE :userOrEmail ) "
+ "AND c.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
@@ -465,7 +465,7 @@ public class Usermanagement {
public Long updateUser(long user_level, Long user_id, Long level_id,
String login, String password, String lastname, String firstname,
Date age, String street, String additionalname, String zip,
- long states_id, String town, Long language_id, int availible,
+ long state_id, String town, Long language_id, int availible,
String telefon, String fax, String mobil, String email,
String comment, int status, List<Long> organisations, int title_id,
String phone, boolean sendSMS, String sip_user, String sip_pass, String sip_auth,
@@ -486,7 +486,7 @@ public class Usermanagement {
boolean checkEmail = true;
// Compare old address with new address
- if (!email.equals(us.getAdresses().getEmail())) {
+ if (!email.equals(us.getAddress().getEmail())) {
// Its a new one - check, whether another user already uses
// that one...
@@ -542,7 +542,7 @@ public class Usermanagement {
return new Long(-7);
}
}
- us.setAdresses(street, zip, town, statemanagement.getStateById(states_id),
+ us.setAddress(street, zip, town, statemanagement.getStateById(state_id),
additionalname, comment, fax, phone, email);
// emailManagement.updateUserEmail(mail.getMail().getMail_id(),user_id,
// email);
@@ -551,7 +551,7 @@ public class Usermanagement {
UserSipData userSipData = openXGHttpClient
.openSIPgUserCreateUser(firstname, "",
- lastname, us.getAdresses().getEmail(),
+ lastname, us.getAddress().getEmail(),
password, login);
if (us.getUserSipData() == null) {
@@ -821,14 +821,14 @@ public class Usermanagement {
* @param additionalname
* @param fax
* @param zip
- * @param states_id
+ * @param state_id
* @param town
* @param language_id
* @return
*/
public Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
+ String additionalname, String fax, String zip, long state_id,
String town, long language_id, String phone, boolean sendSMS, String baseURL,
boolean generateSipUserData, String jNameTimeZone, Server server) {
@@ -838,24 +838,24 @@ public class Usermanagement {
"sendEmailWithVerficationCode", Integer.class, "0");
return registerUser(login, Userpass, lastname, firstname, email, age,
- street, additionalname, fax, zip, states_id, town, language_id,
+ street, additionalname, fax, zip, state_id, town, language_id,
phone, sendSMS, baseURL, generateSipUserData, jNameTimeZone, sendConfirmation, server);
}
public Long registerUserNoEmail(String login, String Userpass,
String lastname, String firstname, String email, Date age,
String street, String additionalname, String fax, String zip,
- long states_id, String town, long language_id, String phone, boolean sendSMS,
+ long state_id, String town, long language_id, String phone, boolean sendSMS,
boolean generateSipUserData, String jNameTimeZone, Server server) {
return registerUser(login, Userpass, lastname, firstname, email, age,
- street, additionalname, fax, zip, states_id, town, language_id,
+ street, additionalname, fax, zip, state_id, town, language_id,
phone, sendSMS, "", generateSipUserData, jNameTimeZone, false, server);
}
private Long registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
+ String additionalname, String fax, String zip, long state_id,
String town, long language_id, String phone, boolean sendSMS, String baseURL,
boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation, Server server) {
try {
@@ -866,7 +866,7 @@ public class Usermanagement {
Long user_id = this.registerUserInit(3, 1, 0, 1, login,
Userpass, lastname, firstname, email, age, street,
- additionalname, fax, zip, states_id, town, language_id,
+ additionalname, fax, zip, state_id, town, language_id,
true, Arrays.asList(cfgManagement.getConfValue("default_domain_id", Long.class, null)),phone, sendSMS, baseURL,
sendConfirmation, "", "", "", generateSipUserData,
jNameTimeZone, false, "", "", false, true, server);
@@ -884,7 +884,7 @@ public class Usermanagement {
}
/**
- * Adds a user including his adress-data,auth-date,mail-data
+ * Adds a user including his address-data,auth-date,mail-data
*
* @param user_level
* @param level_id
@@ -900,7 +900,7 @@ public class Usermanagement {
* @param additionalname
* @param fax
* @param zip
- * @param states_id
+ * @param state_id
* @param town
* @param language_id
* @param phone
@@ -911,7 +911,7 @@ public class Usermanagement {
public Long registerUserInit(long user_level, long level_id, int availible,
int status, String login, String password, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
+ String additionalname, String fax, String zip, long state_id,
String town, long language_id, boolean sendWelcomeMessage,
List<Long> organisations, String phone, boolean sendSMS, String baseURL,
Boolean sendConfirmation, String sip_user, String sip_pass,
@@ -922,7 +922,7 @@ public class Usermanagement {
return registerUserInit(user_level, level_id, availible,
status, login, password, lastname,
firstname, email, age, street,
- additionalname, fax, zip, states_id,
+ additionalname, fax, zip, state_id,
town, language_id, sendWelcomeMessage,
organisations, phone, sendSMS, baseURL,
sendConfirmation, sip_user, sip_pass,
@@ -947,7 +947,7 @@ public class Usermanagement {
* @param additionalname
* @param fax
* @param zip
- * @param states_id
+ * @param state_id
* @param town
* @param language_id
* @param sendWelcomeMessage
@@ -974,7 +974,7 @@ public class Usermanagement {
public Long registerUserInit(long user_level, long level_id, int availible,
int status, String login, String password, String lastname,
String firstname, String email, Date age, String street,
- String additionalname, String fax, String zip, long states_id,
+ String additionalname, String fax, String zip, long state_id,
String town, long language_id, boolean sendWelcomeMessage,
List<Long> organisations, String phone, boolean sendSMS, String baseURL,
Boolean sendConfirmation, String sip_user, String sip_pass,
@@ -1022,11 +1022,11 @@ public class Usermanagement {
if (!sendMail.equals("success"))
return new Long(-19);
}
- Adresses adr = new Adresses();
+ Address adr = new Address();
adr.setStreet(street);
adr.setZip(zip);
adr.setTown(town);
- adr.setStates(statemanagement.getStateById(states_id));
+ adr.setState(statemanagement.getStateById(state_id));
adr.setAdditionalname(additionalname);
adr.setComment("");
adr.setFax(fax);
@@ -1051,12 +1051,12 @@ public class Usermanagement {
}
/*
- * Long adress_emails_id =
+ * Long address_emails_id =
* emailManagement.registerEmail(email, address_id,""); if
- * (adress_emails_id==null) { return new Long(-112); }
+ * (address_emails_id==null) { return new Long(-112); }
*/
- if (adr.getAdresses_id() > 0 && user_id > 0) {
+ if (adr.getId() > 0 && user_id > 0) {
return user_id;
} else {
return new Long(-16);
@@ -1091,12 +1091,12 @@ public class Usermanagement {
* @param language_id
* @param Userpass
* is MD5-crypted
- * @param Adresses adress
+ * @param Address address
* @return user_id or error null
*/
public Long addUser(long level_id, int availible, int status,
String firstname, String login, String lastname, long language_id,
- String userpass, Adresses adress, boolean sendSMS, Date age, String hash,
+ String userpass, Address address, boolean sendSMS, Date age, String hash,
String sip_user, String sip_pass, String sip_auth,
boolean generateSipUserData, OmTimeZone timezone,
Boolean forceTimeZoneCheck, String userOffers, String userSearchs,
@@ -1109,7 +1109,7 @@ public class Usermanagement {
users.setLogin(login);
users.setLastname(lastname);
users.setAge(age);
- users.setAdresses(adress);
+ users.setAddress(address);
users.setSendSMS(sendSMS);
users.setAvailible(availible);
users.setLastlogin(new Date());
@@ -1132,7 +1132,7 @@ public class Usermanagement {
UserSipData userSipData = openXGHttpClient
.openSIPgUserCreateUser(firstname, "", lastname, users
- .getAdresses().getEmail(), userpass, login);
+ .getAddress().getEmail(), userpass, login);
Long userSipDataId = userSipDataDao.addUserSipData(userSipData);
@@ -1208,7 +1208,7 @@ public class Usermanagement {
public Long addUserWithExternalKey(long level_id, int availible,
int status, String firstname, String login, String lastname,
- long language_id, String userpass, Adresses address, Date age,
+ long language_id, String userpass, Address address, Date age,
String hash, String externalUserId, String externalUserType,
boolean generateSipUserData, String email, String jNameTimeZone,
String pictureuri) {
@@ -1220,9 +1220,9 @@ public class Usermanagement {
users.setAge(age);
if (address != null) {
- users.setAdresses(address);
+ users.setAddress(address);
} else {
- users.setAdresses("", "", "", statemanagement.getStateById(1L), "",
+ users.setAddress("", "", "", statemanagement.getStateById(1L), "",
"", "", "", email);
}
@@ -1241,7 +1241,7 @@ public class Usermanagement {
UserSipData userSipData = openXGHttpClient
.openSIPgUserCreateUser(firstname, "", lastname, users
- .getAdresses().getEmail(), userpass, login);
+ .getAddress().getEmail(), userpass, login);
Long userSipDataId = userSipDataDao.addUserSipData(userSipData);
@@ -1383,32 +1383,32 @@ public class Usermanagement {
String email = values.get("email").toString();
- if (!email.equals(savedUser.getAdresses().getEmail())) {
+ if (!email.equals(savedUser.getAddress().getEmail())) {
boolean checkEmail = emailManagement
.checkUserEMail(email);
if (!checkEmail) {
// mail already used by another user!
returnLong = new Long(-11);
} else {
- savedUser.getAdresses().setEmail(email);
+ savedUser.getAddress().setEmail(email);
}
}
String phone = values.get("phone").toString();
- savedUser.getAdresses().setPhone(phone);
- savedUser.getAdresses().setComment(
+ savedUser.getAddress().setPhone(phone);
+ savedUser.getAddress().setComment(
values.get("comment").toString());
- savedUser.getAdresses().setStreet(
+ savedUser.getAddress().setStreet(
values.get("street").toString());
- savedUser.getAdresses().setTown(
+ savedUser.getAddress().setTown(
values.get("town").toString());
- savedUser.getAdresses().setAdditionalname(
+ savedUser.getAddress().setAdditionalname(
values.get("additionalname").toString());
- savedUser.getAdresses()
+ savedUser.getAddress()
.setZip(values.get("zip").toString());
savedUser.setSendSMS(false);
savedUser.setForceTimeZoneCheck(false);
- savedUser.getAdresses().setStates(
+ savedUser.getAddress().setState(
statemanagement.getStateById(Long.parseLong(values
.get("state_id").toString())));
@@ -1422,7 +1422,7 @@ public class Usermanagement {
savedUser.setUserSearchs(values.get("userSearchs")
.toString());
- // savedUser.setAdresses(addressmanagement.getAdressbyId(user.getAdresses().getAdresses_id()));
+ // savedUser.setAddress(addressmanagement.getaddressbyId(user.getAddress().getId()));
if (savedUser.getUser_id() == null) {
em.persist(savedUser);
@@ -1462,7 +1462,7 @@ public class Usermanagement {
// check if Mail given
if (email.length() > 0) {
- // log.debug("getAdresses_id "+addr_e.getAdresses_id());
+ // log.debug("getId "+addr_e.getId());
Users us = usersDao.getUserByEmail(email);
if (us != null) {
this.sendHashByUser(us, appLink);
@@ -1495,7 +1495,7 @@ public class Usermanagement {
String reset_link = appLink + "?lzproxied=solo&hash="
+ us.getResethash();
- String email = us.getAdresses().getEmail();
+ String email = us.getAddress().getEmail();
Long default_lang_id = Long.valueOf(
cfgManagement.getConfKey(3, "default_lang_id").getConf_value())
@@ -1596,7 +1596,7 @@ public class Usermanagement {
String hql = "SELECT c from Users AS c "
+ "WHERE "
- + "(c.login LIKE :userOrEmail OR c.adresses.email LIKE :userOrEmail ) "
+ + "(c.login LIKE :userOrEmail OR c.address.email LIKE :userOrEmail ) "
+ "AND c.externalUserId IS NULL " + "AND c.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
@@ -1622,7 +1622,7 @@ public class Usermanagement {
log.debug("Usermanagement.getUserByEmail : " + userOrEmail);
String hql = "SELECT c from Users AS c " + "WHERE "
- + "c.adresses.email LIKE :userOrEmail";
+ + "c.address.email LIKE :userOrEmail";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("userOrEmail", userOrEmail);
@@ -1846,8 +1846,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -1857,8 +1857,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + ")";
@@ -1867,8 +1867,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")"
+ "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -1884,8 +1884,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")" + ")";
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")" + ")";
} else if (userOffers.length() != 0) {
@@ -1995,8 +1995,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -2006,8 +2006,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search) "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")"
+ "AND" + "(" + "lower(c.userOffers) LIKE :userOffers "
+ ")" + ")";
@@ -2016,8 +2016,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")"
+ "AND" + "("
+ "lower(c.userSearchs) LIKE :userSearchs " + ")" + ")";
@@ -2033,8 +2033,8 @@ public class Usermanagement {
hql += "AND " + "(" + "(" + "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")" + ")";
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")" + ")";
} else if (userOffers.length() != 0) {
@@ -2129,8 +2129,8 @@ public class Usermanagement {
+ "lower(c.login) LIKE :search "
+ "OR lower(c.firstname) LIKE :search "
+ "OR lower(c.lastname) LIKE :search "
- + "OR lower(c.adresses.email) LIKE :search "
- + "OR lower(c.adresses.town) LIKE :search " + ")" + "OR"
+ + "OR lower(c.address.email) LIKE :search "
+ + "OR lower(c.address.town) LIKE :search " + ")" + "OR"
+ "(" + "lower(c.userOffers) LIKE :userOffers " + ")"
+ "OR" + "(" + "lower(c.userSearchs) LIKE :userSearchs "
+ ")" + ")";
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java Wed Jul 25 17:07:42 2012
@@ -159,7 +159,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -219,7 +219,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -266,7 +266,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -302,7 +302,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -344,7 +344,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -380,7 +380,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -425,7 +425,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
@@ -461,7 +461,7 @@ public class PrivateMessagesDaoImpl {
hql += "OR lower(c.from.firstname) LIKE :search ";
hql += "OR lower(c.from.lastname) LIKE :search ";
hql += "OR lower(c.from.login) LIKE :search ";
- hql += "OR lower(c.from.adresses.email) LIKE :search ";
+ hql += "OR lower(c.from.address.email) LIKE :search ";
hql += " ) ";
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/dao/UsersDaoImpl.java Wed Jul 25 17:07:42 2012
@@ -32,7 +32,7 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.adresses.Adresses;
+import org.openmeetings.app.persistence.beans.address.Address;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.utils.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
@@ -99,7 +99,7 @@ public class UsersDaoImpl {
Users us = getUser(USER_ID);
us.setDeleted(true);
us.setUpdatetime(new Date());
- Adresses adr = us.getAdresses();
+ Address adr = us.getAddress();
if (adr != null) {
adr.setDeleted(true);
}
@@ -187,7 +187,7 @@ public class UsersDaoImpl {
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + "OR lower(u.login) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
- + "' " + "OR lower(u.adresses.email) LIKE '"
+ + "' " + "OR lower(u.address.email) LIKE '"
+ StringUtils.lowerCase("%" + searchItems[i] + "%")
+ "' " + ") ";
@@ -247,7 +247,7 @@ public class UsersDaoImpl {
}
return us;
} catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
+ log.error("[getUserByName]", e);
}
return null;
}
@@ -255,7 +255,7 @@ public class UsersDaoImpl {
public Users getUserByEmail(String email) {
try {
String hql = "SELECT u FROM Users as u "
- + " where u.adresses.email = :email"
+ + " where u.address.email = :email"
+ " AND u.deleted <> :deleted";
TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("email", email);
@@ -267,7 +267,7 @@ public class UsersDaoImpl {
}
return us;
} catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
+ log.error("[getUserByEmail]", e);
}
return null;
}
@@ -293,7 +293,7 @@ public class UsersDaoImpl {
return new Long(-5);
}
} catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
+ log.error("[getUserByHash]", e);
}
return new Long(-1);
}
@@ -312,7 +312,7 @@ public class UsersDaoImpl {
return u;
}
} catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
+ log.error("[resetPassByHash]", e);
}
return new Long(-1);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java?rev=1365668&r1=1365667&r2=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java Wed Jul 25 17:07:42 2012
@@ -34,7 +34,7 @@ import org.openmeetings.app.data.basic.d
import org.openmeetings.app.data.user.Statemanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.ldap.config.ConfigReader;
-import org.openmeetings.app.persistence.beans.adresses.States;
+import org.openmeetings.app.persistence.beans.address.State;
import org.openmeetings.app.persistence.beans.basic.LdapConfig;
import org.openmeetings.app.persistence.beans.rooms.RoomClient;
import org.openmeetings.app.persistence.beans.user.Users;
@@ -642,14 +642,9 @@ public class LdapLoginManagement {
}
if (state != null) {
- // Lookup for states
- List<States> states = statemanagement.getStates();
-
- for (int i = 0; i < states.size(); i++) {
- States oneState = states.get(i);
-
+ for (State oneState : statemanagement.getStates()) {
if (oneState.getName().equals(state)) {
- state_id = oneState.getState_id();
+ state_id = oneState.getId();
break;
}
}
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/Address.java (from r1365650, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/Address.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/Address.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java&r1=1365650&r2=1365668&rev=1365668&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/Adresses.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/Address.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;
@@ -33,14 +33,14 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity
-@Table(name = "adresses")
-public class Adresses implements Serializable {
+@Table(name = "address")
+public class Address implements Serializable {
private static final long serialVersionUID = 1387576041912128161L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "adresses_id")
- private Long adresses_id;
+ @Column(name = "id")
+ private Long id;
@Column(name = "additionalname")
private String additionalname;
@Lob
@@ -52,7 +52,7 @@ public class Adresses implements Seriali
private Date starttime;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "state_id")
- private States states;
+ private State state;
@Column(name = "street")
private String street;
@Column(name = "town")
@@ -69,10 +69,6 @@ public class Adresses implements Seriali
@Column(name = "phone")
private String phone;
- public Adresses() {
- // TODO Auto-generated constructor stub
- }
-
public String getAdditionalname() {
return additionalname;
}
@@ -81,12 +77,12 @@ public class Adresses implements Seriali
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() {
@@ -113,12 +109,12 @@ public class Adresses implements Seriali
this.starttime = starttime;
}
- public States getStates() {
- return states;
+ public State getState() {
+ return state;
}
- public void setStates(States states) {
- this.states = states;
+ public void setState(State state) {
+ this.state = state;
}
public String getStreet() {