Author: solomax
Date: Thu Sep 17 05:01:11 2015
New Revision: 1703490
URL: http://svn.apache.org/r1703490
Log:
External users are imported and created with type == 'external'
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1703490&r1=1703489&r2=1703490&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
Thu Sep 17 05:01:11 2015
@@ -662,6 +662,9 @@ public class UserDao implements IDataPro
u.setForceTimeZoneCheck(forceTimeZoneCheck);
u.setExternalUserId(externalId);
u.setExternalUserType(externalType);
+ if (!Strings.isEmpty(u.getExternalUserType())) {
+ u.setType(Type.external);
+ }
u.setUserOffers(userOffers);
u.setUserSearchs(userSearchs);
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=1703490&r1=1703489&r2=1703490&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
Thu Sep 17 05:01:11 2015
@@ -108,6 +108,7 @@ import org.apache.openmeetings.db.util.T
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.crypt.MD5Implementation;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.convert.Registry;
@@ -312,6 +313,9 @@ public class BackupImport {
if (u.getSipUser() != null &&
u.getSipUser().getId() != 0) {
u.getSipUser().setId(0);
}
+ if (!Strings.isEmpty(u.getExternalUserType())) {
+ u.setType(Type.external);
+ }
usersDao.update(u, -1L);
usersMap.put(userId, u.getUser_id());
}
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1703490&r1=1703489&r2=1703490&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
Thu Sep 17 05:01:11 2015
@@ -161,7 +161,7 @@ public class MainService implements IPen
}
public User loginWicket(String SID, String wicketSID, Long
wicketroomid) {
- log.debug("[loginWicket]");
+ log.debug("[loginWicket] SID: '{}'; wicketSID: '{}';
wicketroomid: '{}'", SID, wicketSID, wicketroomid);
Long userId = sessiondataDao.checkSession(wicketSID);
User u = userId == null ? null : userDao.get(userId);
if (u != null && wicketroomid != null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1703490&r1=1703489&r2=1703490&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Thu Sep 17 05:01:11 2015
@@ -663,6 +663,9 @@ public class UserDao implements IDataPro
u.setForceTimeZoneCheck(forceTimeZoneCheck);
u.setExternalId(externalId);
u.setExternalType(externalType);
+ if (!Strings.isEmpty(u.getExternalType())) {
+ u.setType(Type.external);
+ }
u.setUserOffers(userOffers);
u.setUserSearchs(userSearchs);
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=1703490&r1=1703489&r2=1703490&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
Thu Sep 17 05:01:11 2015
@@ -300,6 +300,9 @@ public class BackupImport {
if (u.getSipUser() != null &&
u.getSipUser().getId() != 0) {
u.getSipUser().setId(0);
}
+ if (!Strings.isEmpty(u.getExternalType())) {
+ u.setType(Type.external);
+ }
userDao.update(u, -1L);
usersMap.put(userId, u.getId());
}
