You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/26 09:31:03 UTC
svn commit: r1365902 [1/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/ WebContent/src/base/auth/
WebContent/src/base/components/dynamicCombobox/
WebContent/src/modules/admin/confadmin/ WebContent/src/modules/admin/ldap/
WebCon...
Author: solomax
Date: Thu Jul 26 07:31:01 2012
New Revision: 1365902
URL: http://svn.apache.org/viewvc?rev=1365902&view=rev
Log:
OPENMEETINGS-107 All class/fields renamings are reverted
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/
- copied from r1365086, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/adresses/
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
- copied unchanged from r1365086, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValues.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/address/
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorValue.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx
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/confadmin/confAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.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/basic/Configurationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
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/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/ErrorType.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/LdapConfig.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConfigurationService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ErrorService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/LdapConfigService.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/checkLoginData.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/checkLoginData.lzx Thu Jul 26 07:31:01 2012
@@ -119,7 +119,7 @@
<![CDATA[
if ($debug) Debug.write("getActiveLdapConfigs: ",value);
for (var i=0;i<value.length;i++) {
- parent.addItem(value[i].name,value[i].id);
+ parent.addItem(value[i].name,value[i].ldapConfigId);
}
var g = canvas.getUserData();
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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/auth/registerNewUser.lzx Thu Jul 26 07:31:01 2012
@@ -168,7 +168,7 @@
this.parent.regObject["additionalname"]='';
this.parent.regObject["fax"]='';
this.parent.regObject["zip"]='';
- this.parent.regObject["state_id"]=Number(this.parent._state.getValue());
+ this.parent.regObject["states_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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -61,7 +61,7 @@
</method>
<labeldTextListItem datapath="countrySet:/item" text="$path{ 'name/text()' }"
- value="$path{ 'id/text()' }" />
+ value="$path{ 'state_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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Jul 26 07:31:01 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].id);
+ //this.addItem(canvas.statesInitValues[i].name,canvas.statesInitValues[i].state_id);
}
return a;
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx Thu Jul 26 07:31:01 2012
@@ -69,7 +69,7 @@
for (var i=0;i<records.length;i++){
new lz.confAdminListItem(this._innerlist._inn._inn,{
obj:records[i],
- configuration_id:records[i].id,
+ configuration_id:records[i].configuration_id,
conf_key:records[i].conf_key,
conf_value:records[i].conf_value
});
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx Thu Jul 26 07:31:01 2012
@@ -56,7 +56,7 @@
<!-- methods -->
<method name="initValueFieldsByObject" args="obj">
- this.configuration_id = obj.id;
+ this.configuration_id = obj.configuration_id;
if (this.configuration_id!=0){
this.getConfByConfigurationId.doCall();
}
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx Thu Jul 26 07:31:01 2012
@@ -81,7 +81,7 @@
for (var i=0;i<records.length;i++){
new lz.ldapAdminListItem(this._innerlist._inn._inn,{
obj:records[i],
- ldapConfigId:records[i].id,
+ ldapConfigId:records[i].ldapConfigId,
tName:records[i].name,
configFileName:records[i].configFileName
});
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx Thu Jul 26 07:31:01 2012
@@ -84,7 +84,7 @@
if (obj == null) {
return;
}
- this.ldapConfigId = obj.id;
+ this.ldapConfigId = obj.ldapConfigId;
this.tName.setAttribute('text',obj.name);
this.configFileName.setAttribute('text',obj.configFileName);
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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -711,7 +711,7 @@
obj:records[i],
isSuperModerator:records[i].isSuperModerator,
userId:records[i].user.user_id,
- email:records[i].user.address.email,
+ email:records[i].user.adresses.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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -53,8 +53,8 @@
this.town.setAttribute('text','');
this.userpass1.setAttribute('text','');
var defaultstate = canvas.getCountryRecord(1);
- this.state.addAndSelectItem(defaultstate.name,defaultstate.id);
- this.address_comment.setAttribute('text','');
+ this.state.addAndSelectItem(defaultstate.name,defaultstate.state_id);
+ this.adress_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.address.email);
- this.phone.setAttribute('text',obj.address.phone);
+ this.email.setAttribute('text',obj.adresses.email);
+ this.phone.setAttribute('text',obj.adresses.phone);
this.sendSMS.setValue(obj["sendSMS"] && obj.sendSMS!= null && obj.sendSMS);
this.age.setAttribute('text',parseDateToString(obj.age));
- 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.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.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["state_id"] = this.parent.state.getValue();
- this.sendObject["comment"] = this.parent.address_comment.getText();
+ this.sendObject["states_id"] = this.parent.state.getValue();
+ this.sendObject["comment"] = this.parent.adress_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="address_comment" y="550" x="120" width="270"
+ <customScrollEdittext name="adress_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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -376,6 +376,19 @@
}
}
+
+ // 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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx Thu Jul 26 07:31:01 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.address != null && value.address.town != null) {
- parent._langAndCountry._town.setAttribute("text","<u>" + value.address.town + "</u>");
+ if (value.adresses != null && value.adresses.town != null) {
+ parent._langAndCountry._town.setAttribute("text","<u>" + value.adresses.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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx Thu Jul 26 07:31:01 2012
@@ -132,11 +132,11 @@
userObject["login"] = canvas.thishib.currentInvitation.invitedEMail;
userObject["firstname"] = "";
userObject["lastname"] = 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;
+ 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;
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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 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.address.email",false,false);
+ this.addHeaderItemOrdered(137,138,"u.adresses.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].address.email,
+ email:records[i].adresses.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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx Thu Jul 26 07:31:01 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.address.email);
- this.phone.setAttribute('text', obj.address.phone);
+ this.email.setAttribute('text',obj.adresses.email);
+ this.phone.setAttribute('text', obj.adresses.phone);
this.age.setAttribute('text',parseDateToString(obj.age));
- 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.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.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.address_comment.getText();
+ this.parent.userObj.comment = this.parent.adress_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.address.state ",this.parent.userObj.address.state);
+ if ($debug) Debug.write("this.parent.userObj.adresses.states ",this.parent.userObj.adresses.states);
</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:Address-Info -->
+ <!-- 142:Adress-Info -->
<labelText labelid="142" width="200" y="430" resize="false" x="2"/>
- <customEdittext name="address_comment" y="430" x="120" width="270"
+ <customEdittext name="adress_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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -41,7 +41,7 @@
if (this.userObject != null) {
var tString = this.userObject.firstname + ' ' + this.userObject.lastname + ' '
- + '<' + this.userObject.address.email + '>';
+ + '<' + this.userObject.adresses.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.address.email + '>';
+ + '<' + value.adresses.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.address.email.startsWith(tString) ) {
+ || canvas.userContacts[i].contact.adresses.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.address.email + '>', tResultA[k].contact.firstname +' '+ tResultA[k].contact.lastname + ' <' + tResultA[k].contact.address.email + '>');
+ 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 + '>');
}
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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 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.address.email+'>';
+ value.result[k].userName = value.result[k].from.firstname+' '+value.result[k].from.lastname+' <'+value.result[k].from.adresses.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.address.email+'>';
+ value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.adresses.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.address.email+'>';
+ value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.adresses.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.address.email+'>';
+ value.result[k].userName = value.result[k].to.firstname+' '+value.result[k].to.lastname+' <'+value.result[k].to.adresses.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.address.email+'>');
+ this.from.setAttribute("text",refObj.from.firstname+' '+refObj.from.lastname+' <'+refObj.from.adresses.email+'>');
if (refObj.to != null) {
- this.to.setAttribute("text",refObj.to.firstname+' '+refObj.to.lastname+' <'+refObj.to.address.email+'>');
+ this.to.setAttribute("text",refObj.to.firstname+' '+refObj.to.lastname+' <'+refObj.to.adresses.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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx Thu Jul 26 07:31:01 2012
@@ -229,12 +229,12 @@
<method name="showUserContactData">
<![CDATA[
- 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/>";
+ 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/>";
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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Thu Jul 26 07:31:01 2012
@@ -360,7 +360,7 @@ limitations under the License.
,
String fax
,
- long state_id
+ long states_id
,
String town
,
@@ -471,7 +471,7 @@ limitations under the License.
<td valign="top">
long
</td>
- <td valign="top">state_id</td>
+ <td valign="top">states_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&state_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&states_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 state_id
+ long states_id
,
String town
,
@@ -648,7 +648,7 @@ limitations under the License.
<td valign="top">
long
</td>
- <td valign="top">state_id</td>
+ <td valign="top">states_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&state_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&states_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 state_id
+ long states_id
,
String town
,
@@ -839,7 +839,7 @@ limitations under the License.
<td valign="top">
long
</td>
- <td valign="top">state_id</td>
+ <td valign="top">states_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&state_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&states_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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Thu Jul 26 07:31:01 2012
@@ -22,11 +22,11 @@
<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.address.Address</class>
- <class>org.openmeetings.app.persistence.beans.address.State</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.States</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.ErrorValue</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Thu Jul 26 07:31:01 2012
@@ -22,11 +22,11 @@
<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.address.Address</class>
- <class>org.openmeetings.app.persistence.beans.address.State</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.States</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.ErrorValue</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Thu Jul 26 07:31:01 2012
@@ -22,11 +22,11 @@
<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.address.Address</class>
- <class>org.openmeetings.app.persistence.beans.address.State</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.States</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.ErrorValue</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Thu Jul 26 07:31:01 2012
@@ -22,11 +22,11 @@
<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.address.Address</class>
- <class>org.openmeetings.app.persistence.beans.address.State</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.States</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.ErrorValue</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</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=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Thu Jul 26 07:31:01 2012
@@ -22,11 +22,11 @@
<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.address.Address</class>
- <class>org.openmeetings.app.persistence.beans.address.State</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
+ <class>org.openmeetings.app.persistence.beans.adresses.States</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.ErrorValue</class>
+ <class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java Thu Jul 26 07:31:01 2012
@@ -139,14 +139,14 @@ public class Configurationmanagement {
}
public Configuration getConfByConfigurationId(long user_level,
- long id) {
+ long configuration_id) {
try {
log.debug("getConfByConfigurationId1: user_level " + user_level);
if (authLevelManagement.checkAdminLevel(user_level)) {
Configuration configuration = null;
TypedQuery<Configuration> query = em
- .createQuery("select c from Configuration as c where c.id = :id", Configuration.class);
- query.setParameter("id", id);
+ .createQuery("select c from Configuration as c where c.configuration_id = :configuration_id", Configuration.class);
+ query.setParameter("configuration_id", configuration_id);
query.setMaxResults(1);
try {
configuration = query.getSingleResult();
@@ -223,7 +223,7 @@ public class Configurationmanagement {
log.debug("selectMaxFromConfigurations ");
// get all users
TypedQuery<Long> query = em
- .createQuery("select count(c.id) from Configuration c where c.deleted = false", Long.class);
+ .createQuery("select count(c.configuration_id) from Configuration c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromConfigurations" + ll.get(0));
return ll.get(0);
@@ -264,18 +264,18 @@ public class Configurationmanagement {
Configuration conf = (Configuration) CastMapToObject
.getInstance().castByGivenObject(values,
Configuration.class);
- if (conf.getId().equals(null)
- || conf.getId() == 0) {
+ if (conf.getConfiguration_id().equals(null)
+ || conf.getConfiguration_id() == 0) {
log.info("add new Configuration");
- conf.setId(null);
+ conf.setConfiguration_id(null);
conf.setStarttime(new Date());
conf.setDeleted(false);
return this.addConfig(conf);
} else {
log.info("update Configuration ID: "
- + conf.getId());
+ + conf.getConfiguration_id());
Configuration conf2 = this.getConfByConfigurationId(3L,
- conf.getId());
+ conf.getConfiguration_id());
conf2.setComment(conf.getComment());
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
@@ -297,7 +297,8 @@ public class Configurationmanagement {
public Long addConfig(Configuration conf) {
try {
conf = em.merge(conf);
- return conf.getId();
+ Long configuration_id = conf.getConfiguration_id();
+ return configuration_id;
} catch (Exception ex2) {
log.error("[updateConfByUID]: ", ex2);
}
@@ -306,7 +307,7 @@ public class Configurationmanagement {
public Long updateConfig(Configuration conf) {
try {
- if (conf.getId() == null) {
+ if (conf.getConfiguration_id() == null) {
em.persist(conf);
} else {
if (!em.contains(conf)) {
@@ -318,7 +319,7 @@ public class Configurationmanagement {
} else if ("show.whiteboard.draw.status".equals(conf.getConf_key())) {
ScopeApplicationAdapter.whiteboardDrawStatus = "1".equals(conf.getConf_value());
}
- return conf.getId();
+ return conf.getConfiguration_id();
} catch (Exception ex2) {
log.error("[updateConfByUID]: ", ex2);
}
@@ -337,7 +338,7 @@ public class Configurationmanagement {
conf.setDeleted(true);
Configuration conf2 = this.getConfByConfigurationId(3L,
- conf.getId());
+ conf.getConfiguration_id());
conf2.setComment(conf.getComment());
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/ErrorManagement.java Thu Jul 26 07:31:01 2012
@@ -28,7 +28,7 @@ import javax.persistence.TypedQuery;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.persistence.beans.basic.ErrorType;
-import org.openmeetings.app.persistence.beans.basic.ErrorValue;
+import org.openmeetings.app.persistence.beans.basic.ErrorValues;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -44,12 +44,12 @@ public class ErrorManagement {
public Long addErrorType(Long errortype_id, Long fieldvalues_id) {
try {
ErrorType eType = new ErrorType();
- eType.setId(errortype_id);
+ eType.setErrortype_id(errortype_id);
eType.setStarttime(new Date());
eType.setDeleted(false);
eType.setFieldvalues_id(fieldvalues_id);
eType = em.merge(eType);
- Long newerrortype_id = eType.getId();
+ Long newerrortype_id = eType.getErrortype_id();
return newerrortype_id;
} catch (Exception ex2) {
log.error("[addErrorType]: ", ex2);
@@ -74,7 +74,7 @@ public class ErrorManagement {
public ErrorType getErrorType(Long errortype_id) {
try {
String hql = "select c from ErrorType as c "
- + "WHERE c.deleted <> :deleted AND c.id = :errortype_id";
+ + "WHERE c.deleted <> :deleted AND c.errortype_id = :errortype_id";
TypedQuery<ErrorType> query = em.createQuery(hql, ErrorType.class);
query.setParameter("deleted", true);
query.setParameter("errortype_id", errortype_id);
@@ -88,14 +88,14 @@ public class ErrorManagement {
public Long addErrorValues(Long errorvalues_id, Long errortype_id,
Long fieldvalues_id) {
try {
- ErrorValue eValue = new ErrorValue();
- eValue.setId(errorvalues_id);
- eValue.setType(getErrorType(errortype_id));
+ ErrorValues eValue = new ErrorValues();
+ eValue.setErrorvalues_id(errorvalues_id);
+ eValue.setErrortype_id(errortype_id);
eValue.setDeleted(false);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
- return eValue.getId();
+ return eValue.getErrorvalues_id();
} catch (Exception ex2) {
log.error("[addErrorValues]: ", ex2);
}
@@ -104,12 +104,12 @@ public class ErrorManagement {
public Long getErrorValueById(Long errortype_id, Long fieldvalues_id) {
try {
- ErrorValue eValue = new ErrorValue();
- eValue.setType(getErrorType(errortype_id));
+ ErrorValues eValue = new ErrorValues();
+ eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getId();
+ Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[getErrorValueById]: ", ex2);
@@ -119,12 +119,12 @@ public class ErrorManagement {
public Long updateErrorValues(Long errortype_id, Long fieldvalues_id) {
try {
- ErrorValue eValue = new ErrorValue();
- eValue.setType(getErrorType(errortype_id));
+ ErrorValues eValue = new ErrorValues();
+ eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getId();
+ Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[addErrorType]: ", ex2);
@@ -132,15 +132,15 @@ public class ErrorManagement {
return null;
}
- public ErrorValue getErrorValuesById(Long errorvalues_id) {
+ public ErrorValues getErrorValuesById(Long errorvalues_id) {
try {
- String hql = "select c from ErrorValue as c "
- + " where c.id = :errorvalues_id "
+ String hql = "select c from ErrorValues as c "
+ + " where c.errorvalues_id = :errorvalues_id "
+ " AND c.deleted <> :deleted";
- TypedQuery<ErrorValue> query = em.createQuery(hql, ErrorValue.class);
+ TypedQuery<ErrorValues> query = em.createQuery(hql, ErrorValues.class);
query.setParameter("errorvalues_id", errorvalues_id);
query.setParameter("deleted", true);
- ErrorValue e = null;
+ ErrorValues e = null;
try {
e = query.getSingleResult();
} catch (NoResultException ex) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java?rev=1365902&r1=1365901&r2=1365902&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java Thu Jul 26 07:31:01 2012
@@ -67,7 +67,7 @@ public class LdapConfigDaoImpl {
log.debug("addLdapConfig :2: "+insertedby);
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getId();
+ Long ldapConfigId = ldapConfig.getLdapConfigId();
if (ldapConfigId > 0) {
return ldapConfigId;
@@ -89,7 +89,7 @@ public class LdapConfigDaoImpl {
ldapConfig.setInserted(new Date());
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getId();
+ Long ldapConfigId = ldapConfig.getLdapConfigId();
if (ldapConfigId > 0) {
return ldapConfigId;
@@ -128,7 +128,7 @@ public class LdapConfigDaoImpl {
log.debug("updateLdapConfig :2: "+updatedby);
ldapConfig = em.merge(ldapConfig);
- ldapConfigId = ldapConfig.getId();
+ ldapConfigId = ldapConfig.getLdapConfigId();
return ldapConfigId;
@@ -142,7 +142,7 @@ public class LdapConfigDaoImpl {
try {
String hql = "select c from LdapConfig c " +
- "WHERE c.id = :ldapConfigId " +
+ "WHERE c.ldapConfigId = :ldapConfigId " +
"AND c.deleted = :deleted";
TypedQuery<LdapConfig> query = em.createQuery(hql, LdapConfig.class);
@@ -191,7 +191,7 @@ public class LdapConfigDaoImpl {
try {
log.debug("selectMaxFromConfigurations ");
//get all users
- TypedQuery<Long> query = em.createQuery("select count(c.id) from LdapConfig c where c.deleted = false", Long.class);
+ TypedQuery<Long> query = em.createQuery("select count(c.ldapConfigId) from LdapConfig c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromLdapConfig" + ll.get(0));
return ll.get(0);
@@ -210,7 +210,7 @@ public class LdapConfigDaoImpl {
return null;
}
- ldapConfig = em.find(LdapConfig.class, ldapConfig.getId());
+ ldapConfig = em.find(LdapConfig.class, ldapConfig.getLdapConfigId());
em.remove(ldapConfig);
return ldapConfigId;
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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -477,7 +477,7 @@ public class AppointmentDaoImpl {
Users user = userManagement.getUserById(users_id);
String invitorName = user.getFirstname() + " " + user.getLastname()
- + " [" + user.getAddress().getEmail() + "]";
+ + " [" + user.getAdresses().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.getAddress().getEmail() + "]";
+ + " [" + user.getAdresses().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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -204,12 +204,12 @@ public class AppointmentLogic {
isPasswordProtected, password, false, user.getOmTimeZone().getJname());
String invitorName = user.getFirstname() + " " + user.getLastname()
- + " [" + user.getAddress().getEmail() + "]";
+ + " [" + user.getAdresses().getEmail() + "]";
// Add the creator of the meeting calendar event
meetingMemberLogic.addMeetingMember(user.getFirstname(), user
.getLastname(), "", "", appointmentId, userId, user
- .getAddress().getEmail(), user.getPhoneForSMS(), baseUrl, userId, true,
+ .getAdresses().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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -188,7 +188,7 @@ public class Invitationmanagement {
if (invitationId > 0) {
if (sendMail) {
- this.sendInvitionLink(us.getAddress().getEmail(),
+ this.sendInvitionLink(us.getAdresses().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.getAddress().getEmail(),
+ member.getAppointment(), user.getAdresses().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.getAddress().getEmail() + "]";
+ + " [" + user.getAdresses().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
- .getAddress().getEmail(), subject, message);
+ .getAdresses().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
- .getAddress().getEmail(), user.getLogin(), invitor);
+ .getAdresses().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.getAddress().getEmail(), subject, handler.getIcalAsByteArray(),
+ mailiCalThread.doSend(email, user.getAdresses().getEmail(), subject, handler.getIcalAsByteArray(),
message);
return null;
@@ -804,14 +804,14 @@ public class Invitationmanagement {
atts.add(attendeeInDerHashMap);
HashMap<String, String> attendeeList = handler.getAttendeeData(user
- .getAddress().getEmail(), user.getLogin(), invitor);
+ .getAdresses().getEmail(), user.getLogin(), invitor);
handler.addNewMeeting(starttime, endtime, point.getAppointmentName(), atts,
subject, attendeeList, point.getIcalId(), timeZone);
log.debug(handler.getICalDataAsString());
- mailiCalThread.doSend(email, user.getAddress().getEmail(), subject, handler.getIcalAsByteArray(),
+ mailiCalThread.doSend(email, user.getAdresses().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.getAddress().getEmail();
+ replyToEmail = user.getAdresses().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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 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.address.Address;
+import org.openmeetings.app.persistence.beans.adresses.Adresses;
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 address to the user with his account data
+ * sends a mail adress 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<Address> query = em
- .createQuery("select c from Address as c where c.email LIKE :email AND c.deleted <> :deleted", Address.class);
+ TypedQuery<Adresses> query = em
+ .createQuery("select c from Adresses as c where c.email LIKE :email AND c.deleted <> :deleted", Adresses.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=1365902&r1=1365901&r2=1365902&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 Thu Jul 26 07:31:01 2012
@@ -26,7 +26,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.openmeetings.app.OpenmeetingsVariables;
-import org.openmeetings.app.persistence.beans.address.State;
+import org.openmeetings.app.persistence.beans.adresses.States;
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 state table with no short name and code
+ * adds a new State to the states 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 state table
+ * adds a new State to the states 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 {
- State st = new State();
+ States st = new States();
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.getId();
+ Long id = st.getState_id();
log.debug("added id " + id);
@@ -87,16 +87,16 @@ public class Statemanagement {
/**
* selects a state by its id
*
- * @param id
+ * @param state_id
* @return the state-object or null
*/
- public State getStateById(long id) {
+ public States getStateById(long state_id) {
try {
- 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);
+ 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);
query.setParameter("deleted", true);
- List<State> ll = query.getResultList();
+ List<States> 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<State> getStates() {
+ public List<States> getStates() {
try {
- TypedQuery<State> query = em
- .createQuery("select c from State as c where c.deleted <> :deleted", State.class);
+ TypedQuery<States> query = em
+ .createQuery("select c from States as c where c.deleted <> :deleted", States.class);
query.setParameter("deleted", true);
- List<State> ll = query.getResultList();
+ List<States> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
log.error("getStates", ex2);