Repository: openmeetings Updated Branches: refs/heads/master aa8e0d58b -> 13cb2edcc
no jira: unused classes are removed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/13cb2edc Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/13cb2edc Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/13cb2edc Branch: refs/heads/master Commit: 13cb2edcc2429829bf5bc5629b9cecf9a959a8f7 Parents: aa8e0d5 Author: Maxim Solodovnik <[email protected]> Authored: Mon Sep 25 14:01:21 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Sep 25 14:01:21 2017 +0700 ---------------------------------------------------------------------- .../core/data/beans/rooms/RoomsList.java | 33 ----- .../documents/CreateLibraryPresentation.java | 93 -------------- .../core/documents/LibraryDocuments.java | 39 ------ .../core/documents/LibraryWmlLoader.java | 68 ---------- .../core/documents/LoadLibraryPresentation.java | 126 ------------------- .../LoadLibraryPresentationToObject.java | 123 ------------------ .../db/dto/file/LibraryPresenationThumbs.java | 40 ------ .../db/dto/file/LibraryPresentation.java | 60 --------- .../db/dto/file/LibraryPresentationFile.java | 54 -------- .../db/dto/file/LibraryPresentationThumb.java | 54 -------- .../db/dto/file/PresentationObject.java | 60 --------- .../openmeetings/db/dto/room/BrowserStatus.java | 39 ------ .../openmeetings/db/dto/room/Cliparts.java | 55 -------- .../openmeetings/db/dto/room/RoomReturn.java | 73 ----------- .../db/dto/room/RoomSearchResult.java | 78 ------------ .../openmeetings/db/dto/room/RoomStatus.java | 43 ------- .../openmeetings/db/dto/room/RoomUser.java | 68 ---------- .../test/library/TestFileParser.java | 47 ------- 18 files changed, 1153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java deleted file mode 100644 index 7e96418..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.core.data.beans.rooms; - -import org.apache.openmeetings.db.entity.room.Room; - -public class RoomsList { - - Room[] roomList = null; - - public Room[] getRoomList() { - return roomList; - } - public void setRoomList(Room[] roomList) { - this.roomList = roomList; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java deleted file mode 100644 index b2f985b..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.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; -import java.io.FilenameFilter; -import java.util.Arrays; - -import org.apache.openmeetings.util.OmFileHelper; -import org.apache.openmeetings.util.process.ConverterProcessResult; -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); - - private static void addFile(Element root, String name, File f) { - if (f != null) { - root.addElement(name) - .addAttribute("lastmod", "" + f.lastModified()) - .addAttribute("size", "" + f.length()) - .addText(f.getName()); - } - } - - public static ConverterProcessResult generateXMLDocument(File original, File pdf, File swf) { - ConverterProcessResult returnMap = new ConverterProcessResult(); - returnMap.setProcess("generateXMLDocument"); - try { - Document document = DocumentHelper.createDocument(); - Element root = document.addElement("presentation"); - - addFile(root, "originalDocument", original); - addFile(root, "pdfDocument", pdf); - addFile(root, "swfDocument", swf); - - Element thumbs = root.addElement("thumbs"); - - // Second get all Files of this Folder - FilenameFilter ff = new FilenameFilter() { - @Override - public boolean accept(File b, String name) { - File f = new File(b, name); - return f.isFile() && f.getName().startsWith(thumbImagePrefix); - } - }; - - File[] _thumbs = original.getParentFile().listFiles(ff); - Arrays.sort(_thumbs); - for (File thumb : _thumbs) { - addFile(thumbs, "thumb", thumb); - } - - // lets write to a file - XMLWriter writer = new XMLWriter(new FileOutputStream(new File(original.getParentFile(), OmFileHelper.libraryFileName))); - writer.write(document); - writer.close(); - - returnMap.setExitCode(0); - - return returnMap; - } catch (Exception err) { - log.error("Error while generateXMLDocument", err); - returnMap.setError(err.getMessage()); - returnMap.setExitCode(-1); - return returnMap; - } - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java deleted file mode 100644 index 2663e5c..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.core.documents; - -import org.apache.openmeetings.util.OpenmeetingsVariables; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class LibraryDocuments { - private static final Logger log = Red5LoggerFactory.getLogger(LibraryDocuments.class, OpenmeetingsVariables.webAppRootKey); - - private static LibraryDocuments instance; - - private LibraryDocuments() {} - - public static synchronized LibraryDocuments getInstance() { - if (instance == null) { - log.debug("instance created"); - instance = new LibraryDocuments(); - } - return instance; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java deleted file mode 100644 index da8a837..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.core.documents; - -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_WML; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; - -import org.apache.openmeetings.util.OmFileHelper; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.XppDriver; - -public class LibraryWmlLoader { - private static final Logger log = Red5LoggerFactory.getLogger(LibraryWmlLoader.class, webAppRootKey); - - public static List<?> loadWmlFile(String fileName){ - try { - String name = fileName; - if (!name.endsWith(EXTENSION_WML)) { - name = OmFileHelper.getName(fileName, EXTENSION_WML); - } - File file = new File(OmFileHelper.getUploadWmlDir(), name); - log.debug("filepathComplete: " + file); - - XStream xStream = new XStream(new XppDriver()); - xStream.setMode(XStream.NO_REFERENCES); - - try (InputStream is = new FileInputStream(file); - BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8))) - { - List<?> lMapList = (List<?>) xStream.fromXML(reader); - - return lMapList; - } - } catch (Exception err){ - log.error("loadWmlFile",err); - } - - return new ArrayList<>(); - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java deleted file mode 100644 index 0dd09b1..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.core.documents; - -import java.io.File; -import java.io.FileInputStream; -import java.util.Iterator; - -import org.apache.openmeetings.db.dto.file.LibraryPresenationThumbs; -import org.apache.openmeetings.db.dto.file.LibraryPresentation; -import org.apache.openmeetings.db.dto.file.LibraryPresentationFile; -import org.apache.openmeetings.db.dto.file.LibraryPresentationThumb; -import org.apache.openmeetings.util.OpenmeetingsVariables; -import org.dom4j.Document; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class LoadLibraryPresentation { - private static final Logger log = Red5LoggerFactory.getLogger(LoadLibraryPresentation.class, OpenmeetingsVariables.webAppRootKey); - - public static LibraryPresentation parseLibraryFileToObject(File file){ - try { - LibraryPresentation lPresentation = new LibraryPresentation(); - - SAXReader reader = new SAXReader(); - Document document = reader.read( new FileInputStream(file) ); - - Element root = document.getRootElement(); - - for (Iterator<Element> i = root.elementIterator(); i.hasNext(); ) { - Element item = i.next(); - - log.debug(item.getName()); - String nodeVal = item.getName(); - - if (nodeVal.equals("originalDocument")){ - lPresentation.setOriginalDocument(createListObjectLibraryByFileDocument(item)); - } else if (nodeVal.equals("pdfDocument")){ - lPresentation.setPdfDocument(createListObjectLibraryByFileDocument(item)); - } else if (nodeVal.equals("swfDocument")){ - lPresentation.setSwfDocument(createListObjectLibraryByFileDocument(item)); - } else if (nodeVal.equals("thumbs")) { - lPresentation.setThumbs(createListObjectLibraryByFileDocumentThumbs(item)); - } else { - throw new Exception("Unkown Library type: "+nodeVal); - } - } - - log.debug("Returning presentation file object"); - - return lPresentation; - } catch (Exception err) { - log.error("parseLibraryFileToObject",err); - return null; - } - } - - public static LibraryPresentationFile createListObjectLibraryByFileDocument(Element fileElement){ - try { - log.info("createListObjectLibraryByFileDocument"+fileElement); - - LibraryPresentationFile libraryPresentationFile = new LibraryPresentationFile(); - libraryPresentationFile.setName(fileElement.getName()); - libraryPresentationFile.setFilename(fileElement.getText()); - libraryPresentationFile.setLastmod(fileElement.attribute("lastmod").getText()); - libraryPresentationFile.setSize(Long.valueOf(fileElement.attribute("size").getText())); - - return libraryPresentationFile; - - } catch (Exception err) { - log.error("createListObjectLibraryByFileDocument",err); - } - return null; - } - - public static LibraryPresenationThumbs createListObjectLibraryByFileDocumentThumbs(Element fileElement){ - try { - - LibraryPresenationThumbs thumbMap = new LibraryPresenationThumbs(); - thumbMap.setName(fileElement.getName()); - - int k = 0; - for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); i.next()) { - k++; - } - - thumbMap.setThumbs(new LibraryPresentationThumb[k]); - - k = 0; - for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) { - Element thumbElement = i.next(); - //log.info("createListObjectLibraryByFileDocumentThumbs"+thumbElement); - LibraryPresentationThumb singleThumb = new LibraryPresentationThumb(); - singleThumb.setName(thumbElement.getName()); - singleThumb.setFilename(thumbElement.getText()); - singleThumb.setLastmod(thumbElement.attribute("lastmod").getText()); - singleThumb.setSize(Long.valueOf(thumbElement.attribute("size").getText())); - thumbMap.getThumbs()[k] = singleThumb; - k++; - } - - return thumbMap; - } catch (Exception err) { - log.error("createListObjectLibraryByFileDocumentThumbs",err); - } - return null; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java deleted file mode 100644 index 89ec1c5..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.core.documents; - -import java.util.Iterator; -import java.util.LinkedList; - -import org.apache.openmeetings.db.dto.file.FileItemDTO; -import org.apache.openmeetings.db.dto.file.PresentationObject; -import org.apache.openmeetings.util.OpenmeetingsVariables; -import org.dom4j.Document; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class LoadLibraryPresentationToObject { - private static final Logger log = Red5LoggerFactory.getLogger(LoadLibraryPresentationToObject.class, OpenmeetingsVariables.webAppRootKey); - - private static LoadLibraryPresentationToObject instance; - - private LoadLibraryPresentationToObject() {} - - public static synchronized LoadLibraryPresentationToObject getInstance() { - if (instance == null) { - instance = new LoadLibraryPresentationToObject(); - } - return instance; - } - - public PresentationObject parseLibraryFileToObject(String filePath){ - try { - PresentationObject lMap = new PresentationObject(); - - SAXReader reader = new SAXReader(); - Document document = reader.read(filePath); - - Element root = document.getRootElement(); - Integer k = 0; - - for (Iterator<Element> i = root.elementIterator(); i.hasNext(); ) { - Element item = i.next(); - log.error(item.getName()); - - String nodeVal = item.getName(); - - if (nodeVal.equals("originalDocument")){ - lMap.setOriginalDocument(this.createListObjectLibraryByFileDocument(item)); - } else if (nodeVal.equals("pdfDocument")){ - lMap.setPdfDocument(this.createListObjectLibraryByFileDocument(item)); - } else if (nodeVal.equals("swfDocument")) { - lMap.setSwfDocument(this.createListObjectLibraryByFileDocument(item)); - } else if (nodeVal.equals("thumbs")) { - lMap.setThumbs(this.createListObjectLibraryByFileDocumentThumbs(item)); - } - - k++; - - } - - return lMap; - } catch (Exception err) { - log.error("parseLibraryFileToObject",err); - return null; - } - } - - public FileItemDTO createListObjectLibraryByFileDocument(Element fileElement){ - try { - - log.info("createListObjectLibraryByFileDocument"+fileElement); - FileItemDTO fileObject = new FileItemDTO(); - fileObject.setName(fileElement.getText()); - //FIXME TODO fileObject.setLastModified(fileElement.attribute("lastmod").getText()); - //FIXME TODO fileObject.setSize(fileElement.attribute("size").getText()); - return fileObject; - } catch (Exception err) { - log.error("createListObjectLibraryByFileDocument",err); - } - return null; - } - - public LinkedList<FileItemDTO> createListObjectLibraryByFileDocumentThumbs(Element fileElement){ - try { - - LinkedList<FileItemDTO> thumbMap = new LinkedList<>(); - - for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) { - Element thumbElement = i.next(); - log.info("createListObjectLibraryByFileDocumentThumbs"+thumbElement); - FileItemDTO singleThumb = new FileItemDTO(); - singleThumb.setName(thumbElement.getName()); - //FIXME TODO singleThumb.setFileNamePure(thumbElement.getText()); - //FIXME TODO singleThumb.setLastModified(thumbElement.attribute("lastmod").getText()); - //FIXME TODO singleThumb.setSize(thumbElement.attribute("size").getText()); - thumbMap.add(singleThumb); - } - - return thumbMap; - - } catch (Exception err) { - log.error("createListObjectLibraryByFileDocumentThumbs",err); - } - return null; - } - -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java deleted file mode 100644 index e7dff13..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.file; - -public class LibraryPresenationThumbs { - - private String name = ""; - private LibraryPresentationThumb[] thumbs = null; - - public LibraryPresenationThumbs() {} - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public LibraryPresentationThumb[] getThumbs() { - return thumbs; - } - public void setThumbs(LibraryPresentationThumb[] thumbs) { - this.thumbs = thumbs; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java deleted file mode 100644 index f4fc415..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentation.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.file; - -public class LibraryPresentation { - private LibraryPresentationFile originalDocument = null; - private LibraryPresentationFile pdfDocument = null; - private LibraryPresentationFile swfDocument = null; - private LibraryPresenationThumbs thumbs = null; - - public LibraryPresentation() {} - - public LibraryPresentationFile getOriginalDocument() { - return originalDocument; - } - - public void setOriginalDocument(LibraryPresentationFile originalDocument) { - this.originalDocument = originalDocument; - } - - public LibraryPresentationFile getPdfDocument() { - return pdfDocument; - } - - public void setPdfDocument(LibraryPresentationFile pdfDocument) { - this.pdfDocument = pdfDocument; - } - - public LibraryPresentationFile getSwfDocument() { - return swfDocument; - } - - public void setSwfDocument(LibraryPresentationFile swfDocument) { - this.swfDocument = swfDocument; - } - - public LibraryPresenationThumbs getThumbs() { - return thumbs; - } - - public void setThumbs(LibraryPresenationThumbs thumbs) { - this.thumbs = thumbs; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java deleted file mode 100644 index c36c2f4..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.file; - -public class LibraryPresentationFile { - - private String name = null; - private String filename = null; - private String lastmod = null; - private Long size = null; - - public LibraryPresentationFile() {} - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getFilename() { - return filename; - } - public void setFilename(String filename) { - this.filename = filename; - } - public String getLastmod() { - return lastmod; - } - public void setLastmod(String lastmod) { - this.lastmod = lastmod; - } - public Long getSize() { - return size; - } - public void setSize(Long size) { - this.size = size; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java deleted file mode 100644 index c33c716..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.file; - -public class LibraryPresentationThumb { - - private String name = null; - private String filename = null; - private String lastmod = null; - private Long size = null; - - public LibraryPresentationThumb() {} - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getFilename() { - return filename; - } - public void setFilename(String filename) { - this.filename = filename; - } - public String getLastmod() { - return lastmod; - } - public void setLastmod(String lastmod) { - this.lastmod = lastmod; - } - public Long getSize() { - return size; - } - public void setSize(Long size) { - this.size = size; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java deleted file mode 100644 index 3ebf14c..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.file; - -import java.util.LinkedList; -/** - * Represents a Parsed Version of a Library-File-Converted Object - * @author sebastianwagner - * - */ -public class PresentationObject { - - private FileItemDTO originalDocument; - private FileItemDTO pdfDocument; - private FileItemDTO swfDocument; - LinkedList<FileItemDTO> thumbs; - - public PresentationObject() {} - - public FileItemDTO getOriginalDocument() { - return originalDocument; - } - public void setOriginalDocument(FileItemDTO originalDocument) { - this.originalDocument = originalDocument; - } - public FileItemDTO getPdfDocument() { - return pdfDocument; - } - public void setPdfDocument(FileItemDTO pdfDocument) { - this.pdfDocument = pdfDocument; - } - public FileItemDTO getSwfDocument() { - return swfDocument; - } - public void setSwfDocument(FileItemDTO swfDocument) { - this.swfDocument = swfDocument; - } - public LinkedList<FileItemDTO> getThumbs() { - return thumbs; - } - public void setThumbs(LinkedList<FileItemDTO> thumbs) { - this.thumbs = thumbs; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java deleted file mode 100644 index be86e9b..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.room; - -public class BrowserStatus { - private boolean browserInited = false; - private String currentURL = ""; - - public BrowserStatus() {} - - public boolean isBrowserInited() { - return browserInited; - } - public void setBrowserInited(boolean browserInited) { - this.browserInited = browserInited; - } - public String getCurrentURL() { - return currentURL; - } - public void setCurrentURL(String currentURL) { - this.currentURL = currentURL; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java deleted file mode 100644 index 457b6fd..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.room; - -import java.util.List; - -public class Cliparts { - - private String folderName; - private String[] generalList; - private List<Cliparts> subCategories; - - public Cliparts() {} - - public String[] getGeneralList() { - return generalList; - } - - public void setGeneralList(String[] generalList) { - this.generalList = generalList; - } - - public List<Cliparts> getSubCategories() { - return subCategories; - } - - public void setSubCategories(List<Cliparts> subCategories) { - this.subCategories = subCategories; - } - - public String getFolderName() { - return folderName; - } - - public void setFolderName(String folderName) { - this.folderName = folderName; - } - -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java deleted file mode 100644 index 8d6d3c8..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.room; - -import java.util.Date; - -public class RoomReturn { - - private Long roomId; - private String name; - private String creator; - private Date created; - private RoomUser[] roomUser; - - public RoomReturn() {} - - public Long getRoomId() { - return roomId; - } - - public void setRoomId(Long roomId) { - this.roomId = roomId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCreator() { - return creator; - } - - public void setCreator(String creator) { - this.creator = creator; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public RoomUser[] getRoomUser() { - return roomUser; - } - - public void setRoomUser(RoomUser[] roomUser) { - this.roomUser = roomUser; - } - -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java deleted file mode 100644 index 9f40175..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.room; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.openmeetings.db.dto.basic.SearchResult; -import org.apache.openmeetings.db.entity.room.Room; - -public class RoomSearchResult { - private String objectName; - private Long records; - private List<RoomDTO> result; - private String errorKey; - - public RoomSearchResult() {} - - public RoomSearchResult(SearchResult<Room> copy) { - if (copy != null) { - this.objectName = copy.getObjectName(); - this.records = copy.getRecords(); - this.result = new ArrayList<>(copy.getResult().size()); - for (Room r : copy.getResult()) { - result.add(new RoomDTO(r)); - } - this.errorKey = copy.getErrorKey(); - } - } - - public String getObjectName() { - return objectName; - } - - public void setObjectName(String objectName) { - this.objectName = objectName; - } - - public Long getRecords() { - return records; - } - - public void setRecords(Long records) { - this.records = records; - } - - public List<RoomDTO> getResult() { - return result; - } - - public void setResult(List<RoomDTO> result) { - this.result = result; - } - - public String getErrorKey() { - return errorKey; - } - - public void setErrorKey(String errorKey) { - this.errorKey = errorKey; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java deleted file mode 100644 index 0f0dbef..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.room; - -import java.util.List; - -import org.apache.openmeetings.db.entity.room.StreamClient; - -public class RoomStatus { - List<StreamClient> clientList; - BrowserStatus browserStatus; - - public RoomStatus() {} - - public List<StreamClient> getClientList() { - return clientList; - } - public void setClientList(List<StreamClient> clientList) { - this.clientList = clientList; - } - public BrowserStatus getBrowserStatus() { - return browserStatus; - } - public void setBrowserStatus(BrowserStatus browserStatus) { - this.browserStatus = browserStatus; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java deleted file mode 100644 index 4c59544..0000000 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.db.dto.room; - -public class RoomUser { - - private String firstname; - private String lastname; - private String publicSID; - private long broadcastId; - private Boolean isBroadCasting; - private String avsettings; - - public RoomUser() {} - - public String getFirstname() { - return firstname; - } - public void setFirstname(String firstname) { - this.firstname = firstname; - } - public String getLastname() { - return lastname; - } - public void setLastname(String lastname) { - this.lastname = lastname; - } - public Boolean getIsBroadCasting() { - return isBroadCasting; - } - public void setIsBroadCasting(Boolean isBroadCasting) { - this.isBroadCasting = isBroadCasting; - } - public String getAvsettings() { - return avsettings; - } - public void setAvsettings(String avsettings) { - this.avsettings = avsettings; - } - public String getPublicSID() { - return publicSID; - } - public void setPublicSID(String publicSID) { - this.publicSID = publicSID; - } - public long getBroadcastId() { - return broadcastId; - } - public void setBroadcastId(long broadcastId) { - this.broadcastId = broadcastId; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/13cb2edc/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java deleted file mode 100644 index 87cda14..0000000 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.test.library; - -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; - -import org.apache.openmeetings.core.documents.LibraryWmlLoader; -import org.apache.openmeetings.test.AbstractJUnitDefaults; -import org.junit.Test; -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class TestFileParser extends AbstractJUnitDefaults { - private static final Logger log = Red5LoggerFactory.getLogger(TestFileParser.class, webAppRootKey); - - @Test - public void testLoadWmlFile(){ - - try { - - LibraryWmlLoader.loadWmlFile("filename1"); - - } catch (Exception err) { - - log.error("TestLoadWmlFile",err); - - } - - } - -}
