+1
El mié, 20-05-2015 a las 08:24 +0000, [email protected] escribió:
> Author: solomax
> Date: Wed May 20 08:24:36 2015
> New Revision: 1680486
>
> URL: http://svn.apache.org/r1680486
> Log:
> Backup import is fixed to work properly with deleted rooms; code clean-up
>
> Modified:
>
> openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
>
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
>
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
>
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
>
> openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
>
> Modified:
> openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
> (original)
> +++
> openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
> Wed May 20 08:24:36 2015
> @@ -365,7 +365,7 @@ public class BackupImport {
>
> List<RoomOrganisation> list = readList(serializer, f,
> "rooms_organisation.xml", "room_organisations", RoomOrganisation.class);
> for (RoomOrganisation ro : list) {
> - if (!ro.getDeleted() && ro.getRoom() != null &&
> ro.getOrganisation() != null && ro.getOrganisation().getOrganisation_id() !=
> null) {
> + if (!ro.getDeleted() && ro.getRoom() != null &&
> ro.getRoom().getRooms_id() != null && ro.getOrganisation() != null &&
> ro.getOrganisation().getOrganisation_id() != null) {
> // We need to reset this as openJPA
> reject to store them otherwise
> ro.setRooms_organisation_id(null);
> roomOrganisationDao.update(ro, null);
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
> Wed May 20 08:24:36 2015
> @@ -78,7 +78,7 @@ public class ErrorType implements IDataP
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
> Wed May 20 08:24:36 2015
> @@ -80,7 +80,7 @@ public class ErrorValue implements IData
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
> Wed May 20 08:24:36 2015
> @@ -162,7 +162,7 @@ public class Naviglobal implements IData
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
> Wed May 20 08:24:36 2015
> @@ -164,7 +164,7 @@ public class Navimain implements IDataPr
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentCategory.java
> Wed May 20 08:24:36 2015
> @@ -100,7 +100,7 @@ public class AppointmentCategory impleme
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/AppointmentReminderType.java
> Wed May 20 08:24:36 2015
> @@ -107,7 +107,7 @@ public class AppointmentReminderType imp
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
> Wed May 20 08:24:36 2015
> @@ -220,7 +220,7 @@ public class FlvRecordingMetaData implem
> this.inserted = inserted;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
> Wed May 20 08:24:36 2015
> @@ -171,7 +171,7 @@ public class Invitation implements IData
> this.updated = updated;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
> Wed May 20 08:24:36 2015
> @@ -308,7 +308,7 @@ public class Room implements IDataProvid
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
> Wed May 20 08:24:36 2015
> @@ -114,7 +114,7 @@ public class RoomModerator implements Se
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
> Wed May 20 08:24:36 2015
> @@ -136,7 +136,7 @@ public class RoomOrganisation implements
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomType.java
> Wed May 20 08:24:36 2015
> @@ -89,7 +89,7 @@ public class RoomType implements IDataPr
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
> Wed May 20 08:24:36 2015
> @@ -179,7 +179,7 @@ public class LdapConfig implements IData
> this.updatedby = updatedby;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
> Wed May 20 08:24:36 2015
> @@ -174,7 +174,7 @@ public class Address implements IDataPro
> this.zip = zip;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
> Wed May 20 08:24:36 2015
> @@ -121,7 +121,7 @@ public class Organisation implements IDa
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/OrganisationUser.java
> Wed May 20 08:24:36 2015
> @@ -115,7 +115,7 @@ public class OrganisationUser implements
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Salutation.java
> Wed May 20 08:24:36 2015
> @@ -95,7 +95,7 @@ public class Salutation implements Seria
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/State.java
> Wed May 20 08:24:36 2015
> @@ -95,7 +95,7 @@ public class State implements IDataProvi
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
> Wed May 20 08:24:36 2015
> @@ -403,7 +403,7 @@ public class User implements IDataProvid
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
>
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
> Wed May 20 08:24:36 2015
> @@ -103,7 +103,7 @@ public class Userdata implements Seriali
> this.updatetime = updatetime;
> }
>
> - public boolean getDeleted() {
> + public boolean isDeleted() {
> return deleted;
> }
> public void setDeleted(boolean deleted) {
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
> Wed May 20 08:24:36 2015
> @@ -366,7 +366,7 @@ public class BackupImport {
>
> List<RoomOrganisation> list = readList(serializer, f,
> "rooms_organisation.xml", "room_organisations", RoomOrganisation.class);
> for (RoomOrganisation ro : list) {
> - if (!ro.getDeleted() && ro.getRoom() != null &&
> ro.getOrganisation() != null && ro.getOrganisation().getId() != null) {
> + if (!ro.isDeleted() && ro.getRoom() != null &&
> ro.getRoom().getId() != null && ro.getOrganisation() != null &&
> ro.getOrganisation().getId() != null) {
> // We need to reset this as openJPA
> reject to store them otherwise
> ro.setId(null);
> roomOrganisationDao.update(ro, null);
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
> Wed May 20 08:24:36 2015
> @@ -334,7 +334,7 @@ public class Admin {
> } else {
> invalid
> += pSize;
> }
> - } else if
> (u.getDeleted()) {
> + } else if
> (u.isDeleted()) {
> if (cleanup) {
>
> FileHelper.removeRec(profile);
> } else {
> @@ -344,7 +344,7 @@ public class Admin {
> }
> long missing = 0;
> for (User u :
> udao.getAllBackupUsers()) {
> - if (!u.getDeleted() &&
> u.getPictureuri() != null && !new
> File(OmFileHelper.getUploadProfilesUserDir(u.getId()),
> u.getPictureuri()).exists()) {
> + if (!u.isDeleted() &&
> u.getPictureuri() != null && !new
> File(OmFileHelper.getUploadProfilesUserDir(u.getId()),
> u.getPictureuri()).exists()) {
> missing++;
> }
> }
>
> Modified:
> openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1680486&r1=1680485&r2=1680486&view=diff
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
> (original)
> +++
> openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
> Wed May 20 08:24:36 2015
> @@ -47,7 +47,7 @@ public class TestUserOrganisation extend
>
> private User getValidUser() {
> for (User u : usersDao.getAllBackupUsers()) {
> - if (!u.getDeleted() && u.getOrganisationUsers().size()
> > 0) {
> + if (!u.isDeleted() && u.getOrganisationUsers().size() >
> 0) {
> return u;
> }
> }
>
>
