Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java Fri Nov 13 01:24:41 2015 @@ -22,24 +22,24 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.apache.openmeetings.db.dto.room.WhiteboardObject; -import org.apache.openmeetings.util.OpenmeetingsVariables; + +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class WhiteboardManager { - - private static final Logger log = Red5LoggerFactory.getLogger( - WhiteboardManager.class, OpenmeetingsVariables.webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(WhiteboardManager.class, webAppRootKey); @Autowired - private WhiteBoardObjectListManagerById whiteBoardObjectListManagerById; + private WhiteBoardObjectListManagerById wbListManagerById; @SuppressWarnings({ "rawtypes", "unchecked" }) - public void addWhiteBoardObjectById(Long room_id, Map whiteboardObj, - Long whiteBoardId) { + public void addWhiteBoardObjectById(Long roomId, Map whiteboardObj, Long whiteBoardId) { try { log.debug("addWhiteBoardObjectById: ", whiteboardObj); @@ -59,21 +59,19 @@ public class WhiteboardManager { List actionObject = (List) whiteboardObj.get(3); if (action.equals("moveMap")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); - whiteboardObject.setX(Integer.valueOf( - actionObject.get(1).toString()).intValue()); - whiteboardObject.setY(Integer.valueOf( - actionObject.get(2).toString()).intValue()); + whiteboardObject.setX(Integer.valueOf(actionObject.get(1).toString())); + whiteboardObject.setY(Integer.valueOf(actionObject.get(2).toString())); - whiteBoardObjectListManagerById - .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, + wbListManagerById + .setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, whiteboardObject, whiteBoardId); } else if (action.equals("draw") || action.equals("redo")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); // log.debug(actionObject); @@ -86,21 +84,21 @@ public class WhiteboardManager { log.debug("objectOID: " + objectOID); whiteboardObject.getRoomItems() .put(objectOID, actionObject); - whiteBoardObjectListManagerById + wbListManagerById .setWhiteBoardObjectListRoomObjAndWhiteboardId( - room_id, whiteboardObject, whiteBoardId); + roomId, whiteboardObject, whiteBoardId); } } else if (action.equals("clear")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); whiteboardObject.setRoomItems(new HashMap<String, List>()); - whiteBoardObjectListManagerById - .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, + wbListManagerById + .setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, whiteboardObject, whiteBoardId); } else if (action.equals("delete") || action.equals("undo")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); String objectOID = actionObject.get(actionObject.size() - 1) .toString(); @@ -132,9 +130,7 @@ public class WhiteboardManager { || objectType.equals("mindmapnode") || objectType.equals("flv")) { - Integer zIndex = Integer.valueOf( - actionObject.get(actionObject.size() - 8) - .toString()).intValue(); + Integer zIndex = Integer.valueOf(actionObject.get(actionObject.size() - 8).toString()); log.debug("1|zIndex " + zIndex); log.debug("2|zIndex " @@ -156,10 +152,7 @@ public class WhiteboardManager { List actionObjectStored = whiteboardObject .getRoomItems().get(whiteboardObjKey); - Integer zIndexStored = Integer.valueOf( - actionObjectStored.get( - actionObjectStored.size() - 8) - .toString()).intValue(); + Integer zIndexStored = Integer.valueOf(actionObjectStored.get(actionObjectStored.size() - 8).toString()); log.debug("zIndexStored|zIndex " + zIndexStored + "|" + zIndex); @@ -168,19 +161,17 @@ public class WhiteboardManager { zIndexStored -= 1; log.debug("new-zIndex " + zIndexStored); } - actionObjectStored.set(actionObjectStored.size() - 8, - zIndexStored); + actionObjectStored.set(actionObjectStored.size() - 8, zIndexStored); - whiteboardObject.getRoomItems().put(whiteboardObjKey, - actionObjectStored); + whiteboardObject.getRoomItems().put(whiteboardObjKey, actionObjectStored); } } whiteboardObject.getRoomItems().remove(objectOID); - whiteBoardObjectListManagerById - .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, + wbListManagerById + .setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, whiteboardObject, whiteBoardId); } else if (action.equals("size") || action.equals("editProp") || action.equals("editTextMindMapNode") @@ -188,20 +179,18 @@ public class WhiteboardManager { || action.equals("flv") || action.equals("editTextMindMapColor") || action.equals("editTextMindMapFontColor")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); - String objectOID = actionObject.get(actionObject.size() - 1) - .toString(); + String objectOID = actionObject.get(actionObject.size() - 1).toString(); // List roomItem = roomList.get(objectOID); - List currentObject = whiteboardObject.getRoomItems().get( - objectOID); + List currentObject = whiteboardObject.getRoomItems().get(objectOID); if (actionObject.get(0).equals("paint")) { actionObject.set(1, currentObject.get(1)); } whiteboardObject.getRoomItems().put(objectOID, actionObject); - Map roomList = whiteboardObject.getRoomItems(); + Map<String, List> roomList = whiteboardObject.getRoomItems(); if (action.equals("swf")) { @@ -211,72 +200,32 @@ public class WhiteboardManager { if (actionObject.get(8) != currentObject.get(8)) { - String baseObjectName = actionObject.get( - actionObject.size() - 1).toString(); - Integer slidesNumber = Integer.valueOf( - actionObject.get(8).toString()).intValue(); - - log.debug("updateObjectsToSlideNumber :: " - + baseObjectName + "," + slidesNumber); - - for (Iterator<String> iter = roomList.keySet() - .iterator(); iter.hasNext();) { - String whiteboardObjKey = iter.next(); - List actionObjectStored = (List) roomList - .get(whiteboardObjKey); + String baseObjectName = actionObject.get(actionObject.size() - 1).toString(); + Integer slidesNumber = Integer.valueOf(actionObject.get(8).toString()); + + log.debug("updateObjectsToSlideNumber :: " + baseObjectName + "," + slidesNumber); + + for (Entry<String, List> me : roomList.entrySet()) { + List actionObjectStored = me.getValue(); if (actionObjectStored.get(0).equals("ellipse") - || actionObjectStored.get(0).equals( - "drawarrow") - || actionObjectStored.get(0).equals( - "line") - || actionObjectStored.get(0).equals( - "clipart") - || actionObjectStored.get(0).equals( - "paint") - || actionObjectStored.get(0).equals( - "rectangle") - || actionObjectStored.get(0).equals( - "uline") - || actionObjectStored.get(0).equals( - "image") - || actionObjectStored.get(0).equals( - "letter")) { + || actionObjectStored.get(0).equals("drawarrow") + || actionObjectStored.get(0).equals("line") + || actionObjectStored.get(0).equals("clipart") + || actionObjectStored.get(0).equals("paint") + || actionObjectStored.get(0).equals("rectangle") + || actionObjectStored.get(0).equals("uline") + || actionObjectStored.get(0).equals("image") + || actionObjectStored.get(0).equals("letter")) { - Map swfObj = (Map) actionObjectStored - .get(actionObjectStored.size() - 7); + Map swfObj = (Map) actionObjectStored.get(actionObjectStored.size() - 7); log.debug("swfObj :1: " + swfObj); if (swfObj != null) { - - if (swfObj.get("name").equals( - baseObjectName)) { - - if (Integer.valueOf( - swfObj.get("slide") - .toString()) - .intValue() == slidesNumber) { - - swfObj.put("isVisible", true); - - actionObjectStored.set( - actionObjectStored - .size() - 7, - swfObj); - - } else { - - swfObj.put("isVisible", false); - - actionObjectStored.set( - actionObjectStored - .size() - 7, - swfObj); - - } - + if (swfObj.get("name").equals(baseObjectName)) { + swfObj.put("isVisible", Integer.valueOf(swfObj.get("slide").toString()).intValue() == slidesNumber); + actionObjectStored.set(actionObjectStored.size() - 7, swfObj); } - } log.debug("swfObj :1: " + swfObj); @@ -290,13 +239,13 @@ public class WhiteboardManager { } } - whiteBoardObjectListManagerById - .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, + wbListManagerById + .setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, whiteboardObject, whiteBoardId); } else if (action.equals("clearSlide")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); Map roomList = whiteboardObject.getRoomItems(); @@ -307,19 +256,19 @@ public class WhiteboardManager { } - whiteBoardObjectListManagerById - .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, + wbListManagerById + .setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, whiteboardObject, whiteBoardId); } else if (action.equals("whiteboardObj")) { - WhiteboardObject whiteboardObject = whiteBoardObjectListManagerById - .getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id, + WhiteboardObject whiteboardObject = wbListManagerById + .getWhiteBoardObjectListByRoomIdAndWhiteboard(roomId, whiteBoardId); whiteboardObject.setFullFit((Boolean) actionObject.get(1)); whiteboardObject.setZoom((Integer) actionObject.get(2)); - whiteBoardObjectListManagerById - .setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id, + wbListManagerById + .setWhiteBoardObjectListRoomObjAndWhiteboardId(roomId, whiteboardObject, whiteBoardId); } else { log.warn("Unkown Type: " + action + " actionObject: "
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java Fri Nov 13 01:24:41 2015 @@ -19,6 +19,7 @@ package org.apache.openmeetings.core.documents; import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.io.File; import java.io.FileOutputStream; @@ -31,37 +32,40 @@ import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.io.XMLWriter; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; public class CreateLibraryPresentation { + private static final Logger log = Red5LoggerFactory.getLogger(CreateLibraryPresentation.class, webAppRootKey); + public static ConverterProcessResult generateXMLDocument(File targetDirectory, String originalDocument, String pdfDocument, String swfDocument){ ConverterProcessResult returnMap = new ConverterProcessResult(); returnMap.setProcess("generateXMLDocument"); try { + Document document = DocumentHelper.createDocument(); + Element root = document.addElement("presentation"); - Document document = DocumentHelper.createDocument(); - Element root = document.addElement( "presentation" ); - - File file = new File(targetDirectory, originalDocument); - root.addElement( "originalDocument" ) + File file = new File(targetDirectory, originalDocument); + root.addElement("originalDocument") .addAttribute("lastmod", (new Long(file.lastModified())).toString()) .addAttribute("size", (new Long(file.length())).toString()) - .addText( originalDocument ); + .addText(originalDocument); if (pdfDocument!=null){ File pdfDocumentFile = new File(targetDirectory, pdfDocument); - root.addElement( "pdfDocument" ) + root.addElement("pdfDocument") .addAttribute("lastmod", (new Long(pdfDocumentFile.lastModified())).toString()) .addAttribute("size", (new Long(pdfDocumentFile.length())).toString()) - .addText( pdfDocument ); + .addText(pdfDocument); } if (swfDocument!=null){ File swfDocumentFile = new File(targetDirectory, originalDocument); - root.addElement( "swfDocument" ) + root.addElement("swfDocument") .addAttribute("lastmod", (new Long(swfDocumentFile.lastModified())).toString()) - .addAttribute("size", (new Long(swfDocumentFile.length())).toString()) - .addText( swfDocument ); + .addAttribute("size", (new Long(swfDocumentFile.length())).toString()) + .addText(swfDocument); } Element thumbs = root.addElement( "thumbs" ); @@ -83,23 +87,21 @@ public class CreateLibraryPresentation { thumbs.addElement( "thumb" ) .addAttribute("lastmod", (new Long(thumbfile.lastModified())).toString()) .addAttribute("size", (new Long(thumbfile.length())).toString()) - .addText( allfiles[i] ); + .addText(allfiles[i]); } } } - - // lets write to a file - XMLWriter writer = new XMLWriter( - new FileOutputStream(new File(targetDirectory, OmFileHelper.libraryFileName)) - ); - writer.write( document ); - writer.close(); - returnMap.setExitValue("0"); - + // lets write to a file + XMLWriter writer = new XMLWriter(new FileOutputStream(new File(targetDirectory, OmFileHelper.libraryFileName))); + writer.write(document); + writer.close(); + + returnMap.setExitValue("0"); + return returnMap; } catch (Exception err) { - err.printStackTrace(); + log.error("Error while generateXMLDocument", err); returnMap.setError(err.getMessage()); returnMap.setExitValue("-1"); return returnMap; Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java Fri Nov 13 01:24:41 2015 @@ -21,6 +21,7 @@ package org.apache.openmeetings.core.doc import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import java.io.IOException; import java.util.ArrayList; import org.apache.openmeetings.util.Logger; @@ -48,6 +49,7 @@ public class LibraryChartLoader { @SuppressWarnings("rawtypes") public ArrayList loadChart(File dir, String fileName) { + BufferedReader reader = null; try { File file = new File(dir, fileName + fileExt); @@ -56,22 +58,21 @@ public class LibraryChartLoader { XStream xStream = new XStream(new XppDriver()); xStream.setMode(XStream.NO_REFERENCES); - BufferedReader reader = new BufferedReader(new FileReader(file)); - String xmlString = ""; - while (reader.ready()) { - xmlString += reader.readLine(); - } - reader.close(); - // lMap = (LinkedHashMap) xStream.fromXML(xmlString); - ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString); + reader = new BufferedReader(new FileReader(file)); + ArrayList lMapList = (ArrayList) xStream.fromXML(reader); return lMapList; } catch (Exception err) { log.error(err); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) {} + } } return null; - } } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java Fri Nov 13 01:24:41 2015 @@ -67,13 +67,13 @@ public class LibraryDocumentConverter { log.debug("Write to "+filePathComplete); PrintWriter pw = new PrintWriter(new FileWriter(filePathComplete)); - pw.println(xmlString); - pw.flush(); - pw.close(); + pw.println(xmlString); + pw.flush(); + pw.close(); //return new Long(1); - return filePathComplete.getCanonicalPath(); + return filePathComplete.getCanonicalPath(); } catch (Exception err){ log.error("writeToLocalFolder",err); } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java Fri Nov 13 01:24:41 2015 @@ -21,6 +21,7 @@ package org.apache.openmeetings.core.doc import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -42,6 +43,7 @@ public class LibraryWmlLoader { @SuppressWarnings({ "rawtypes" }) public ArrayList loadWmlFile(String fileName){ + BufferedReader reader = null; try { String name = fileName; if (!name.endsWith(fileExt)) { @@ -53,18 +55,18 @@ public class LibraryWmlLoader { XStream xStream = new XStream(new XppDriver()); xStream.setMode(XStream.NO_REFERENCES); - BufferedReader reader = new BufferedReader(new FileReader(filepathComplete)); - String xmlString = ""; - while (reader.ready()) { - xmlString += reader.readLine(); - } - reader.close(); - //lMap = (LinkedHashMap) xStream.fromXML(xmlString); - ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString); + reader = new BufferedReader(new FileReader(filepathComplete)); + ArrayList lMapList = (ArrayList) xStream.fromXML(reader); return lMapList; } catch (Exception err){ log.error("loadWmlFile",err); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) {} + } } return null; @@ -88,10 +90,10 @@ public class LibraryWmlLoader { Element pointElement = (Element) i.next(); LinkedHashMap<Integer,Object> singlePoint = new LinkedHashMap<Integer,Object>(); singlePoint.put(0, pointElement.getName()); - singlePoint.put(1, Integer.valueOf(pointElement.attribute("val1").getText()).intValue()); - singlePoint.put(2, Integer.valueOf(pointElement.attribute("val2").getText()).intValue()); - singlePoint.put(3, Integer.valueOf(pointElement.attribute("val3").getText()).intValue()); - singlePoint.put(4, Integer.valueOf(pointElement.attribute("val4").getText()).intValue()); + singlePoint.put(1, Integer.valueOf(pointElement.attribute("val1").getText())); + singlePoint.put(2, Integer.valueOf(pointElement.attribute("val2").getText())); + singlePoint.put(3, Integer.valueOf(pointElement.attribute("val3").getText())); + singlePoint.put(4, Integer.valueOf(pointElement.attribute("val4").getText())); pointMap.put(k, singlePoint); log.debug("createListObjectPaintByNode"+singlePoint); k++; @@ -99,13 +101,13 @@ public class LibraryWmlLoader { subMap.put(1, pointMap); subMap.put(2, paintElement.element("fillstyle").getText()); - subMap.put(3, Integer.valueOf(paintElement.element("linewidth").getText()).intValue()); - subMap.put(4, Integer.valueOf(paintElement.element("strokestyle").getText()).intValue()); - subMap.put(5, Integer.valueOf(paintElement.element("counter").getText()).intValue()); - subMap.put(6, Float.valueOf(paintElement.element("x").getText()).floatValue()); - subMap.put(7, Float.valueOf(paintElement.element("y").getText()).floatValue()); - subMap.put(8, Float.valueOf(paintElement.element("width").getText()).floatValue()); - subMap.put(9, Float.valueOf(paintElement.element("height").getText()).floatValue()); + subMap.put(3, Integer.valueOf(paintElement.element("linewidth").getText())); + subMap.put(4, Integer.valueOf(paintElement.element("strokestyle").getText())); + subMap.put(5, Integer.valueOf(paintElement.element("counter").getText())); + subMap.put(6, Float.valueOf(paintElement.element("x").getText())); + subMap.put(7, Float.valueOf(paintElement.element("y").getText())); + subMap.put(8, Float.valueOf(paintElement.element("width").getText())); + subMap.put(9, Float.valueOf(paintElement.element("height").getText())); subMap.put(10, paintElement.element("layername").getText()); } catch (Exception err) { @@ -122,14 +124,14 @@ public class LibraryWmlLoader { try { subMap.put(1, paintElement.element("textforfield").getText()); - subMap.put(2, Integer.valueOf(paintElement.element("fgcolor").getText()).intValue()); - subMap.put(3, Integer.valueOf(paintElement.element("fontsize").getText()).intValue()); + subMap.put(2, Integer.valueOf(paintElement.element("fgcolor").getText())); + subMap.put(3, Integer.valueOf(paintElement.element("fontsize").getText())); subMap.put(4, paintElement.element("fontstyle").getText()); - subMap.put(5, Integer.valueOf(paintElement.element("counter").getText()).intValue()); - subMap.put(6, Float.valueOf(paintElement.element("x").getText()).floatValue()); - subMap.put(7, Float.valueOf(paintElement.element("y").getText()).floatValue()); - subMap.put(8, Float.valueOf(paintElement.element("width").getText()).floatValue()); - subMap.put(9, Float.valueOf(paintElement.element("height").getText()).floatValue()); + subMap.put(5, Integer.valueOf(paintElement.element("counter").getText())); + subMap.put(6, Float.valueOf(paintElement.element("x").getText())); + subMap.put(7, Float.valueOf(paintElement.element("y").getText())); + subMap.put(8, Float.valueOf(paintElement.element("width").getText())); + subMap.put(9, Float.valueOf(paintElement.element("height").getText())); subMap.put(10, paintElement.element("layername").getText()); } catch (Exception err) { @@ -152,11 +154,11 @@ public class LibraryWmlLoader { subMap.put(5, paintElement.element("parentpath").getText()); subMap.put(6, paintElement.element("room").getText()); subMap.put(7, paintElement.element("domain").getText()); - subMap.put(8, Integer.valueOf(paintElement.element("counter").getText()).intValue()); - subMap.put(9, Float.valueOf(paintElement.element("x").getText()).floatValue()); - subMap.put(10, Float.valueOf(paintElement.element("y").getText()).floatValue()); - subMap.put(11, Float.valueOf(paintElement.element("width").getText()).floatValue()); - subMap.put(12, Float.valueOf(paintElement.element("height").getText()).floatValue()); + subMap.put(8, Integer.valueOf(paintElement.element("counter").getText())); + subMap.put(9, Float.valueOf(paintElement.element("x").getText())); + subMap.put(10, Float.valueOf(paintElement.element("y").getText())); + subMap.put(11, Float.valueOf(paintElement.element("width").getText())); + subMap.put(12, Float.valueOf(paintElement.element("height").getText())); subMap.put(13, paintElement.element("layername").getText()); } catch (Exception err) { @@ -174,16 +176,16 @@ public class LibraryWmlLoader { subMap.put(1, paintElement.element("fillstyle").getText()); subMap.put(2, paintElement.element("linewidth").getText()); - subMap.put(3, Integer.valueOf(paintElement.element("strokestyle").getText()).intValue()); - subMap.put(4, Float.valueOf(paintElement.element("startx").getText()).floatValue()); - subMap.put(5, Float.valueOf(paintElement.element("starty").getText()).floatValue()); - subMap.put(6, Float.valueOf(paintElement.element("endx").getText()).floatValue()); - subMap.put(7, Float.valueOf(paintElement.element("endy").getText()).floatValue()); - subMap.put(8, Integer.valueOf(paintElement.element("counter").getText()).intValue()); - subMap.put(9, Float.valueOf(paintElement.element("x").getText()).floatValue()); - subMap.put(10, Float.valueOf(paintElement.element("y").getText()).floatValue()); - subMap.put(11, Float.valueOf(paintElement.element("width").getText()).floatValue()); - subMap.put(12, Float.valueOf(paintElement.element("height").getText()).floatValue()); + subMap.put(3, Integer.valueOf(paintElement.element("strokestyle").getText())); + subMap.put(4, Float.valueOf(paintElement.element("startx").getText())); + subMap.put(5, Float.valueOf(paintElement.element("starty").getText())); + subMap.put(6, Float.valueOf(paintElement.element("endx").getText())); + subMap.put(7, Float.valueOf(paintElement.element("endy").getText())); + subMap.put(8, Integer.valueOf(paintElement.element("counter").getText())); + subMap.put(9, Float.valueOf(paintElement.element("x").getText())); + subMap.put(10, Float.valueOf(paintElement.element("y").getText())); + subMap.put(11, Float.valueOf(paintElement.element("width").getText())); + subMap.put(12, Float.valueOf(paintElement.element("height").getText())); subMap.put(13, paintElement.element("layername").getText()); } catch (Exception err) { @@ -199,13 +201,13 @@ public class LibraryWmlLoader { public void createListObjectRectAndEllipseByNode(Element paintElement, LinkedHashMap<Integer,Object> subMap){ try { - subMap.put(1, Integer.valueOf(paintElement.element("stroke").getText()).intValue()); + subMap.put(1, Integer.valueOf(paintElement.element("stroke").getText())); subMap.put(2, paintElement.element("line").getText()); - subMap.put(3, Integer.valueOf(paintElement.element("counter").getText()).intValue()); - subMap.put(4, Float.valueOf(paintElement.element("x").getText()).floatValue()); - subMap.put(5, Float.valueOf(paintElement.element("y").getText()).floatValue()); - subMap.put(6, Float.valueOf(paintElement.element("width").getText()).floatValue()); - subMap.put(7, Float.valueOf(paintElement.element("height").getText()).floatValue()); + subMap.put(3, Integer.valueOf(paintElement.element("counter").getText())); + subMap.put(4, Float.valueOf(paintElement.element("x").getText())); + subMap.put(5, Float.valueOf(paintElement.element("y").getText())); + subMap.put(6, Float.valueOf(paintElement.element("width").getText())); + subMap.put(7, Float.valueOf(paintElement.element("height").getText())); subMap.put(8, paintElement.element("layername").getText()); } catch (Exception err) { @@ -228,20 +230,20 @@ public class LibraryWmlLoader { subMap.put(5, paintElement.element("parentpath").getText()); subMap.put(6, paintElement.element("room").getText()); subMap.put(7, paintElement.element("domain").getText()); - subMap.put(8, Integer.valueOf(paintElement.element("slideNumber").getText()).intValue()); - subMap.put(9, Float.valueOf(paintElement.element("innerx").getText()).floatValue()); - subMap.put(10, Float.valueOf(paintElement.element("innery").getText()).floatValue()); - subMap.put(11, Float.valueOf(paintElement.element("innerwidth").getText()).floatValue()); - subMap.put(12, Float.valueOf(paintElement.element("innerheight").getText()).floatValue()); - subMap.put(13, Integer.valueOf(paintElement.element("zoomlevel").getText()).intValue()); - subMap.put(14, Float.valueOf(paintElement.element("initwidth").getText()).floatValue()); - subMap.put(15, Float.valueOf(paintElement.element("initheight").getText()).floatValue()); - subMap.put(16, Integer.valueOf(paintElement.element("currentzoom").getText()).intValue()); - subMap.put(17, Integer.valueOf(paintElement.element("counter").getText()).intValue()); - subMap.put(18, Float.valueOf(paintElement.element("x").getText()).floatValue()); - subMap.put(19, Float.valueOf(paintElement.element("y").getText()).floatValue()); - subMap.put(20, Float.valueOf(paintElement.element("width").getText()).floatValue()); - subMap.put(21, Float.valueOf(paintElement.element("height").getText()).floatValue()); + subMap.put(8, Integer.valueOf(paintElement.element("slideNumber").getText())); + subMap.put(9, Float.valueOf(paintElement.element("innerx").getText())); + subMap.put(10, Float.valueOf(paintElement.element("innery").getText())); + subMap.put(11, Float.valueOf(paintElement.element("innerwidth").getText())); + subMap.put(12, Float.valueOf(paintElement.element("innerheight").getText())); + subMap.put(13, Integer.valueOf(paintElement.element("zoomlevel").getText())); + subMap.put(14, Float.valueOf(paintElement.element("initwidth").getText())); + subMap.put(15, Float.valueOf(paintElement.element("initheight").getText())); + subMap.put(16, Integer.valueOf(paintElement.element("currentzoom").getText())); + subMap.put(17, Integer.valueOf(paintElement.element("counter").getText())); + subMap.put(18, Float.valueOf(paintElement.element("x").getText())); + subMap.put(19, Float.valueOf(paintElement.element("y").getText())); + subMap.put(20, Float.valueOf(paintElement.element("width").getText())); + subMap.put(21, Float.valueOf(paintElement.element("height").getText())); subMap.put(22, paintElement.element("layername").getText()); } catch (Exception err) { Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java Fri Nov 13 01:24:41 2015 @@ -98,7 +98,7 @@ public class LoadLibraryPresentation { libraryPresentationFile.setName(fileElement.getName()); libraryPresentationFile.setFilename(fileElement.getText()); libraryPresentationFile.setLastmod(fileElement.attribute("lastmod").getText()); - libraryPresentationFile.setSize(Long.valueOf(fileElement.attribute("size").getText()).longValue()); + libraryPresentationFile.setSize(Long.valueOf(fileElement.attribute("size").getText())); return libraryPresentationFile; @@ -132,7 +132,7 @@ public class LoadLibraryPresentation { singleThumb.setName(thumbElement.getName()); singleThumb.setFilename(thumbElement.getText()); singleThumb.setLastmod(thumbElement.attribute("lastmod").getText()); - singleThumb.setSize(Long.valueOf(thumbElement.attribute("size").getText()).longValue()); + singleThumb.setSize(Long.valueOf(thumbElement.attribute("size").getText())); thumbMap.getThumbs()[k] = singleThumb; k++; } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Fri Nov 13 01:24:41 2015 @@ -48,12 +48,12 @@ import org.apache.directory.ldap.client. import org.apache.directory.ldap.client.api.LdapNetworkConnection; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.server.LdapConfigDao; -import org.apache.openmeetings.db.dao.user.OrganisationDao; +import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.StateDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.server.LdapConfig; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.entity.user.User.Type; @@ -140,7 +140,6 @@ public class LdapLoginManagement { , ATTRIBUTE , QUERY } - @Autowired private ConfigurationDao cfgDao; @Autowired @@ -150,7 +149,7 @@ public class LdapLoginManagement { @Autowired private UserDao userDao; @Autowired - private OrganisationDao orgDao; + private GroupDao groupDao; @Autowired private TimezoneUtil timezoneUtil; @@ -349,7 +348,7 @@ public class LdapLoginManagement { u.setType(Type.ldap); u.getRights().remove(Right.Login); u.setDomainId(domainId); - u.getOrganisation_users().add(new Organisation_Users(orgDao.get(cfgDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, "-1")))); + u.getGroupUsers().add(new GroupUser(groupDao.get(cfgDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, "-1")))); u.setLogin(login); u.setShowContactDataToContacts(true); } @@ -378,7 +377,6 @@ public class LdapLoginManagement { u.setPictureuri(picture); u = userDao.update(u, null); - List<Dn> groups = new ArrayList<>(); if (GroupMode.ATTRIBUTE == groupMode) { Attribute a = entry.get(config.getProperty(CONFIGKEY_LDAP_KEY_GROUP, LDAP_KEY_GROUP)); @@ -411,22 +409,22 @@ public class LdapLoginManagement { Rdn namer = g.getRdn(); String name = namer.getValue().toString(); if (!Strings.isEmpty(name)) { - Organisation o = orgDao.get(name); + Group o = groupDao.get(name); boolean found = false; if (o == null) { - o = new Organisation(); + o = new Group(); o.setName(name); - o = orgDao.update(o, u.getId()); + o = groupDao.update(o, u.getId()); } else { - for (Organisation_Users ou : u.getOrganisation_users()) { - if (ou.getOrganisation().getName().equals(name)) { + for (GroupUser ou : u.getGroupUsers()) { + if (ou.getGroup().getName().equals(name)) { found = true; break; } } } if (!found) { - u.getOrganisation_users().add(new Organisation_Users(o)); + u.getGroupUsers().add(new GroupUser(o)); userDao.update(u, u.getId()); log.debug("Going to add user to group:: " + name); } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Fri Nov 13 01:24:41 2015 @@ -229,7 +229,6 @@ public class MailHandler { m.setErrorCount(m.getErrorCount() + 1); StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); - e.printStackTrace(pw); pw.close(); m.setLastError(sw.getBuffer().toString()); m.setStatus(m.getErrorCount() < MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR); Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java Fri Nov 13 01:24:41 2015 @@ -66,9 +66,9 @@ public class SMSHandler { return gateway.queryBalance() >= 1; } - public boolean sendSMS(String phone, String subj, long language_id) { + public boolean sendSMS(String phone, String subj, long languageId) { try { - taskExecutor.execute(new SMSSenderTask(phone, subj, language_id)); + taskExecutor.execute(new SMSSenderTask(phone, subj, languageId)); return true; } catch (Exception ex) { log.error("sendSMS", ex); @@ -79,12 +79,12 @@ public class SMSHandler { protected class SMSSenderTask implements Runnable { private final String phone; private final String subject; - private long language_id; + private long languageId; - public SMSSenderTask(String phone, String subject, long language_id) { + public SMSSenderTask(String phone, String subject, long languageId) { this.phone = phone; this.subject = subject; - this.language_id = language_id; + this.languageId = languageId; } public void run() { @@ -100,7 +100,7 @@ public class SMSHandler { log.debug("SMS sending to: " + phone + ", subject is: " + subject); if (checkBalance()) { OutboundMessage msg = new OutboundMessage(phone, subject); - if (language_id != 1) { + if (languageId != 1) { msg.setEncoding(MessageEncodings.ENCUCS2); } return Service.getInstance().sendMessage(msg); Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Fri Nov 13 01:24:41 2015 @@ -26,6 +26,10 @@ import java.util.Map; import org.apache.commons.transaction.util.FileHelper; import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager; +import org.apache.openmeetings.core.documents.LibraryChartLoader; +import org.apache.openmeetings.core.documents.LibraryDocumentConverter; +import org.apache.openmeetings.core.documents.LibraryWmlLoader; +import org.apache.openmeetings.core.documents.LoadLibraryPresentation; import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; import org.apache.openmeetings.db.dao.server.ISessionManager; import org.apache.openmeetings.db.dao.server.SessiondataDao; @@ -33,10 +37,6 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.dto.file.LibraryPresentation; import org.apache.openmeetings.db.entity.file.FileExplorerItem; import org.apache.openmeetings.db.entity.room.Client; -import org.apache.openmeetings.core.documents.LibraryChartLoader; -import org.apache.openmeetings.core.documents.LibraryDocumentConverter; -import org.apache.openmeetings.core.documents.LibraryWmlLoader; -import org.apache.openmeetings.core.documents.LoadLibraryPresentation; import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.OpenmeetingsVariables; @@ -181,8 +181,7 @@ public class ConferenceLibrary implement return; } - FileExplorerItem fileExplorerItem = fileExplorerItemDao - .get(fileExplorerItemId); + FileExplorerItem fileExplorerItem = fileExplorerItemDao.get(fileExplorerItemId); ArrayList roomItems = libraryWmlLoader.loadWmlFile(fileExplorerItem.getWmlFilePath()); @@ -217,7 +216,7 @@ public class ConferenceLibrary implement Client rcl = this.sessionManager .getClientByStreamId(conn.getClient() .getId(), null); - if ((rcl == null) || (rcl.isScreenClient())) { + if ((rcl == null) || rcl.isScreenClient()) { continue; } else { ((IServiceCapableConnection) conn).invoke( Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Fri Nov 13 01:24:41 2015 @@ -36,7 +36,6 @@ import org.apache.openmeetings.db.dto.ba import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; -import org.apache.openmeetings.db.entity.room.Room.Type; import org.apache.openmeetings.db.entity.room.RoomModerator; import org.apache.openmeetings.db.entity.room.RoomGroup; import org.apache.openmeetings.db.util.AuthLevelUtil; @@ -63,46 +62,46 @@ public class ConferenceService { @Autowired private RoomDao roomDao; @Autowired - private RoomModeratorDao roomModeratorsDao; + private RoomModeratorDao roomModeratorDao; @Autowired private ISessionManager sessionManager = null; - public List<RoomGroup> getRoomsByOrganisationWithoutType(String SID, long organisation_id) { + public List<RoomGroup> getRoomsByGroupWithoutType(String SID, long groupId) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - log.debug("getRoomsByOrganisationAndType"); - List<RoomGroup> roomOrgsList = roomManager.getRoomsOrganisationByOrganisationId(organisation_id); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + log.debug("getRoomsByGroupWithoutType"); + List<RoomGroup> roomGroupsList = roomManager.getRoomGroupByGroupId(groupId); - for (RoomGroup roomOrg : roomOrgsList) { - roomOrg.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomOrg.getRoom().getId())); + for (RoomGroup roomGroup : roomGroupsList) { + roomGroup.getRoom().setCurrentusers(sessionManager.getClientListByRoom(roomGroup.getRoom().getId())); } - return roomOrgsList; + return roomGroupsList; } } catch (Exception err) { - log.error("[getRoomsByOrganisationAndType]", err); + log.error("[getRoomsByGroupWithoutType]", err); } return null; } /** - * gets all rooms of an organization TODO:check if the requesting user is - * also member of that organization + * gets all rooms of an group TODO:check if the requesting user is + * also member of that group * * @param SID - * @param organisation_id - * @return - all rooms of an organization + * @param groupId + * @return - all rooms of an group */ - public SearchResult<RoomGroup> getRoomsByOrganisation(String SID, - long organisation_id, int start, int max, String orderby, + public SearchResult<RoomGroup> getRoomsByGroup(String SID, + long groupId, int start, int max, String orderby, boolean asc) { - log.debug("getRoomsByOrganisation"); + log.debug("getRoomsByGroup"); Long user_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasModLevel(userDao.get(user_id), organisation_id)) { - return roomManager.getRoomsOrganisationsByOrganisationId(organisation_id, start, max, orderby, asc); + if (AuthLevelUtil.hasModLevel(userDao.get(user_id), groupId)) { + return roomManager.getRoomGroupByGroupId(groupId, start, max, orderby, asc); } return null; } @@ -111,17 +110,17 @@ public class ConferenceService { * get a List of all public availible rooms (non-appointments) * * @param SID - * @param roomtypes_id + * @param typeId * @return - public rooms with given type, null in case of the error */ - public List<Room> getRoomsPublic(String SID, String roomtype) { + public List<Room> getRoomsPublic(String SID, Long typeId) { try { log.debug("getRoomsPublic"); - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - List<Room> roomList = roomDao.getPublicRooms(Type.valueOf(roomtype)); + List<Room> roomList = roomDao.getPublicRooms(Room.Type.get(typeId)); // Filter : no appointed meetings List<Room> filtered = new ArrayList<Room>(); @@ -130,8 +129,7 @@ public class ConferenceService { Room rooms = iter.next(); if (!rooms.isAppointment()) { - rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms - .getId())); + rooms.setCurrentusers(getRoomClientsListByRoomId(rooms.getId())); filtered.add(rooms); } } @@ -139,7 +137,7 @@ public class ConferenceService { return filtered; } } catch (Exception err) { - log.error("[getRoomsByOrganisationAndType]", err); + log.error("[getRoomsPublic]", err); } return null; } @@ -147,8 +145,8 @@ public class ConferenceService { public List<Room> getRoomsPublicWithoutType(String SID) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { List<Room> roomList = roomDao.getPublicRooms(); @@ -210,21 +208,20 @@ public class ConferenceService { public List<Room> getAppointedMeetingRoomsWithoutType(String SID) { log.debug("ConferenceService.getAppointedMeetings"); try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<Appointment> appointments = appointmentDao.getForToday(users_id); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + List<Appointment> appointments = appointmentDao.getForToday(userId); List<Room> result = new ArrayList<Room>(); if (appointments != null) { for (int i = 0; i < appointments.size(); i++) { Appointment ment = appointments.get(i); - Long rooms_id = ment.getRoom().getId(); - Room rooom = roomDao.get(rooms_id); + Long roomId = ment.getRoom().getId(); + Room rooom = roomDao.get(roomId); - rooom.setCurrentusers(this - .getRoomClientsListByRoomId(rooom.getId())); + rooom.setCurrentusers(getRoomClientsListByRoomId(rooom.getId())); result.add(rooom); } } @@ -238,48 +235,17 @@ public class ConferenceService { return null; } - /** - * - * @param SID - * @param rooms_id - * @return - room with the id given - */ - public Room getRoomById(String SID, long rooms_id) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return roomDao.get(rooms_id); - } - return null; - } - - public Room getRoomWithCurrentUsersById(String SID, long rooms_id) { + public Room getRoomWithCurrentUsersById(String SID, long roomId) { Room room = null; - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - room = roomDao.get(rooms_id); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + room = roomDao.get(roomId); room.setCurrentusers(sessionManager.getClientListByRoom(room.getId())); } return room; } /** - * - * @param SID - * @param externalUserId - * @param externalUserType - * @param roomtypes_id - * @return - room with the given external id - */ - public Room getRoomByExternalId(String SID, Long externalUserId, String externalUserType, long roomtypes_id) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - //TODO FIXME roomtype - return roomDao.getExternal(Room.Type.get(roomtypes_id), externalUserType, externalUserId); - } - return null; - } - - /** * gets a list of all available rooms * * @param SID @@ -293,8 +259,8 @@ public class ConferenceService { String orderby, boolean asc, String search) { log.debug("getRooms"); - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { return roomManager.getRooms(start, max, orderby, asc, search); } return null; @@ -304,8 +270,8 @@ public class ConferenceService { int max, String orderby, boolean asc) { log.debug("getRooms"); - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { return roomManager.getRoomsWithCurrentUsers(start, max, orderby, asc); } return null; @@ -315,17 +281,16 @@ public class ConferenceService { Long roomId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - return roomModeratorsDao.getByRoomId(roomId); + return roomModeratorDao.getByRoomId(roomId); } } catch (Exception err) { log.error("[getRoomModeratorsByRoomId]", err); - err.printStackTrace(); } return null; @@ -334,15 +299,15 @@ public class ConferenceService { /** * return all participants of a room * - * @param room_id + * @param roomId * @return - true if room is full, false otherwise */ - public boolean isRoomFull(Long room_id) { + public boolean isRoomFull(Long roomId) { try { - Room room = roomDao.get(room_id); + Room room = roomDao.get(roomId); if (room.getNumberOfPartizipants() <= this.sessionManager - .getClientListByRoom(room_id).size()) { + .getClientListByRoom(roomId).size()) { return true; } @@ -356,38 +321,37 @@ public class ConferenceService { /** * return all participants of a room * - * @param room_id + * @param roomId * @return - all participants of a room */ - public List<Client> getRoomClientsListByRoomId(Long room_id) { - return sessionManager.getClientListByRoom(room_id); + public List<Client> getRoomClientsListByRoomId(Long roomId) { + return sessionManager.getClientListByRoom(roomId); } public List<Room> getRoomsWithCurrentUsersByList(String SID, int start, int max, String orderby, boolean asc) { log.debug("getRoomsWithCurrentUsersByList"); - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { return roomManager.getRoomsWithCurrentUsersByList(start, max, orderby, asc); } return null; } - public List<Room> getRoomsWithCurrentUsersByListAndType(String SID, int start, int max, String orderby, boolean asc, String externalRoomType) { + public List<Room> getRoomsWithCurrentUsersByListAndType(String SID, int start, int max, String orderby, boolean asc, String externalType) { log.debug("getRoomsWithCurrentUsersByListAndType"); - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { - return roomManager.getRoomsWithCurrentUsersByListAndType(start, max, orderby, asc, externalRoomType); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { + return roomManager.getRoomsWithCurrentUsersByListAndType(start, max, orderby, asc, externalType); } return null; } - public Room getRoomByOwnerAndType(String SID, Long roomTypeId, String roomName) { + public Room getRoomByOwnerAndType(String SID, Long typeId, String roomName) { Long userId = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - //TODO FIXME roomtype - return roomDao.getUserRoom(userId, Room.Type.get(roomTypeId), roomName); + return roomDao.getUserRoom(userId, Room.Type.get(typeId), roomName); } return null; } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Fri Nov 13 01:24:41 2015 @@ -74,7 +74,7 @@ public class InvitationService implement * @param message * @param email * @param subject - * @param room_id + * @param roomId * @param conferencedomain * @param isPasswordProtected * @param invitationpass @@ -83,35 +83,35 @@ public class InvitationService implement * @param validFromTime * @param validToDate * @param validToTime - * @param language_id + * @param languageId * @param iCalTz * @return - invitation object in case of success, "Sys - Error" string or null in case of error */ public Object sendInvitationHash(String SID, String firstname, String lastname, String message, String email, String subject, - Long room_id, String conferencedomain, Boolean isPasswordProtected, + Long roomId, String conferencedomain, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, String validFromTime, String validToDate, String validToTime, - Long language_id, String iCalTz, boolean sendMail) { + Long languageId, String iCalTz, boolean sendMail) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { log.debug("sendInvitationHash: "); Date from = getDate(validFromDate, validFromTime, iCalTz); Date to = getDate(validToDate, validToTime, iCalTz); User owner = null; - if (users_id < 0) { - owner = userDao.get(-users_id); + if (userId < 0) { + owner = userDao.get(-userId); } - users_id = owner == null ? users_id : owner.getOwnerId(); - User invitee = userDao.getContact(email, firstname, lastname, users_id); - Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id), + userId = owner == null ? userId : owner.getOwnerId(); + User invitee = userDao.getContact(email, firstname, lastname, userId); + Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(roomId), isPasswordProtected, invitationpass, Valid.fromInt(valid) - , userDao.get(users_id), language_id, + , userDao.get(userId), languageId, from, to, null); if (invitation != null) { @@ -135,12 +135,12 @@ public class InvitationService implement } public String sendInvitationByHash(String SID, String invitationHash, String message, String subject - , Long language_id) throws Exception { - Long users_id = sessiondataDao.checkSession(SID); + , Long languageId) throws Exception { + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { Invitation inv = (Invitation)invitationManager.getInvitationByHashCode(invitationHash, false); - inv.getInvitee().setLanguageId(language_id); + inv.getInvitee().setLanguageId(languageId); invitationManager.sendInvitionLink(inv, MessageType.Create, subject, message, false); } else { return "Need User Privileges to perfom the Action"; Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Fri Nov 13 01:24:41 2015 @@ -48,7 +48,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.server.SOAPLogin; import org.apache.openmeetings.db.entity.server.Sessiondata; import org.apache.openmeetings.db.entity.user.Address; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.entity.user.Userdata; @@ -144,12 +144,12 @@ public class MainService implements IPen return sessiondataDao.startsession(); } - public Long setCurrentUserOrganization(String SID, Long organization_id) { + public Long setCurrentUserGroup(String SID, Long groupId) { try { - sessiondataDao.updateUserOrg(SID, organization_id); + sessiondataDao.updateUserGroup(SID, groupId); return 1L; } catch (Exception err) { - log.error("[setCurrentUserOrganization]", err); + log.error("[setCurrentUserGroup]", err); } return -1L; } @@ -192,8 +192,8 @@ public class MainService implements IPen log.debug("[loginWicket] public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed); if (!allowed) { for (RoomGroup ro : r.getRoomGroups()) { - for (Organisation_Users ou : u.getOrganisation_users()) { - if (ro.getOrganisation().getId().equals(ou.getOrganisation().getId())) { + for (GroupUser ou : u.getGroupUsers()) { + if (ro.getGroup().getId().equals(ou.getGroup().getId())) { allowed = true; break; } @@ -210,7 +210,7 @@ public class MainService implements IPen String streamId = current.getClient().getId(); Client currentClient = sessionManager.getClientByStreamId(streamId, null); - if (!u.getOrganisation_users().isEmpty()) { + if (!u.getGroupUsers().isEmpty()) { u.setSessionData(sessiondataDao.getSessionByHash(wicketSID)); currentClient.setUserId(u.getId()); currentClient.setRoomId(wicketroomid); @@ -242,7 +242,7 @@ public class MainService implements IPen SOAPLogin soapLogin = soapLoginDao.get(secureHash); - if (soapLogin.getUsed()) { + if (soapLogin.isUsed()) { if (soapLogin.getAllowSameURLMultipleTimes()) { @@ -294,7 +294,7 @@ public class MainService implements IPen SOAPLogin returnSoapLogin = new SOAPLogin(); returnSoapLogin.setRoomId(soapLogin.getRoomId()); - returnSoapLogin.setBecomemoderator(soapLogin.getBecomemoderator()); + returnSoapLogin.setBecomemoderator(soapLogin.isBecomemoderator()); returnSoapLogin.setShowAudioVideoTest(soapLogin.getShowAudioVideoTest()); returnSoapLogin.setRecordingId(soapLogin.getRecordingId()); returnSoapLogin.setShowNickNameDialog(soapLogin.getShowNickNameDialog()); @@ -427,8 +427,8 @@ public class MainService implements IPen } /** - * this function returns a user object with organization objects set only - * the organization is not available for users that are using a HASH mechanism + * this function returns a user object with group objects set only + * the group is not available for users that are using a HASH mechanism * cause the SOAP/REST API does not guarantee that the user connected to the HASH * has a valid user object set * @@ -443,7 +443,7 @@ public class MainService implements IPen User defaultRpcUser = userDao.get(defaultRpcUserid); User user = new User(); - user.setOrganisation_users(defaultRpcUser.getOrganisation_users()); + user.setGroupUsers(defaultRpcUser.getGroupUsers()); return user; Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Fri Nov 13 01:24:41 2015 @@ -45,10 +45,9 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; -import org.apache.openmeetings.db.entity.room.Room.Type; import org.apache.openmeetings.db.entity.server.Sessiondata; -import org.apache.openmeetings.db.entity.user.Organisation; -import org.apache.openmeetings.db.entity.user.Organisation_Users; +import org.apache.openmeetings.db.entity.user.Group; +import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.State; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.CalendarPatterns; @@ -236,7 +235,7 @@ public class MobileService { for (IConnection conn : current.getScope().getClientConnections()) { if (conn != null && conn instanceof IServiceCapableConnection) { Client c = sessionManager.getClientByStreamId(conn.getClient().getId(), null); - if ((c.isMobile() || c.isAvClient()) && !Strings.isEmpty(c.getAvsettings()) && !Boolean.TRUE.equals(c.isScreenClient())) { + if ((c.isMobile() || c.isAvClient()) && !Strings.isEmpty(c.getAvsettings()) && !c.isScreenClient()) { Map<String, Object> map = new Hashtable<String, Object>(); add(map, "streamId", c.getStreamid()); add(map, "broadCastId", c.getBroadCastID()); @@ -262,14 +261,14 @@ public class MobileService { room.put("id", r.getId()); room.put("name", r.getName()); room.put("type", type); - room.put("roomType", r.getType()); + room.put("roomTypeId", r.getType().getId()); if (org != null) { room.put("org", org); } room.put("first", first); room.put("users", sessionManager.getClientListByRoom(r.getId()).size()); room.put("total", r.getNumberOfPartizipants()); - room.put("audioOnly", Boolean.TRUE.equals(r.isAudioOnly())); + room.put("audioOnly", r.isAudioOnly()); result.add(room); } @@ -281,16 +280,16 @@ public class MobileService { User u = userDao.get(c.getUserId()); //my rooms List<Room> myl = new ArrayList<Room>(); - myl.add(roomDao.getUserRoom(u.getId(), Type.conference, labelDao.getString(1306L, u.getLanguageId()))); - myl.add(roomDao.getUserRoom(u.getId(), Type.conference, labelDao.getString(1306L, u.getLanguageId()))); + myl.add(roomDao.getUserRoom(u.getId(), Room.Type.conference, labelDao.getString(1306L, u.getLanguageId()))); + myl.add(roomDao.getUserRoom(u.getId(), Room.Type.restricted, labelDao.getString(1307L, u.getLanguageId()))); myl.addAll(roomDao.getAppointedRoomsByUser(u.getId())); for (Room r : myl) { addRoom("my", null, false, result, r); } //private rooms - for (Organisation_Users ou : u.getOrganisation_users()) { - Organisation org = ou.getOrganisation(); + for (GroupUser ou : u.getGroupUsers()) { + Group org = ou.getGroup(); boolean first = true; for (Room r : roomDao.getGroupRooms(org.getId())) { addRoom("private", org.getName(), first, result, r); Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java Fri Nov 13 01:24:41 2015 @@ -111,7 +111,7 @@ public class RecordingService implements recording.setInsertedBy(ownerId); recording.setType(Type.Recording); recording.setComment(comment); - recording.setIsInterview(isInterview); + recording.setInterview(isInterview); recording.setRoomId(room_id); recording.setRecordStart(now); @@ -360,7 +360,7 @@ public class RecordingService implements log.debug("recordingConverterTask ", recordingConverterTask); Recording recording = recordingDao.get(recordingId); - if (recording.getIsInterview() == null || !recording.getIsInterview()) { + if (!recording.isInterview()) { recordingConverterTask.startConversionThread(recordingId); } else { interviewConverterTask.startConversionThread(recordingId); @@ -452,7 +452,7 @@ public class RecordingService implements // Start FLV Recording recordShow(conn, rcl.getStreamPublishName(), streamName_Screen, metaDataId, true, - recording.getIsInterview()); + recording.isInterview()); // Add Meta Data rcl.setRecordingMetaDataId(metaDataId); @@ -481,7 +481,7 @@ public class RecordingService implements // Start FLV recording recordShow(conn, String.valueOf(rcl.getBroadCastID()).toString(), streamName, metaDataId, false, - recording.getIsInterview()); + recording.isInterview()); rcl.setRecordingMetaDataId(metaDataId); Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Fri Nov 13 01:24:41 2015 @@ -19,11 +19,13 @@ package org.apache.openmeetings.core.remote; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; import java.util.Date; import java.util.HashMap; import java.util.List; +import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; import org.apache.openmeetings.db.dao.server.ISessionManager; import org.apache.openmeetings.db.dao.server.ServerDao; @@ -37,6 +39,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.UserContact; import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.db.util.TimezoneUtil; +import org.apache.wicket.Application; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.scope.IScope; import org.slf4j.Logger; @@ -60,7 +63,7 @@ public class UserService implements IUse @Autowired private UserDao userDao; @Autowired - private UserContactDao userContactsDao; + private UserContactDao userContactDao; @Autowired private TimezoneUtil timezoneUtil; @Autowired @@ -72,13 +75,13 @@ public class UserService implements IUse * get user by id, admin only * * @param SID - * @param user_id + * @param userId * @return User with the id given */ - public User getUserById(String SID, long user_id) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return userDao.get(user_id); + public User getUserById(String SID, long userId) { + Long authUserId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) { + return userDao.get(userId); } return null; } @@ -109,8 +112,8 @@ public class UserService implements IUse * @return whole user-list */ public List<User> getUserList(String SID, int start, int max, String orderby, boolean asc) { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { return userDao.get("", start, max, orderby + (asc ? " ASC" : " DESC")); } return null; @@ -129,9 +132,9 @@ public class UserService implements IUse */ public Boolean kickUserByStreamId(String SID, String streamid, long serverId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // admins only - if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) { if (serverId == 0) { Client rcl = sessionManager.getClientByStreamId(streamid, null); @@ -171,16 +174,16 @@ public class UserService implements IUse public User updateUserSelfTimeZone(String SID, String jname) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - User us = userDao.get(users_id); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + User us = userDao.get(userId); us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jname).getID()); us.setForceTimeZoneCheck(false); us.setUpdated(new Date()); - userDao.update(us, users_id); + userDao.update(us, userId); return us; } @@ -189,28 +192,13 @@ public class UserService implements IUse } return null; } -/* TODO FIXME should replaced by wicket component - @Deprecated - public Long requestUserToContactList(String SID, Long userToAdd_id, - String domain, String port, String webapp) { - try { - Long users_id = sessiondataDao.checkSession(SID); - // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return ContactsHelper.addUserToContactList(userToAdd_id); - } - } catch (Exception err) { - log.error("[requestuserToContactList]", err); - } - return null; - } -*/ + public List<UserContact> getPendingUserContacts(String SID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<UserContact> uList = userContactsDao.getContactRequestsByUserAndStatus(users_id, true); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + List<UserContact> uList = userContactDao.getContactRequestsByUserAndStatus(userId, true); return uList; } @@ -222,10 +210,10 @@ public class UserService implements IUse public List<UserContact> getUserContacts(String SID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<UserContact> uList = userContactsDao.getContactsByUserAndStatus(users_id, false); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + List<UserContact> uList = userContactDao.getContactsByUserAndStatus(userId, false); return uList; } @@ -237,16 +225,16 @@ public class UserService implements IUse public Integer removeContactUser(String SID, Long userContactId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - UserContact userContacts = userContactsDao.get(userContactId); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + UserContact userContacts = userContactDao.get(userContactId); if (userContacts == null) { return -49; } - return userContactsDao.deleteUserContact(userContactId); + return userContactDao.deleteUserContact(userContactId); } } catch (Exception err) { log.error("[removeContactUser]", err); @@ -254,102 +242,15 @@ public class UserService implements IUse return null; } - /* TODO FIXME should replaced by wicket component - - public Long composeMail(String SID, List<String> recipients, - String subject, String message, Boolean bookedRoom, - String validFromDate, String validFromTime, String validToDate, - String validToTime, Long parentMessageId, Long roomtype_id, - String domain, String port, String webapp) { - try { - Long users_id = sessiondataDao.checkSession(SID); - // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - User from = userDao.get(users_id); - - Appointment a = new Appointment(); - if (a.getMeetingMembers() == null) { - a.setMeetingMembers(new ArrayList<MeetingMember>()); - } - for (String email : recipients) { - MeetingMember mm = new MeetingMember(); - mm.setAppointment(a); - mm.setUser(userDao.getContact(email, users_id)); - a.getMeetingMembers().add(mm); - } - if (bookedRoom) { - TimeZone timezone = timezoneUtil.getTimeZone(from); - Date start = createCalendarDate(timezone, validFromDate, validFromTime); - Date end = createCalendarDate(timezone, validToDate, validToTime); - - log.info("validFromDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(start)); - log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(end)); - - a.setTitle(subject); - a.setDescription(message); - a.setStart(start); - a.setEnd(end); - a.setCategory(appointmentCategoryDao.get(1L)); - a.setOwner(from); - - a.setRoom(new Room()); - a.getRoom().setAppointment(true); - a.getRoom().setName(subject); - a.getRoom().setRoomtype(roomTypeDao.get(roomtype_id)); - a.getRoom().setNumberOfPartizipants(100L); - a.getRoom().setAllowUserQuestions(true); - a.getRoom().setAllowFontStyles(true); - - a = appointmentDao.update(a, users_id); - } - for (MeetingMember mm : a.getMeetingMembers()) { - User to = mm.getUser(); - Room room = a.getRoom(); - - // We do not send an email to the one that has created the - // private message - if (to != null && from.getId().equals(to.getId())) { - continue; - } - - //TODO should be reviewed - // One message to the Send - privateMessagesDao.addPrivateMessage(subject, - message, SENT_FOLDER_ID, from, to, from, - bookedRoom, room, false, 0L); - - // One message to the Inbox - privateMessagesDao.addPrivateMessage(subject, - message, INBOX_FOLDER_ID, from, to, to, - bookedRoom, room, false, 0L); - - if (to.getAddress() != null) { - AbstractTemplatePanel.ensureApplication(from.getLanguage_id()); - String aLinkHTML = "<br/><br/>" + "<a href='" + ContactsHelper.getLink() + "'>" - + labelDao.getString(1302, from.getLanguage_id()) + "</a><br/>"; - - mailHandler.send(to.getAddress().getEmail(), - labelDao.getString(1301, from.getLanguage_id()) + subject, - message.replaceAll("\\<.*?>", "") + aLinkHTML); - } - } - } - - } catch (Exception err) { - log.error("[composeMail]", err); - } - return null; - } -*/ - public Boolean checkUserIsInContactList(String SID, Long user_id) { + public Boolean checkUserIsInContactList(String SID, Long userId) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long authUserId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - List<UserContact> uList = userContactsDao.getContactsByUserAndStatus(users_id, false); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) { + List<UserContact> uList = userContactDao.getContactsByUserAndStatus(authUserId, false); for (UserContact userContact : uList) { - if (userContact.getContact().getId().equals(user_id)) { + if (userContact.getContact().getId().equals(userId)) { return true; } } @@ -362,17 +263,17 @@ public class UserService implements IUse return null; } - public void shareCalendarUserContact(String SID, Long userContactId, Boolean shareCalendar) { + public void shareCalendarUserContact(String SID, Long contactId, Boolean shareCalendar) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - UserContact userContacts = userContactsDao.get(userContactId); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + UserContact userContacts = userContactDao.get(contactId); userContacts.setShareCalendar(shareCalendar); - userContactsDao.update(userContacts); + userContactDao.update(userContacts); } } catch (Exception err) { log.error("[shareCalendarUserContact]", err); @@ -393,9 +294,9 @@ public class UserService implements IUse */ public Boolean kickUserByPublicSID(String SID, String publicSID) { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); // users only - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { Client rcl = sessionManager.getClientByPublicSID(publicSID, false, null); if (rcl == null) { @@ -424,20 +325,15 @@ public class UserService implements IUse @Override public Boolean kickUserBySessionId(String SID, long userId, String sessionId) { - /* TODO FIXME should replaced by wicket component try { Long users_id = sessiondataDao.checkSession(SID); // admin only if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { - WebClient client = Application.getClientByKeys(userId, sessionId); - if (client != null) { - Application.invalidateClient(client); - } + ((IApplication)Application.get(wicketApplicationName)).invalidateClient(userId, sessionId); } } catch (Exception err) { log.error("[kickUserBySessionId]", err); } - */ return null; } } Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Fri Nov 13 01:24:41 2015 @@ -351,7 +351,7 @@ public class WhiteBoardService implement .getWhiteBoardSyncListByRoomid(room_id); wSyncLockObject.setCurrentLoadingItem(true); - wSyncLockObject.setStarttime(new Date()); + wSyncLockObject.setInserted(new Date()); syncListRoom.put(currentClient.getPublicSID(), wSyncLockObject); this.whiteBoardObjectListManager.setWhiteBoardSyncListByRoomid( @@ -444,7 +444,7 @@ public class WhiteBoardService implement WhiteboardSyncLockObject wSyncLockObject = new WhiteboardSyncLockObject(); wSyncLockObject.setAddtime(new Date()); wSyncLockObject.setPublicSID(currentClient.getPublicSID()); - wSyncLockObject.setStarttime(new Date()); + wSyncLockObject.setInserted(new Date()); Map<String, WhiteboardSyncLockObject> syncListImage = this.whiteBoardObjectListManager .getWhiteBoardObjectSyncListByRoomAndObjectId(room_id,
