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 2013/12/11 07:31:07 UTC

svn commit: r1550057 - in /openmeetings/trunk/singlewebapp: docs/ src/axis/java/org/apache/openmeetings/axis/services/ src/db/java/org/apache/openmeetings/db/dao/record/ src/db/java/org/apache/openmeetings/db/dto/basic/ src/db/java/org/apache/openmeeti...

Author: solomax
Date: Wed Dec 11 06:31:07 2013
New Revision: 1550057

URL: http://svn.apache.org/r1550057
Log:
[OPENMEETINGS-854] - getFlvRecordingByExternalUserId take into account both external id and type

Added:
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
      - copied, changed from r1550051, openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
      - copied, changed from r1550051, openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
      - copied, changed from r1550051, openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java
Removed:
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java
Modified:
    openmeetings/trunk/singlewebapp/docs/RoomService.html
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
    openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
    openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java

Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1550057&r1=1550056&r2=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Wed Dec 11 06:31:07 2013
@@ -362,13 +362,15 @@ limitations under the License.
     			    			    			       			   String SID
     			       			    			       			     , 
     			       			   String externalUserId
+    			       			    			       			     , 
+    			       			   String externalUserType
     			       			    			)
     			</i><br/>
     			<p>
     			  Gets a list of flv recordings
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.axis.services.FLVRecordingReturn[]
+                  Return Type: java.util.List
                 </p>
     			<p>Params:</p>
     			    			
@@ -397,11 +399,19 @@ limitations under the License.
 	                     <td valign="top">the externalUserId</td>
 	                   </tr>
 	                   
+	                   	                   	    			   <tr>
+	                     <td valign="top">
+	                     		                     		String
+	                     		                     </td>
+	                     <td valign="top">externalUsertype</td>
+	                     <td valign="top">the externalUserType</td>
+	                   </tr>
+	                   
 	                   	                   	                   </tbody>
 	    			</table>
     			    			<br/>
     			REST Sample Call/URL:<br/>
-    			    			    				    								    				    												<a href="http://localhost:5080/openmeetings/services/RoomService/getFlvRecordingByExternalUserId?SID=VALUE&externalUserId=VALUE">http://localhost:5080/openmeetings/services/RoomService/getFlvRecordingByExternalUserId?SID=VALUE&amp;externalUserId=VALUE</a>
+    			    			    				    								    				    								    				    												<a href="http://localhost:5080/openmeetings/services/RoomService/getFlvRecordingByExternalUserId?SID=VALUE&externalUserId=VALUE&externalUserType=VALUE">http://localhost:5080/openmeetings/services/RoomService/getFlvRecordingByExternalUserId?SID=VALUE&amp;externalUserId=VALUE&amp;externalUserType=VALUE</a>
     		  </div>
     	   				    		      <div class="method">
 		        <div class="method_header">
@@ -422,7 +432,7 @@ limitations under the License.
     			  Gets a list of flv recordings
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.axis.services.FLVRecordingReturn[]
+                  Return Type: org.apache.openmeetings.db.dto.file.RecordingObject[]
                 </p>
     			<p>Params:</p>
     			    			

Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1550057&r1=1550056&r2=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java Wed Dec 11 06:31:07 2013
@@ -45,6 +45,7 @@ import org.apache.openmeetings.db.dao.se
 import org.apache.openmeetings.db.dao.server.SessiondataDao;
 import org.apache.openmeetings.db.dao.user.AdminUserDao;
 import org.apache.openmeetings.db.dto.basic.SearchResult;
+import org.apache.openmeetings.db.dto.file.RecordingObject;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.calendar.MeetingMember;
 import org.apache.openmeetings.db.entity.record.FlvRecording;
