Repository: openmeetings Updated Branches: refs/heads/master c1122318d -> e25958529
[OPENMEETINGS-1612] LICENSE updated, dependencies cleaned up Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e2595852 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e2595852 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e2595852 Branch: refs/heads/master Commit: e25958529e16a4080c6315e06160244ba9d26c82 Parents: c112231 Author: Maxim Solodovnik <[email protected]> Authored: Fri Jun 23 12:16:51 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Jun 23 12:22:37 2017 +0700 ---------------------------------------------------------------------- LICENSE | 77 ++++++++++++------ .../core/documents/LoadLibraryPresentation.java | 83 ++++++++------------ .../LoadLibraryPresentationToObject.java | 7 +- .../openmeetings/test/rdc/KeyCodesTest.java | 1 - .../openmeetings/test/rdc/ReadKeyCodesTest.java | 1 - .../openmeetings/db/dao/label/LabelDao.java | 2 +- .../installation/ImportInitvalues.java | 7 +- .../apache/openmeetings/screenshare/Core.java | 1 - openmeetings-util/pom.xml | 4 +- openmeetings-web/pom.xml | 6 -- 10 files changed, 90 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 0907aad..ff2bf2d 100644 --- a/LICENSE +++ b/LICENSE @@ -289,28 +289,30 @@ webapps/root/WEB-INF/web.xml webapps/openmeetings/WEB-INF/lib/api-all-*.jar webapps/openmeetings/WEB-INF/lib/asterisk-java-1.0.0-final.jar webapps/openmeetings/WEB-INF/lib/bndlib-2.3.0.jar +webapps/openmeetings/WEB-INF/lib/caldav4j-*.jar webapps/openmeetings/WEB-INF/lib/commons-*.jar webapps/openmeetings/WEB-INF/lib/cxf-*.jar webapps/openmeetings/WEB-INF/lib/derby*.jar -webapps/openmeetings/WEB-INF/lib/dom4j-1.6.1.jar +webapps/openmeetings/WEB-INF/lib/dom4j-2.0.0.jar webapps/openmeetings/WEB-INF/lib/geronimo-jms_1.1_spec-1.1.1.jar webapps/openmeetings/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar webapps/openmeetings/WEB-INF/lib/groovy-all-2.3.2.jar -webapps/openmeetings/WEB-INF/lib/gson-2.2.4.jar -webapps/openmeetings/WEB-INF/lib/guava-18.0.jar -webapps/openmeetings/WEB-INF/lib/httpclient-*.jar +webapps/openmeetings/WEB-INF/lib/gson-2.8.0.jar +webapps/openmeetings/WEB-INF/lib/guava-21.0.jar webapps/openmeetings/WEB-INF/lib/httpcore-*.jar +webapps/openmeetings/WEB-INF/lib/jackrabbit-webdav-2.12.1.jar webapps/openmeetings/WEB-INF/lib/jettison-1.3.8.jar -webapps/openmeetings/WEB-INF/lib/joda-time-2.9.4.jar +webapps/openmeetings/WEB-INF/lib/joda-time-2.9.9.jar webapps/openmeetings/WEB-INF/lib/jodconverter-core-3.0.1-om.jar webapps/openmeetings/WEB-INF/lib/jqplot4java-1.3.3.jar -webapps/openmeetings/WEB-INF/lib/jqplot-7.6.0.jar -webapps/openmeetings/WEB-INF/lib/json-1.8.jar +webapps/openmeetings/WEB-INF/lib/jqplot-8.0.0-M6.jar +webapps/openmeetings/WEB-INF/lib/json-1.3.jar webapps/openmeetings/WEB-INF/lib/juh-4.1.2.jar webapps/openmeetings/WEB-INF/lib/jurt-4.1.2.jar webapps/openmeetings/WEB-INF/lib/log4j-1.2.17.jar webapps/openmeetings/WEB-INF/lib/neethi-3.0.3.jar webapps/openmeetings/WEB-INF/lib/openjpa-2.4.2.jar +webapps/openmeetings/WEB-INF/lib/openjson-1.0.6.jar webapps/openmeetings/WEB-INF/lib/org.apache.servicemix.bundles.antlr-2.7.7_5.jar webapps/openmeetings/WEB-INF/lib/org.apache.servicemix.bundles.dom4j-1.6.1_5.jar webapps/openmeetings/WEB-INF/lib/org.apache.servicemix.bundles.xpp3-1.1.4c_7.jar @@ -338,9 +340,9 @@ lib/cors-filter-2.5.jar lib/ehcache-core-2.6.11.jar lib/geronimo-jpa_2.0_spec-1.1.jar lib/gson-2.2.4.jar -lib/httpclient-4.5.2.jar -lib/httpcore-4.4.4.jar -lib/isoparser-1.1.17.jar +lib/httpclient-4.5.3.jar +lib/httpcore-4.4.6.jar +lib/isoparser-1.9.27.jar lib/jackson-core-2.8.1.jar lib/java-property-utils-1.9.1.jar lib/jempbox-1.8.12.jar @@ -358,17 +360,16 @@ lib/tika-*.jar plugins/tomcat-*.jar plugins/tomcatplugin-*.jar -plugins/websocket-*.jar ====================================================================================================================== - + APACHE OPENMEETINGS SUBCOMPONENTS: Apache OpenMeetings includes a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and -conditions of the following licenses. - +conditions of the following licenses. + ====================================================================================================================== For GlassFish components @@ -530,18 +531,15 @@ Copyright (c) 2004-2008 QOS.ch lib/aopalliance-1.0.jar - For xmlpull-1.1.3.1.jar - For xpp3_min-1.1.4c.jar + For webapps/openmeetings/WEB-INF/lib/xmlpull-1.1.3.1.jar + For webapps/openmeetings/WEB-INF/lib/xpp3_min-1.1.4c.jar The XmlPull API is in public domain in hope that it will be embraced by Java developers ====================================================================================================================== -plugins/websocket-1.1.jar -jaxb-api-jar-2.2.6.jar -jaxb-impl-jar-2.2.6.jar -jaxb-xjc-jar-2.2.6.jar -jaxws-tools-jar-2.2.6.jar +webapps/openmeetings/WEB-INF/lib/jaxb-core-jar-2.2.11.jar +webapps/openmeetings/WEB-INF/lib/jaxb-impl-jar-2.2.11.jar COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1 @@ -821,7 +819,7 @@ As a special exception, the copyright holders of this library give you permissio ====================================================================================================================== For -webapps/openmeetings/WEB-INF/lib/jaxen-jar-1.1.4.jar +webapps/openmeetings/WEB-INF/lib/jaxen-jar-1.1.6.jar $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $ @@ -1113,8 +1111,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS'' AND For Bouncy Castle: - lib/bcprov-jdk15on-1.55.jar - webapps/openmeetings/screenshare/bcprov-jdk15on-1.55.jar + lib/bcprov-jdk15on-1.56.jar + webapps/openmeetings/screenshare/bcprov-jdk15on-1.56.jar Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) @@ -1184,7 +1182,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ====================================================================================================================== -For XStream Components: xstream-1.4.9.jar +For XStream Components: +webapps/openmeetings/WEB-INF/lib/xstream-1.4.10.jar Copyright (c) 2003-2006, Joe Walnes Copyright (c) 2006-2007, XStream Committers @@ -1358,7 +1357,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -postgresql-9.4.1212.jre7.jar +webapps/openmeetings/WEB-INF/lib/postgresql-*.jar Containing Project URL: http://jdbc.postgresql.org The PostgreSQL JDBC driver is distributed under the BSD license, same as the server. The simplest explanation of the licensing terms is that you can do whatever you want with the product and source code as long as you don't claim you wrote it or sue us. You should give it a read though, it's only half a page. @@ -2590,3 +2589,29 @@ EXHIBIT A -Mozilla Public License. the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] + + ======================================================================================= + +webapps/openmeetings/WEB-INF/lib/jdk-serializable-functional-1.8.2.jar + +The MIT License (MIT) + +Copyright (c) 2015 Jakub Danek + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/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 index b480dc0..0dd09b1 100644 --- 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 @@ -35,93 +35,77 @@ 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 ( @SuppressWarnings("unchecked") - Iterator<Element> i = root.elementIterator(); i.hasNext(); ) { - - Element item = i.next(); - - log.debug(item.getName()); - - String nodeVal = item.getName(); - + + 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"); - + } + + 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()); - - Integer k = 0; - for ( @SuppressWarnings("unchecked") - Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); i.next()) { + + int k = 0; + for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); i.next()) { k++; } - + thumbMap.setThumbs(new LibraryPresentationThumb[k]); - - + k = 0; - for ( @SuppressWarnings("unchecked") - Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) { + for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) { Element thumbElement = i.next(); //log.info("createListObjectLibraryByFileDocumentThumbs"+thumbElement); LibraryPresentationThumb singleThumb = new LibraryPresentationThumb(); @@ -132,14 +116,11 @@ public class LoadLibraryPresentation { 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/e2595852/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 index 38bcb74..581d333 100644 --- 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 @@ -31,7 +31,6 @@ 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; @@ -55,8 +54,7 @@ public class LoadLibraryPresentationToObject { Element root = document.getRootElement(); Integer k = 0; - for (@SuppressWarnings("unchecked") - Iterator<Element> i = root.elementIterator(); i.hasNext(); ) { + for (Iterator<Element> i = root.elementIterator(); i.hasNext(); ) { Element item = i.next(); log.error(item.getName()); @@ -103,8 +101,7 @@ public class LoadLibraryPresentationToObject { LinkedList<FileExplorerItemDTO> thumbMap = new LinkedList<>(); - for (@SuppressWarnings("unchecked") - Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) { + for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) { Element thumbElement = i.next(); log.info("createListObjectLibraryByFileDocumentThumbs"+thumbElement); FileExplorerItemDTO singleThumb = new FileExplorerItemDTO(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java index cfb0ef3..a75f696 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java @@ -40,7 +40,6 @@ public class KeyCodesTest extends Frame implements KeyListener { String msg1 = ""; String msg2 = ""; - @SuppressWarnings("unused") public static void main(String[] args) { new KeyCodesTest(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java index 12d73b2..c5dd051 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java @@ -29,7 +29,6 @@ public class ReadKeyCodesTest extends Frame implements KeyListener { String msg1 = ""; String msg2 = ""; - @SuppressWarnings("unused") public static void main(String[] args) { new ReadKeyCodesTest(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index 1730056..64ab2b2 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -129,7 +129,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ Document document = reader.read(getLangFile()); Element root = document.getRootElement(); languages.clear(); - for (@SuppressWarnings("unchecked")Iterator<Element> it = root.elementIterator("lang"); it.hasNext();) { + for (Iterator<Element> it = root.elementIterator("lang"); it.hasNext();) { Element item = it.next(); Long id = Long.valueOf(item.attributeValue("id")); String code = item.attributeValue("code"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index 4a11079..2780549 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -176,17 +176,14 @@ public class ImportInitvalues { Element root = document.getRootElement(); - for (@SuppressWarnings("unchecked") - Iterator<Element> it = root.elementIterator("row"); it.hasNext();) { - + for (Iterator<Element> it = root.elementIterator("row"); it.hasNext();) { Element row = it.next(); Long errorvalueId = null; Long labelId = null; ErrorValue.Type type = null; - for (@SuppressWarnings("unchecked") - Iterator<Element> itSub = row.elementIterator("field"); itSub.hasNext();) { + for (Iterator<Element> itSub = row.elementIterator("field"); itSub.hasNext();) { Element field = itSub.next(); String name = field.attributeValue("name"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index b5b4ffb..65831ab 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -196,7 +196,6 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { log.debug(String.format("host: %s, port: %s, app: %s, publish: %s", host, port, app, publishName)); } - @SuppressWarnings("unused") public static void main(String[] args) { new Core(args); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-util/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index da2ca3c..ceeda5e 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -30,7 +30,7 @@ <name>Openmeetings Util</name> <description>Module for utility classes being used by all OpenMeetings modules</description> <properties> - <dom4j.version>1.6.1</dom4j.version> + <dom4j.version>2.0.0</dom4j.version> <commons-codec.version>1.10</commons-codec.version> <commons-io.version>2.5</commons-io.version> <site.basedir>${project.parent.basedir}</site.basedir> @@ -65,7 +65,7 @@ <artifactId>red5-server</artifactId> </dependency> <dependency> - <groupId>dom4j</groupId> + <groupId>org.dom4j</groupId> <artifactId>dom4j</artifactId> <version>${dom4j.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e2595852/openmeetings-web/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index d34c368..38897ea 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -506,11 +506,5 @@ <version>${derby.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.4.01</version> - <scope>test</scope> - </dependency> </dependencies> </project>
