From d10ab8f4afbfb309559ab3a2198abb76cc4a0687 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Mon, 11 May 2020 11:53:48 -0400
Subject: [PATCH] Remove files containing incompatible (to BBB) license
---
.../src/assets/presentation.css | 87 -------------
.../webminer/util/Log4jDirectConfigurer.java | 115 ------------------
2 files changed, 202 deletions(-)
delete mode 100644 bigbluebutton-client/src/assets/presentation.css
delete mode 100755 labs/webminer/src/main/java/org/bigbluebutton/webminer/util/Log4jDirectConfigurer.java
diff --git a/bigbluebutton-client/src/assets/presentation.css b/bigbluebutton-client/src/assets/presentation.css
deleted file mode 100644
index f06130b69c..0000000000
--- a/bigbluebutton-client/src/assets/presentation.css
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright (C) 2003-2006 Adobe Macromedia Software LLC and its licensors.
-// All Rights Reserved.
-// The following is Sample Code and is subject to all restrictions on such code
-// as contained in the End User License Agreement accompanying this product.
-// If you have received this file from a source other than Adobe,
-// then your use, modification, or distribution of it requires
-// the prior written permission of Adobe.
-//
-////////////////////////////////////////////////////////////////////////////////
-*/
-Application
-{
- backgroundColor: #484842;
-}
-
-CarouselImage
-{
- frameColor: #9e9c8d;
- frameThickness: 1;
- frameSize: 5;
-}
-
-ToolTip
-{
- backgroundColor: #484842;
- color: #ffffff;
-}
-
-.button
-{
- themeColor: #b7babc;
-}
-
-.thumbnailRolledOver
-{
- backgroundColor: #787872;
-}
-
-.thumbnailSelected
-{
- backgroundColor: #383832;
-}
-
-.thumbnailTitleBar
-{
- fontSize: 12;
- fontWeight: "bold";
- color: #666666;
-}
-
-.thumbnailListBorderBox
-{
- backgroundColor: #9e9c8d;
-}
-
-.thumbnailList
-{
- borderColor: #9e9c8d;
- backgroundColor: #9e9c8d;
- selectionColor: #9e9c8d;
- rollOverColor: #9e9c8d;
- themeColor: #383832;
- borderStyle: "solid";
- cornerRadius: 10;
-}
-
-.photoDescription
-{
- fontWeight: "bold";
- fontSize: 14;
- color: #ffffff;
-}
-
-.photoName
-{
- fontSize: 12;
- color: #ffffff;
-}
-
-.slideshowControlBar
-{
- backgroundAlpha: .6;
- backgroundColor: #5b5b5b;
-}
diff --git a/labs/webminer/src/main/java/org/bigbluebutton/webminer/util/Log4jDirectConfigurer.java b/labs/webminer/src/main/java/org/bigbluebutton/webminer/util/Log4jDirectConfigurer.java
deleted file mode 100755
index cf515a7a92..0000000000
--- a/labs/webminer/src/main/java/org/bigbluebutton/webminer/util/Log4jDirectConfigurer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- @(#)Log4jDirectConfigurer.java $Revision: 1.1 $ $Date: 2008/11/13 13:50:20EST $
- *
- * Copyright (c) 2008 N-III Project - Royal Canadian Mounted Police
- * All rights reserved.
- *
- * This software is the confidential and proprietary information of Royal
- * Canadian Mounted Police ("Confidential Information"). You shall not
- * disclose such Confidential Information and contained herein are considered
- * to be Protected and Internal use ONLY by N-III Project, RCMP.
- */
-package org.bigbluebutton.webminer.util;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.PropertyConfigurator;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * TODO: Brief summary here - one or two sentence overview.
- *
- * TODO: Detailed explanation of how this works, what it subclasses or what
- * should subclass it, etc. This should be as good as the Sun Javadocs. Consider
- * embedding some simple examples of using this class. See the Sun Thread class
- * for an example.
- *
- * @version $Revision: 1.1 $
- * @see [Class name#method name] TODO
- */
-
-public class Log4jDirectConfigurer implements InitializingBean, DisposableBean {
- private static final long DEFAULT_REFRESH_INTERVAL = 6000L;
-
- private String location;
- private String fileName;
- private String interval;
-
- /**
- * @return the location
- */
- public String getLocation() {
- return location;
- }
-
- /**
- * @param location
- * the location to set
- */
- public void setLocation(String location) {
- this.location = location;
- }
-
- /**
- * @return the fileName
- */
- public String getFileName() {
- return fileName;
- }
-
- /**
- * @param fileName
- * the fileName to set
- */
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- /**
- * @return the interval
- */
- public String getInterval() {
- return interval;
- }
-
- /**
- * @param interval
- * the interval to set
- */
- public void setInterval(String interval) {
- this.interval = interval;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
- */
- public void afterPropertiesSet() throws Exception {
-
- if (getLocation() != null && getFileName() != null) {
-
- String fqName = System.getProperty(getLocation()) + "/" + getFileName();
-
- // use default refresh interval if not specified
- long refreshInterval = DEFAULT_REFRESH_INTERVAL;
- String intervalString = getInterval();
- if (intervalString != null) {
- refreshInterval = Long.parseLong(intervalString);
- }
-
- // perform actual Log4J initialization
- PropertyConfigurator.configureAndWatch(fqName, refreshInterval);
- } else {
- throw new IllegalArgumentException(
- "Missing log4jConfigLocation or log4jConfigName parameter.");
- }
- }
-
- /* (non-Javadoc)
- * @see org.springframework.beans.factory.DisposableBean#destroy()
- */
- public void destroy() throws Exception {
- LogManager.shutdown();
- }
-}
--
GitLab