@@ -188,49 +189,26 @@ public class RoomWebService {
 	/**
 	 * Gets a list of flv recordings
 	 * 
-	 * @param SID
-	 *            The SID of the User. This SID must be marked as Loggedin
-	 * @param externalUserId
-	 *            the externalUserId
+	 * @param SID The SID of the User. This SID must be marked as Loggedin
+	 * @param externalUserId the externalUserId
+	 * @param externalUsertype the externalUserType
 	 *            
 	 * @return - list of flv recordings
 	 * @throws AxisFault
 	 */
-	public FLVRecordingReturn[] getFlvRecordingByExternalUserId(String SID,
-			String externalUserId) throws AxisFault {
+	public List<RecordingObject> getFlvRecordingByExternalUserId(String SID,
+			String externalUserId, String externalUserType) throws AxisFault {
 		try {
-
 			Long users_id = sessiondataDao.checkSession(SID);
 			Long user_level = userManager.getUserLevelByID(users_id);
 
 			if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
-				List<FlvRecording> recordingList = flvRecordingDao
-						.getFlvRecordingByExternalUserId(externalUserId);
-
-				// We need to re-marshal the Rooms object cause Axis2 cannot use
-				// our objects
-				if (recordingList != null && recordingList.size() != 0) {
-					// roomsListObject.setRoomList(roomList);
-					FLVRecordingReturn[] recordingListItems = new FLVRecordingReturn[recordingList
-							.size()];
-					int count = 0;
-					for (Iterator<FlvRecording> it = recordingList.iterator(); it
-							.hasNext();) {
-						FlvRecording flvRecording = it.next();
-						recordingListItems[count] = FLVRecordingReturn
-								.initObject(flvRecording);
-						count++;
-					}
-
-					return recordingListItems;
-				}
-
-				return null;
+				return flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId, externalUserType);
 			}
 
 			return null;
 		} catch (Exception err) {
-			log.error("[getFlvRecordingByExternalRoomType] ", err);
+			log.error("[getFlvRecordingByExternalUserId] ", err);
 			throw new AxisFault(err.getMessage());
 		}
 	}
