Author: solomax
Date: Wed Sep 25 17:11:54 2013
New Revision: 1526234
URL: http://svn.apache.org/r1526234
Log:
[OPENMEETINGS-740] cluster server and oAuth server are added to backup/restore
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1526234&r1=1526233&r2=1526234&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
Wed Sep 25 17:11:54 2013
@@ -30,54 +30,87 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
@Entity
@Table(name = "oauth_servers")
@NamedQueries({
- @NamedQuery(name = "getEnabledOAuthServers", query = "select s from
OAuthServer as s where s.enabled = true and s.deleted = false"),
- @NamedQuery(name = "getOAuthServerById", query = "select s from
OAuthServer as s where s.id = :id"),
- @NamedQuery(name = "getAllOAuthServers", query = "select s from
OAuthServer as s where s.deleted = false"),
- @NamedQuery(name = "countOAuthServers", query = "select count(s) from
OAuthServer s WHERE s.deleted = false")
-})
+ @NamedQuery(name = "getEnabledOAuthServers", query = "select s
from OAuthServer as s where s.enabled = true and s.deleted = false"),
+ @NamedQuery(name = "getOAuthServerById", query = "select s from
OAuthServer as s where s.id = :id"),
+ @NamedQuery(name = "getAllOAuthServers", query = "select s from
OAuthServer as s where s.deleted = false"),
+ @NamedQuery(name = "countOAuthServers", query = "select
count(s) from OAuthServer s WHERE s.deleted = false") })
+@Root
public class OAuthServer implements Serializable, IDataProviderEntity {
-
+
private static final long serialVersionUID = -9034438721147720175L;
-
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
+ @Element(data = true)
private Long id;
+
@Column(name = "name")
+ @Element(data = true)
private String name;
+
@Column(name = "icon_url")
+ @Element(data = true)
private String iconUrl;
+
@Column(name = "enabled")
- private Boolean enabled;
+ @Element(data = true)
+ private boolean enabled;
+
@Column(name = "client_id")
+ @Element(data = true)
private String clientId;
+
@Column(name = "client_secret")
+ @Element(data = true)
private String clientSecret;
+
@Column(name = "request_key_url")
+ @Element(data = true)
private String requestKeyUrl;
+
@Column(name = "request_token_url")
+ @Element(data = true)
private String requestTokenUrl;
+
@Column(name = "request_token_attributes")
+ @Element(data = true)
private String requestTokenAttributes;
+
@Column(name = "request_method")
+ @Element(data = true)
private RequestMethod requestTokenMethod;
+
@Column(name = "request_info_url")
+ @Element(data = true)
private String requestInfoUrl;
+
@Column(name = "login_param_name")
+ @Element(data = true)
private String loginParamName;
+
@Column(name = "email_param_name")
+ @Element(data = true)
private String emailParamName;
+
@Column(name = "firstname_param_name")
+ @Element(data = true)
private String firstnameParamName;
+
@Column(name = "lastname_param_name")
+ @Element(data = true)
private String lastnameParamName;
+
@Column(name = "deleted")
+ @Element(data = true)
private boolean deleted;
-
+
public Long getId() {
return id;
}
@@ -102,11 +135,11 @@ public class OAuthServer implements Seri
this.iconUrl = iconUrl;
}
- public Boolean isEnabled() {
+ public boolean isEnabled() {
return enabled;
}
- public void setEnabled(Boolean enabled) {
+ public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
@@ -198,7 +231,7 @@ public class OAuthServer implements Seri
this.lastnameParamName = lastnameParamName;
}
- public boolean getDeleted() {
+ public boolean isDeleted() {
return deleted;
}
@@ -206,29 +239,19 @@ public class OAuthServer implements Seri
this.deleted = deleted;
}
- public Boolean getEnabled() {
- return enabled;
- }
-
@Override
public String toString() {
- return "OAuthServer [id=" + id + ", name=" + name + ", iconUrl="
- + iconUrl + ", enabled=" + enabled + ",
clientId=" + clientId
- + ", clientSecret=" + clientSecret + ",
requestKeyUrl="
- + requestKeyUrl + ", requestTokenUrl=" +
requestTokenUrl
- + ", requestTokenAttributes=" +
requestTokenAttributes
- + ", requestTokenMethod=" + requestTokenMethod
- + ", requestInfoUrl=" + requestInfoUrl + ",
loginParamName="
- + loginParamName + ", emailParamName=" +
emailParamName
- + ", firstnameParamName=" + firstnameParamName
- + ", lastnameParamName=" + lastnameParamName +
", deleted="
- + deleted + "]";
+ return "OAuthServer [id=" + id + ", name=" + name + ",
iconUrl=" + iconUrl + ", enabled=" + enabled
+ + ", clientId=" + clientId + ", clientSecret="
+ clientSecret + ", requestKeyUrl=" + requestKeyUrl
+ + ", requestTokenUrl=" + requestTokenUrl + ",
requestTokenAttributes=" + requestTokenAttributes
+ + ", requestTokenMethod=" + requestTokenMethod
+ ", requestInfoUrl=" + requestInfoUrl
+ + ", loginParamName=" + loginParamName + ",
emailParamName=" + emailParamName + ", firstnameParamName="
+ + firstnameParamName + ", lastnameParamName=" +
lastnameParamName + ", deleted=" + deleted + "]";
}
public enum RequestMethod {
- POST("post"),
- GET("get");
-
+ POST("post"), GET("get");
+
private String name;
private RequestMethod(String name) {
@@ -240,5 +263,5 @@ public class OAuthServer implements Seri
return name;
}
}
-
+
}
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1526234&r1=1526233&r2=1526234&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
Wed Sep 25 17:11:54 2013
@@ -119,7 +119,7 @@ public class Server implements Serializa
@Column(name = "active", nullable = true)
@Element(data = true, required = false)
- private Boolean active;
+ private boolean active;
@Column(name = "deleted", nullable = false)
@Element(data = true)
@@ -249,11 +249,11 @@ public class Server implements Serializa
this.id = id;
}
- public Boolean getActive() {
+ public boolean isActive() {
return active;
}
- public void setActive(Boolean active) {
+ public void setActive(boolean active) {
this.active = active;
}
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java?rev=1526234&r1=1526233&r2=1526234&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
Wed Sep 25 17:11:54 2013
@@ -59,6 +59,8 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.dao.record.FlvRecordingDao;
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
+import org.apache.openmeetings.db.dao.server.OAuth2Dao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
@@ -140,6 +142,10 @@ public class BackupExport {
private ConfigurationDao configurationDao;
@Autowired
private ChatDao chatDao;
+ @Autowired
+ private OAuth2Dao auth2Dao;
+ @Autowired
+ private ServerDao serverDao;
public void performExport(File filePath, File backup_dir,
boolean includeFiles) throws Exception {
@@ -232,6 +238,16 @@ public class BackupExport {
"ldapconfigs", ldapConfigDao.getLdapConfigs());
/*
+ * ##################### Cluster servers
+ */
+ writeList(simpleSerializer, backup_dir, "servers.xml",
"servers", serverDao.get(0, Integer.MAX_VALUE));
+
+ /*
+ * ##################### OAuth2 servers
+ */
+ writeList(simpleSerializer, backup_dir, "oauth2servers.xml",
"oauth2servers", auth2Dao.get(0, Integer.MAX_VALUE));
+
+ /*
* ##################### Private Messages
*/
{
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java?rev=1526234&r1=1526233&r2=1526234&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
Wed Sep 25 17:11:54 2013
@@ -75,6 +75,8 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
+import org.apache.openmeetings.db.dao.server.OAuth2Dao;
+import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
@@ -98,6 +100,8 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.RoomPollAnswers;
import org.apache.openmeetings.db.entity.room.RoomType;
import org.apache.openmeetings.db.entity.server.LdapConfig;
+import org.apache.openmeetings.db.entity.server.OAuthServer;
+import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.db.entity.user.Address;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
@@ -171,6 +175,10 @@ public class BackupImport {
private TimezoneUtil tzUtil;
@Autowired
private ChatDao chatDao;
+ @Autowired
+ private ServerDao serverDao;
+ @Autowired
+ private OAuth2Dao auth2Dao;
private final Map<Long, Long> usersMap = new HashMap<Long, Long>();
private final Map<Long, Long> organisationsMap = new HashMap<Long,
Long>();
@@ -429,7 +437,29 @@ public class BackupImport {
}
}
- log.info("Ldap config import complete, starting recordings
import");
+ log.info("Ldap config import complete, starting cluster servers
import");
+ /*
+ * ##################### Cluster servers
+ */
+ {
+ List<Server> list = readList(simpleSerializer, f,
"servers.xml", "servers", Server.class, true);
+ for (Server s : list) {
+ serverDao.update(s, null);
+ }
+ }
+
+ log.info("Cluster servers import complete, starting OAuth2
servers import");
+ /*
+ * ##################### OAuth2 servers
+ */
+ {
+ List<OAuthServer> list = readList(simpleSerializer, f,
"oauth2servers.xml", "oauth2servers", OAuthServer.class, true);
+ for (OAuthServer s : list) {
+ auth2Dao.update(s, null);
+ }
+ }
+
+ log.info("OAuth2 servers import complete, starting recordings
import");
/*
* ##################### Import Recordings
*/
