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 2017/09/13 10:14:56 UTC
openmeetings git commit: [OPENMEETINGS-1671] initial commit on room
files
Repository: openmeetings
Updated Branches:
refs/heads/OPENMEETINGS-1671-room-files [created] da7a4ff04
[OPENMEETINGS-1671] initial commit on room files
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/da7a4ff0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/da7a4ff0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/da7a4ff0
Branch: refs/heads/OPENMEETINGS-1671-room-files
Commit: da7a4ff04922a4db313f23e879a0b3bdd41ce71d
Parents: 4943f46
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Sep 13 17:14:41 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Sep 13 17:14:41 2017 +0700
----------------------------------------------------------------------
.../openmeetings/db/dao/room/RoomDao.java | 2 +-
.../openmeetings/db/entity/room/Room.java | 6 +++
.../openmeetings/db/entity/room/RoomFile.java | 51 ++++++++++++++++++++
.../classes/META-INF/db2_persistence.xml | 1 +
.../classes/META-INF/derby_persistence.xml | 1 +
.../classes/META-INF/mssql_persistence.xml | 3 +-
.../classes/META-INF/mysql_persistence.xml | 1 +
.../classes/META-INF/oracle_persistence.xml | 1 +
.../classes/META-INF/postgresql_persistence.xml | 1 +
9 files changed, 65 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 0ea7a43..6dd79a8 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -83,7 +83,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
q.setParameter("id", id);
@SuppressWarnings("unchecked")
OpenJPAQuery<Room> kq = OpenJPAPersistence.cast(q);
- kq.getFetchPlan().addFetchGroups("roomModerators", "roomGroups");
+ kq.getFetchPlan().addFetchGroups("roomModerators", "roomGroups", "roomFiles");
List<Room> l = kq.getResultList();
r = l.isEmpty() ? r : l.get(0);
} finally {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index b09ae13..6f76946 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -61,6 +61,7 @@ import org.simpleframework.xml.Root;
@FetchGroups({
@FetchGroup(name = "roomModerators", attributes = { @FetchAttribute(name = "moderators") })
, @FetchGroup(name = "roomGroups", attributes = { @FetchAttribute(name = "roomGroups") })
+ , @FetchGroup(name = "roomFiles", attributes = { @FetchAttribute(name = "roomFiles") })
})
@NamedQueries({
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
@@ -301,6 +302,11 @@ public class Room implements IDataProviderEntity {
@org.simpleframework.xml.Transient
private List<RoomGroup> roomGroups = new ArrayList<>();
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinColumn(name = "room_id", insertable = true, updatable = true, nullable = false)
+ @ElementDependent
+ private List<RoomFile> roomfiles = new ArrayList<>();
+
@Transient
private List<StreamClient> currentusers;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java
new file mode 100644
index 0000000..3098aa9
--- /dev/null
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomFile.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.entity.room;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
+@Entity
+@Table(name = "room_file")
+public class RoomFile implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @Column(name = "room_id")
+ private Long roomId;
+
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
index 7268dbf..7f8cee6 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
@@ -46,6 +46,7 @@
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomFile</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
index 1f1e117..1c7eee0 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
@@ -46,6 +46,7 @@
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomFile</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
index 1406f21..453f180 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
@@ -45,9 +45,10 @@
<class>org.apache.openmeetings.db.entity.room.RoomPollAnswer</class>
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomFile</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
- <class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
index bd84f1c..d645324 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
@@ -46,6 +46,7 @@
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomFile</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
index a5229c1..b6a6326 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
@@ -46,6 +46,7 @@
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomFile</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/da7a4ff0/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
index 6d2c129..d7dbe26 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
@@ -46,6 +46,7 @@
<class>org.apache.openmeetings.db.entity.room.RoomModerator</class>
<class>org.apache.openmeetings.db.entity.room.Room</class>
<class>org.apache.openmeetings.db.entity.room.RoomGroup</class>
+ <class>org.apache.openmeetings.db.entity.room.RoomFile</class>
<class>org.apache.openmeetings.db.entity.room.Whiteboard</class>
<class>org.apache.openmeetings.db.entity.room.WhiteboardItem</class>
<class>org.apache.openmeetings.db.entity.user.Address</class>