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 2016/05/26 10:07:10 UTC
svn commit: r1745587 - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/
branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/
branches/3.1.x/openmeetings-...
Author: solomax
Date: Thu May 26 10:07:09 2016
New Revision: 1745587
URL: http://svn.apache.org/viewvc?rev=1745587&view=rev
Log:
[OPENMEETINGS-1410] DB columns are renamed, tests are fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Thu May 26 10:07:09 2016
@@ -161,7 +161,7 @@ public class Appointment implements IDat
@Element(name = "appointmentId", data = true)
private Long id;
- @Column(name = "appointmentname")
+ @Column(name = "title")
@Element(name="appointmentName", data=true, required=false)
private String title;
@@ -169,11 +169,11 @@ public class Appointment implements IDat
@Element(name="appointmentLocation", data=true, required=false)
private String location;
- @Column(name = "start")
+ @Column(name = "app_start") //Oracle fails in case 'start' is used as column name
@Element(name="appointmentStarttime", data=true)
private Date start;
- @Column(name = "end")
+ @Column(name = "app_end") //renamed to be in sync with 'app_start'
@Element(name="appointmentEndtime", data=true)
private Date end;
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Thu May 26 10:07:09 2016
@@ -1126,7 +1126,7 @@ public class BackupImport {
}
private Long getNewId(Long oldId, Maps map) {
- Long newId = oldId;
+ Long newId = null;
switch (map) {
case USERS:
if (usersMap.containsKey(oldId)) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Thu May 26 10:07:09 2016
@@ -53,12 +53,12 @@ public abstract class AbstractJUnitDefau
@Autowired
private ImportInitvalues importInitvalues;
@Autowired
- private ConfigurationDao configurationDao;
+ protected ConfigurationDao cfgDao;
@Before
public void setUp() throws Exception {
wicketApplicationName = "openmeetings";
- configurationDao.getCryptKey();
+ cfgDao.getCryptKey();
if (userDao.count() < 1) {
makeDefaultScheme();
log.info("Default scheme created successfully");
@@ -66,7 +66,7 @@ public abstract class AbstractJUnitDefau
log.info("Default scheme already created");
}
if (configKeyCryptClassName == null) {
- assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
+ assertNotNull("Crypt class name should not be null", cfgDao.getCryptKey());
}
}
@@ -144,7 +144,7 @@ public abstract class AbstractJUnitDefau
u.setFirstname("firstname" + rnd);
u.setLastname("lastname" + rnd);
u.setLogin("login" + rnd);
- u.updatePassword(configurationDao, "pass" + rnd);
+ u.updatePassword(cfgDao, "pass" + rnd);
u.setLanguageId(1L);
return u;
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Thu May 26 10:07:09 2016
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.test.backup;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.util.List;
import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -33,7 +37,9 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.room.RoomGroupDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
+import org.junit.After;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -56,7 +62,25 @@ public class TestOldBackups extends Abst
private MeetingMemberDao meetingMemberDao;
@Autowired
private RoomGroupDao roomGroupDao;
+ private String cryptClass = null;
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ // Crypt class need to be preserved here to avoid overriding by backup import
+ cryptClass = cfgDao.getCryptKey();
+ }
+
+ @After
+ public void tearDown() {
+ List<Configuration> cfgs = cfgDao.get(CONFIG_CRYPT_KEY);
+ assertNotNull("Not null list should be returned", cfgs);
+ assertEquals("There should be exactly 1 item", 1, cfgs.size());
+ Configuration c = cfgs.get(0);
+ c.setValue(cryptClass);
+ cfgDao.update(c, null);
+ }
+
@Test
public void importOldVersions() {
String backupsDir = System.getProperty("backups.dir", ".");
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Thu May 26 10:07:09 2016
@@ -161,7 +161,7 @@ public class Appointment implements IDat
@Element(name = "appointmentId", data = true)
private Long id;
- @Column(name = "appointmentname")
+ @Column(name = "title")
@Element(name="appointmentName", data=true, required=false)
private String title;
@@ -169,11 +169,11 @@ public class Appointment implements IDat
@Element(name="appointmentLocation", data=true, required=false)
private String location;
- @Column(name = "start")
+ @Column(name = "app_start") //Oracle fails in case 'start' is used as column name
@Element(name="appointmentStarttime", data=true)
private Date start;
- @Column(name = "end")
+ @Column(name = "app_end") //renamed to be in sync with 'app_start'
@Element(name="appointmentEndtime", data=true)
private Date end;
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Thu May 26 10:07:09 2016
@@ -1179,7 +1179,7 @@ public class BackupImport {
}
private Long getNewId(Long oldId, Maps map) {
- Long newId = oldId;
+ Long newId = null;
switch (map) {
case USERS:
if (usersMap.containsKey(oldId)) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Thu May 26 10:07:09 2016
@@ -53,12 +53,12 @@ public abstract class AbstractJUnitDefau
@Autowired
private ImportInitvalues importInitvalues;
@Autowired
- private ConfigurationDao configurationDao;
+ protected ConfigurationDao cfgDao;
@Before
public void setUp() throws Exception {
wicketApplicationName = "openmeetings";
- configurationDao.getCryptKey();
+ cfgDao.getCryptKey();
if (userDao.count() < 1) {
makeDefaultScheme();
log.info("Default scheme created successfully");
@@ -66,7 +66,7 @@ public abstract class AbstractJUnitDefau
log.info("Default scheme already created");
}
if (configKeyCryptClassName == null) {
- assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
+ assertNotNull("Crypt class name should not be null", cfgDao.getCryptKey());
}
}
@@ -144,7 +144,7 @@ public abstract class AbstractJUnitDefau
u.setFirstname("firstname" + rnd);
u.setLastname("lastname" + rnd);
u.setLogin("login" + rnd);
- u.updatePassword(configurationDao, "pass" + rnd);
+ u.updatePassword(cfgDao, "pass" + rnd);
u.setLanguageId(1L);
return u;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Thu May 26 10:07:09 2016
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.test.backup;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.util.List;
import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -33,7 +37,9 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.room.RoomGroupDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
+import org.junit.After;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -56,7 +62,25 @@ public class TestOldBackups extends Abst
private MeetingMemberDao meetingMemberDao;
@Autowired
private RoomGroupDao roomGroupDao;
+ private String cryptClass = null;
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ // Crypt class need to be preserved here to avoid overriding by backup import
+ cryptClass = cfgDao.getCryptKey();
+ }
+
+ @After
+ public void tearDown() {
+ List<Configuration> cfgs = cfgDao.get(CONFIG_CRYPT_KEY);
+ assertNotNull("Not null list should be returned", cfgs);
+ assertEquals("There should be exactly 1 item", 1, cfgs.size());
+ Configuration c = cfgs.get(0);
+ c.setValue(cryptClass);
+ cfgDao.update(c, null);
+ }
+
@Test
public void importOldVersions() {
String backupsDir = System.getProperty("backups.dir", ".");
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Thu May 26 10:07:09 2016
@@ -161,7 +161,7 @@ public class Appointment implements IDat
@Element(name = "appointmentId", data = true)
private Long id;
- @Column(name = "appointmentname")
+ @Column(name = "title")
@Element(name="appointmentName", data=true, required=false)
private String title;
@@ -169,11 +169,11 @@ public class Appointment implements IDat
@Element(name="appointmentLocation", data=true, required=false)
private String location;
- @Column(name = "start")
+ @Column(name = "app_start") //Oracle fails in case 'start' is used as column name
@Element(name="appointmentStarttime", data=true)
private Date start;
- @Column(name = "end")
+ @Column(name = "app_end") //renamed to be in sync with 'app_start'
@Element(name="appointmentEndtime", data=true)
private Date end;
Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Thu May 26 10:07:09 2016
@@ -1179,7 +1179,7 @@ public class BackupImport {
}
private Long getNewId(Long oldId, Maps map) {
- Long newId = oldId;
+ Long newId = null;
switch (map) {
case USERS:
if (usersMap.containsKey(oldId)) {
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Thu May 26 10:07:09 2016
@@ -53,12 +53,12 @@ public abstract class AbstractJUnitDefau
@Autowired
private ImportInitvalues importInitvalues;
@Autowired
- private ConfigurationDao configurationDao;
+ protected ConfigurationDao cfgDao;
@Before
public void setUp() throws Exception {
wicketApplicationName = "openmeetings";
- configurationDao.getCryptKey();
+ cfgDao.getCryptKey();
if (userDao.count() < 1) {
makeDefaultScheme();
log.info("Default scheme created successfully");
@@ -66,7 +66,7 @@ public abstract class AbstractJUnitDefau
log.info("Default scheme already created");
}
if (configKeyCryptClassName == null) {
- assertNotNull("Crypt class name should not be null", configurationDao.getCryptKey());
+ assertNotNull("Crypt class name should not be null", cfgDao.getCryptKey());
}
}
@@ -144,7 +144,7 @@ public abstract class AbstractJUnitDefau
u.setFirstname("firstname" + rnd);
u.setLastname("lastname" + rnd);
u.setLogin("login" + rnd);
- u.updatePassword(configurationDao, "pass" + rnd);
+ u.updatePassword(cfgDao, "pass" + rnd);
u.setLanguageId(1L);
return u;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1745587&r1=1745586&r2=1745587&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Thu May 26 10:07:09 2016
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.test.backup;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.util.List;
import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -33,7 +37,9 @@ import org.apache.openmeetings.db.dao.ro
import org.apache.openmeetings.db.dao.room.RoomGroupDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
+import org.junit.After;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -56,7 +62,25 @@ public class TestOldBackups extends Abst
private MeetingMemberDao meetingMemberDao;
@Autowired
private RoomGroupDao roomGroupDao;
+ private String cryptClass = null;
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ // Crypt class need to be preserved here to avoid overriding by backup import
+ cryptClass = cfgDao.getCryptKey();
+ }
+
+ @After
+ public void tearDown() {
+ List<Configuration> cfgs = cfgDao.get(CONFIG_CRYPT_KEY);
+ assertNotNull("Not null list should be returned", cfgs);
+ assertEquals("There should be exactly 1 item", 1, cfgs.size());
+ Configuration c = cfgs.get(0);
+ c.setValue(cryptClass);
+ cfgDao.update(c, null);
+ }
+
@Test
public void importOldVersions() {
String backupsDir = System.getProperty("backups.dir", ".");