@@ -247,7 +225,7 @@ public class RoomWebService {
 	 * @return - list of flv recordings
 	 * @throws AxisFault
 	 */
-	public FLVRecordingReturn[] getFlvRecordingByExternalRoomTypeAndCreator(
+	public RecordingObject[] getFlvRecordingByExternalRoomTypeAndCreator(
 			String SID, String externalRoomType, Long insertedBy)
 			throws AxisFault {
 		try {
@@ -264,14 +242,11 @@ public class RoomWebService {
 				// our objects
 				if (recordingList != null && recordingList.size() != 0) {
 					// roomsListObject.setRoomList(roomList);
-					FLVRecordingReturn[] recordingListItems = new FLVRecordingReturn[recordingList
-							.size()];
+					RecordingObject[] recordingListItems = new RecordingObject[recordingList.size()];
 					int count = 0;
-					for (Iterator<FlvRecording> it = recordingList.iterator(); it
-							.hasNext();) {
+					for (Iterator<FlvRecording> it = recordingList.iterator(); it.hasNext();) {
 						FlvRecording flvRecording = it.next();
-						recordingListItems[count] = FLVRecordingReturn
-								.initObject(flvRecording);
+						recordingListItems[count] = new RecordingObject(flvRecording);
 						count++;
 					}
 

Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1550057&r1=1550056&r2=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java Wed Dec 11 06:31:07 2013
@@ -22,7 +22,8 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.db.dto.basic.RoomSearchResult;
+import org.apache.openmeetings.db.dto.file.RecordingObject;
+import org.apache.openmeetings.db.dto.room.RoomSearchResult;
 import org.apache.openmeetings.db.entity.record.FlvRecording;
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.room.RoomType;
@@ -57,13 +58,12 @@ public class RoomWebServiceFacade extend
 				flvRecordingId);
 	}
 
-	public FLVRecordingReturn[] getFlvRecordingByExternalUserId(String SID,
-			String externalUserId) throws AxisFault {
-		return getBean(RoomWebService.class).getFlvRecordingByExternalUserId(SID,
-				externalUserId);
+	public List<RecordingObject> getFlvRecordingByExternalUserId(String SID,
+			String externalUserId, String externalUserType) throws AxisFault {
+		return getBean(RoomWebService.class).getFlvRecordingByExternalUserId(SID, externalUserId, externalUserType);
 	}
 
-	public FLVRecordingReturn[] getFlvRecordingByExternalRoomTypeAndCreator(
+	public RecordingObject[] getFlvRecordingByExternalRoomTypeAndCreator(
 			String SID, String externalRoomType, Long insertedBy)
 			throws AxisFault {
 		return getBean(RoomWebService.class)

Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1550057&r1=1550056&r2=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java Wed Dec 11 06:31:07 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.axis.ser
 
 import org.apache.axis2.AxisFault;
 import org.apache.openmeetings.db.dto.basic.ErrorResult;
-import org.apache.openmeetings.db.dto.basic.UserSearchResult;
+import org.apache.openmeetings.db.dto.user.UserSearchResult;
 import org.apache.openmeetings.db.entity.server.Sessiondata;
 
 public class UserWebServiceFacade extends BaseWebService {

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1550057&r1=1550056&r2=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Wed Dec 11 06:31:07 2013
@@ -28,6 +28,7 @@ import javax.persistence.NoResultExcepti
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
+import org.apache.openmeetings.db.dto.file.RecordingObject;
 import org.apache.openmeetings.db.entity.record.FlvRecording;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -96,26 +97,21 @@ public class FlvRecordingDao {
 		return null;
 	}
 
-	public List<FlvRecording> getFlvRecordingByExternalUserId(String externalUserId) {
+	public List<RecordingObject> getFlvRecordingByExternalUserId(String externalUserId, String externalUserType) {
 		try {
+			log.debug("getFlvRecordingByExternalUserId :externalUserId: {}; externalType: {}", externalUserId, externalUserType);
 
-			log.debug("getFlvRecordingByExternalUserId :externalUserId: " + externalUserId);
-
-			String hql = "SELECT c FROM FlvRecording c, Room r, User u WHERE c.room_id = r.rooms_id "
-					+ "AND c.insertedBy = u.user_id AND u.externalUserId LIKE :externalUserId "
-					+ "AND c.deleted <> :deleted ";
-
-			TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
+			TypedQuery<RecordingObject> query = em.createNamedQuery("getRecordingsByExternalUser", RecordingObject.class);
 			query.setParameter("externalUserId", externalUserId);
-			query.setParameter("deleted", true);
+			query.setParameter("externalUserType", externalUserType);
 
-			List<FlvRecording> flvRecordingList = query.getResultList();
+			List<RecordingObject> flvRecordingList = query.getResultList();
 
-			log.debug("getFlvRecordingByExternalRoomType :: " + flvRecordingList.size());
+			log.debug("getFlvRecordingByExternalUserId :: " + flvRecordingList.size());
 
 			return flvRecordingList;
 		} catch (Exception ex2) {
-			log.error("[getFlvRecordingByExternalRoomType]: ", ex2);
+			log.error("[getFlvRecordingByExternalUserId]: ", ex2);
 		}
 		return null;
 	}

Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java (from r1550051, openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java&p1=openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java&r1=1550051&r2=1550057&rev=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/FLVRecordingReturn.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/file/RecordingObject.java Wed Dec 11 06:31:07 2013
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.axis.services;
+package org.apache.openmeetings.db.dto.file;
 
 import java.util.Date;
 
 import org.apache.openmeetings.db.entity.record.FlvRecording;
 
 
-public class FLVRecordingReturn {
+public class RecordingObject {
 
 	private long flvRecordingId;
 	
@@ -65,51 +65,48 @@ public class FLVRecordingReturn {
 	private Boolean isInterview;
 	private Integer progressPostProcessing;
 	
-	public static FLVRecordingReturn initObject(FlvRecording customObject) {
-		
-		FLVRecordingReturn flvRecordingReturn = new FLVRecordingReturn();
-		
-		flvRecordingReturn.flvRecordingId = customObject.getFlvRecordingId();
-		
-		flvRecordingReturn.fileName = customObject.getFileName();
-		flvRecordingReturn.alternateDownload = customObject.getAlternateDownload();
-		flvRecordingReturn.fileHash = customObject.getFileHash();
-		flvRecordingReturn.comment = customObject.getComment();
+	public RecordingObject() {}
+	
+	public RecordingObject(FlvRecording customObject) {
+		this.flvRecordingId = customObject.getFlvRecordingId();
 		
-		flvRecordingReturn.parentFileExplorerItemId = customObject.getParentFileExplorerItemId();
-		flvRecordingReturn.room_id = customObject.getRoom_id();
-		flvRecordingReturn.ownerId = customObject.getOwnerId();//OwnerID => only set if its directly root in Owner Directory, other Folders and Files
+		this.fileName = customObject.getFileName();
+		this.alternateDownload = customObject.getAlternateDownload();
+		this.fileHash = customObject.getFileHash();
+		this.comment = customObject.getComment();
+		
+		this.parentFileExplorerItemId = customObject.getParentFileExplorerItemId();
+		this.room_id = customObject.getRoom_id();
+		this.ownerId = customObject.getOwnerId();//OwnerID => only set if its directly root in Owner Directory, other Folders and Files
 		//maybe are also in a Home directory but just because their parent is
 		
-		flvRecordingReturn.isFolder = customObject.getIsFolder();
-		flvRecordingReturn.isImage = customObject.getIsImage();
-		flvRecordingReturn.isPresentation = customObject.getIsPresentation();
-		flvRecordingReturn.isRecording = customObject.getIsRecording();
-		
-		flvRecordingReturn.recordStart = customObject.getRecordStart();
-		flvRecordingReturn.recordEnd = customObject.getRecordEnd();
+		this.isFolder = customObject.getIsFolder();
+		this.isImage = customObject.getIsImage();
+		this.isPresentation = customObject.getIsPresentation();
+		this.isRecording = customObject.getIsRecording();
 		
-		flvRecordingReturn.insertedBy = customObject.getInsertedBy();
-		flvRecordingReturn.inserted = customObject.getInserted();
-		flvRecordingReturn.updated = customObject.getUpdated();
-		flvRecordingReturn.deleted = customObject.getDeleted();
+		this.recordStart = customObject.getRecordStart();
+		this.recordEnd = customObject.getRecordEnd();
 		
-		flvRecordingReturn.width = customObject.getWidth();
-		flvRecordingReturn.height = customObject.getHeight();
+		this.insertedBy = customObject.getInsertedBy();
+		this.inserted = customObject.getInserted();
+		this.updated = customObject.getUpdated();
+		this.deleted = customObject.getDeleted();
 		
-		flvRecordingReturn.flvWidth = customObject.getFlvWidth();
-		flvRecordingReturn.flvHeight = customObject.getFlvHeight();
-		flvRecordingReturn.previewImage = customObject.getPreviewImage();
+		this.width = customObject.getWidth();
+		this.height = customObject.getHeight();
 		
-		flvRecordingReturn.fileSize = customObject.getFileSize();
+		this.flvWidth = customObject.getFlvWidth();
+		this.flvHeight = customObject.getFlvHeight();
+		this.previewImage = customObject.getPreviewImage();
 		
-		flvRecordingReturn.recorderStreamId = customObject.getRecorderStreamId();
-		flvRecordingReturn.organization_id = customObject.getOrganization_id();
+		this.fileSize = customObject.getFileSize();
 		
-		flvRecordingReturn.isInterview = customObject.getIsInterview();
-		flvRecordingReturn.progressPostProcessing = customObject.getProgressPostProcessing();
+		this.recorderStreamId = customObject.getRecorderStreamId();
+		this.organization_id = customObject.getOrganization_id();
 		
-		return flvRecordingReturn;
+		this.isInterview = customObject.getIsInterview();
+		this.progressPostProcessing = customObject.getProgressPostProcessing();
 	}
 
 	public long getFlvRecordingId() {
@@ -335,9 +332,4 @@ public class FLVRecordingReturn {
 	public void setProgressPostProcessing(Integer progressPostProcessing) {
 		this.progressPostProcessing = progressPostProcessing;
 	}
-	
-	
-	
-	
-	
 }

Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java (from r1550051, openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java&p1=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java&r1=1550051&r2=1550057&rev=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java Wed Dec 11 06:31:07 2013
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.db.dto.basic;
+package org.apache.openmeetings.db.dto.room;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.openmeetings.db.dto.room.RoomDTO;
+import org.apache.openmeetings.db.dto.basic.SearchResult;
 import org.apache.openmeetings.db.entity.room.Room;
 
 public class RoomSearchResult {

Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java (from r1550051, openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java&p1=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java&r1=1550051&r2=1550057&rev=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java Wed Dec 11 06:31:07 2013
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.db.dto.basic;
+package org.apache.openmeetings.db.dto.user;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.openmeetings.db.dto.user.UserDTO;
+import org.apache.openmeetings.db.dto.basic.SearchResult;
 import org.apache.openmeetings.db.entity.user.User;
 
 public class UserSearchResult {

Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1550057&r1=1550056&r2=1550057&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Wed Dec 11 06:31:07 2013
@@ -59,8 +59,10 @@ import org.simpleframework.xml.Root;
  */
 @Entity
 @NamedQueries({ 
-	@NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM FlvRecording f "
-		+ "WHERE f.fileHash = :fileHash") 
+	@NamedQuery(name = "getRecordingByHash", query = "SELECT f FROM FlvRecording f WHERE f.fileHash = :fileHash") 
+	, @NamedQuery(name = "getRecordingsByExternalUser", query = "SELECT NEW org.apache.openmeetings.db.dto.file.RecordingObject(c) FROM FlvRecording c, User u "
+			+ "WHERE c.insertedBy = u.user_id AND u.externalUserId = :externalUserId  AND u.externalUserType = :externalUserType "
+			+ "AND c.deleted = false") 
 })
 @Table(name = "flvrecording")
 @Root(name = "flvrecording")