This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4f2ec820b [OPENMEETINGS-2520] sonar should be more happy
4f2ec820b is described below
commit 4f2ec820bbedeafdd2bbe03f1a44db67b1f93bcb
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri May 27 16:25:00 2022 +0700
[OPENMEETINGS-2520] sonar should be more happy
---
CHANGELOG.md | 14 +--
LICENSE | 118 ++++++++++-----------
.../apache/openmeetings/db/entity/room/Room.java | 25 -----
.../apache/openmeetings/db/entity/user/User.java | 24 -----
.../apache/openmeetings/backup/BackupImport.java | 68 ++++++------
.../src/main/assembly/scripts/admin.sh | 2 +-
.../src/main/assembly/scripts/network_test.sh | 8 +-
.../src/site/markdown/InstallMediaServer.md | 8 +-
.../src/site/stylesheets/errorvalues.xsd | 6 +-
.../src/site/xdoc/BuildInstructions.xml | 2 +-
.../src/site/xdoc/RestAPISample.xml | 6 +-
.../src/site/xdoc/commercial-support.xml | 2 +-
openmeetings-web/src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/data/conf/om_ldap.cfg | 12 +--
.../src/main/webapp/images/arcArrow.svg | 6 +-
.../src/main/webapp/images/profile.svg | 6 +-
.../apache/openmeetings/backup/TestImportUser.java | 6 +-
.../apache/openmeetings/user/TestUserGroup.java | 6 +-
.../openmeetings/backup/group/organizations.xml | 6 +-
.../openmeetings/backup/ldap/ldapconfigs.xml | 6 +-
.../apache/openmeetings/backup/menu/extraMenus.xml | 6 --
.../openmeetings/backup/user/ldap/ldapconfigs.xml | 6 +-
.../backup/{group => user}/organizations.xml | 12 +--
.../org/apache/openmeetings/backup/user/users.xml | 6 ++
.../apache/openmeetings/backup/version/version.xml | 6 +-
25 files changed, 165 insertions(+), 204 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9e7e280a..f987da119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,14 +67,14 @@ Release Notes - Openmeetings - Version 6.2.0
* [OPENMEETINGS-2639] - Add internal password user when send inivitation
from room
* [OPENMEETINGS-2654] - Update build instructions with new commands for
compiling NPM
* [OPENMEETINGS-2655] - Minor ui fix for icons, see attached screenshots
- * [OPENMEETINGS-2660] - Updated Swagger Rest API Docs
+ * [OPENMEETINGS-2660] - Updated Swagger Rest API Docs
* [OPENMEETINGS-2661] - Updated Rest API Example
* [OPENMEETINGS-2666] - Backup import should be improved
* [OPENMEETINGS-2667] - Generated swagger has incorrect response, missing
root element in schema and provide example responses
* [OPENMEETINGS-2674] - Updated Rest API Example for PHP integration
* Test
- * [OPENMEETINGS-2659] - Can´t clean whiteboard
+ * [OPENMEETINGS-2659] - Can´t clean whiteboard
* [OPENMEETINGS-2665] - "Start sharing" icon TV not show it in some
circunstanves
* Task
@@ -99,10 +99,10 @@ Release Notes - Openmeetings - Version 6.1.0
* [OPENMEETINGS-2599] - Make user default moderator in his/her own
conference and presentation rooms
* [OPENMEETINGS-2606] - Clean slide is broken
* [OPENMEETINGS-2612] - google analatyics field should be limited to avoid
overflow
- * [OPENMEETINGS-2613] - empty user list in presentation room
+ * [OPENMEETINGS-2613] - empty user list in presentation room
* [OPENMEETINGS-2616] - OM not working on Android Chrome
* [OPENMEETINGS-2624] - Untranslated calendar when change Language to
japanese
- * [OPENMEETINGS-2629] - Calendar picker can't sync to big calendar.
+ * [OPENMEETINGS-2629] - Calendar picker can't sync to big calendar.
* [OPENMEETINGS-2638] - The email link received from Calendar don´t work
* New Feature
@@ -136,7 +136,7 @@ Release Notes - Openmeetings - Version 6.0.0
* [OPENMEETINGS-2533] - Create New Group From Moderator
* [OPENMEETINGS-2534] - RSS widget can break menu
* [OPENMEETINGS-2535] - New chat notifications are too annoying
- * [OPENMEETINGS-2539] - Voice Indicator disappears
+ * [OPENMEETINGS-2539] - Voice Indicator disappears
* [OPENMEETINGS-2542] - Notifications are not working in FF
* [OPENMEETINGS-2543] - Error when adding google calendar
* [OPENMEETINGS-2544] - Joining via URL room does not have 'exit' link
@@ -145,7 +145,7 @@ Release Notes - Openmeetings - Version 6.0.0
* [OPENMEETINGS-2559] - Openmeetings instalaltion failing with oracle as
DB set up
* [OPENMEETINGS-2564] - Video does not play on WB
* [OPENMEETINGS-2565] - Typo in RoomDTO getExternal - doesn't return
correct room
- * [OPENMEETINGS-2570] - Wrong German translation on "Reset password" popup
+ * [OPENMEETINGS-2570] - Wrong German translation on "Reset password" popup
* [OPENMEETINGS-2573] - FlowState.NOT_FLOWING Type Audio should not stop
broadcast as can start flowing again
* [OPENMEETINGS-2575] - Log file fills up with ping messages
* [OPENMEETINGS-2581] - saving whiteboard content and puttting it back
onto it _ error
@@ -172,7 +172,7 @@ Release Notes - Openmeetings - Version 6.0.0
* [OPENMEETINGS-2578] - TLSv1.2 should be used as SSLContext protocol
* Test
- * [OPENMEETINGS-2507] - Need push "allow cam-mic button" twice
+ * [OPENMEETINGS-2507] - Need push "allow cam-mic button" twice
* [OPENMEETINGS-2571] - Tests for getExternal should be added
* Wish
diff --git a/LICENSE b/LICENSE
index 6088799c7..036575ded 100644
--- a/LICENSE
+++ b/LICENSE
@@ -202,7 +202,7 @@ Apache OpenMeetings License:
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.
-
+
======================================================================================================================
Following components are direct work from the Apache OpenMeetings project:
@@ -230,7 +230,7 @@ webapps/openmeetings/screenshare/icon.*
webapps/openmeetings/screenshare/splashicon.*
======================================================================================================================
-Further those components are either itself or derivate work from
+Further those components are either itself or derivate work from
projects licensed under the Apache License 2.0:
======================================================================================================================
@@ -420,8 +420,8 @@ This License represents the complete agreement concerning
subject matter hereof.
As between Initial Developer and the Contributors, each party is responsible
for claims and damages arising, directly or indirectly, out of its utilization
of rights under this License and You agree to work with Initial Developer and
Contributors to distribute such responsibility on an equitable basis. Nothing
herein is intended or shall be deemed to constitute any admission of liability.
NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL)
-The GlassFish code released under the CDDL shall be governed by the laws of
the State of California (excluding conflict-of-law provisions). Any litigation
relating to this License shall be subject to the jurisdiction of the Federal
Courts of the Northern District of California and the state courts of the State
of California, with venue lying in Santa Clara County, California.
-
+The GlassFish code released under the CDDL shall be governed by the laws of
the State of California (excluding conflict-of-law provisions). Any litigation
relating to this License shall be subject to the jurisdiction of the Federal
Courts of the Northern District of California and the state courts of the State
of California, with venue lying in Santa Clara County, California.
+
======================================================================================================================
For SLF4J:
@@ -452,16 +452,16 @@ Copyright (c) 2004-2008 QOS.ch
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.
-
+
======================================================================================================================
-
+
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
======================================================================================================================
-
+
webapps/openmeetings/WEB-INF/lib/jaxb-core-jar-2.2.11.jar
webapps/openmeetings/WEB-INF/lib/jaxb-impl-jar-2.2.11.jar
@@ -739,16 +739,16 @@ Certain source files distributed by Oracle are subject to
the following clarific
Linking this library statically or dynamically with other modules is making a
combined work based on this library. Thus, the terms and conditions of the GNU
General Public License Version 2 cover the whole combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent modules, and
to copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the terms and
conditions of the license of that module. An independent module is a module
which is not derived from or based on th [...]
-
+
======================================================================================================================
-For
+For
webapps/openmeetings/WEB-INF/lib/jaxen-1.1.6.jar
$Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
Copyright 2003-2006 The Werken Company. All Rights Reserved.
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -761,7 +761,7 @@ webapps/openmeetings/WEB-INF/lib/jaxen-1.1.6.jar
documentation and/or other materials provided with the distribution.
* Neither the name of the Jaxen Project nor the names of its
- contributors may be used to endorse or promote products derived
+ contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
@@ -904,7 +904,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
1.0
NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL)
The code released under the CDDL shall be governed by the laws of the State
of California (excluding conflict-of-law provisions). Any litigation relating
to this License shall be subject to the jurisdiction of the Federal Courts of
the Northern District of California and the state courts of the State of
California, with venue lying in Santa Clara County, California.
-
+
======================================================================================================================
For wsdl4j-jar-1.6.2.jar
@@ -924,7 +924,7 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF
THIS COMMON PUBLIC LICEN
ii) additions to the Program;
- where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from a
Contributor if it was added to the Program by such Contributor itself or anyone
acting on such Contributor's behalf. Contributions do not include additions to
the Program which: (i) are separate modules of software distributed in
conjunction with the Program under their own license agreement, and (ii) are
not derivative works of the [...]
+ where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from a
Contributor if it was added to the Program by such Contributor itself or anyone
acting on such Contributor's behalf. Contributions do not include additions to
the Program which: (i) are separate modules of software distributed in
conjunction with the Program under their own license agreement, and (ii) are
not derivative works of the [...]
"Contributor" means any person or entity that distributes the Program.
@@ -938,11 +938,11 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF
THIS COMMON PUBLIC LICEN
a) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free copyright license to
reproduce, prepare derivative works of, publicly display, publicly perform,
distribute and sublicense the Contribution of such Contributor, if any, and
such derivative works, in source code and object code form.
- b) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free patent license under
Licensed Patents to make, use, sell, offer to sell, import and otherwise
transfer the Contribution of such Contributor, if any, in source code and
object code form. This patent license shall apply to the combination of the
Contribution and the Program if, at the time the Contribution is added by the
Contributor, such addition of the Contrib [...]
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free patent license under
Licensed Patents to make, use, sell, offer to sell, import and otherwise
transfer the Contribution of such Contributor, if any, in source code and
object code form. This patent license shall apply to the combination of the
Contribution and the Program if, at the time the Contribution is added by the
Contributor, such addition of the Contrib [...]
c) Recipient understands that although each Contributor grants the
licenses to its Contributions set forth herein, no assurances are provided by
any Contributor that the Program does not infringe the patent or other
intellectual property rights of any other entity. Each Contributor disclaims
any liability to Recipient for claims brought by any other entity based on
infringement of intellectual property rights or otherwise. As a condition to
exercising the rights and licenses granted [...]
- d) Each Contributor represents that to its knowledge it has sufficient
copyright rights in its Contribution, if any, to grant the copyright license
set forth in this Agreement.
+ d) Each Contributor represents that to its knowledge it has sufficient
copyright rights in its Contribution, if any, to grant the copyright license
set forth in this Agreement.
3. REQUIREMENTS
@@ -952,19 +952,19 @@ A Contributor may choose to distribute the Program in
object code form under its
b) its license agreement:
- i) effectively disclaims on behalf of all Contributors all warranties and
conditions, express and implied, including warranties or conditions of title
and non-infringement, and implied warranties or conditions of merchantability
and fitness for a particular purpose;
+ i) effectively disclaims on behalf of all Contributors all warranties and
conditions, express and implied, including warranties or conditions of title
and non-infringement, and implied warranties or conditions of merchantability
and fitness for a particular purpose;
- ii) effectively excludes on behalf of all Contributors all liability for
damages, including direct, indirect, special, incidental and consequential
damages, such as lost profits;
+ ii) effectively excludes on behalf of all Contributors all liability for
damages, including direct, indirect, special, incidental and consequential
damages, such as lost profits;
iii) states that any provisions which differ from this Agreement are
offered by that Contributor alone and not by any other party; and
- iv) states that source code for the Program is available from such
Contributor, and informs licensees how to obtain it in a reasonable manner on
or through a medium customarily used for software exchange.
+ iv) states that source code for the Program is available from such
Contributor, and informs licensees how to obtain it in a reasonable manner on
or through a medium customarily used for software exchange.
When the Program is made available in source code form:
- a) it must be made available under this Agreement; and
+ a) it must be made available under this Agreement; and
- b) a copy of this Agreement must be included with each copy of the
Program.
+ b) a copy of this Agreement must be included with each copy of the Program.
Contributors may not remove or alter any copyright notices contained within
the Program.
@@ -995,11 +995,11 @@ All Recipient's rights under this Agreement shall
terminate if it fails to compl
Everyone is permitted to copy and distribute copies of this Agreement, but in
order to avoid inconsistency the Agreement is copyrighted and may only be
modified in the following manner. The Agreement Steward reserves the right to
publish new versions (including revisions) of this Agreement from time to time.
No one other than the Agreement Steward has the right to modify this Agreement.
IBM is the initial Agreement Steward. IBM may assign the responsibility to
serve as the Agreement Stew [...]
This Agreement is governed by the laws of the State of New York and the
intellectual property laws of the United States of America. No party to this
Agreement will bring a legal action under this Agreement more than one year
after the cause of action arose. Each party waives its rights to a jury trial
in any resulting litigation.
-
+
======================================================================================================================
For Bouncy Castle:
-
+
webapps/openmeetings/WEB-INF/lib/bcmail-jdk15on-*.jar
webapps/openmeetings/WEB-INF/lib/bcpkix-jdk15on-*.jar
webapps/openmeetings/WEB-INF/lib/bcprov-jdk15on-*.jar
@@ -1019,7 +1019,7 @@ This Agreement is governed by the laws of the State of
New York and the intellec
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.
-
+
======================================================================================================================
For XPP3: xpp3-jar-1.1.4c.jar
@@ -1073,7 +1073,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
======================================================================================================================
-For XStream Components:
+For XStream Components:
webapps/openmeetings/WEB-INF/lib/xstream-1.4.10.jar
Copyright (c) 2003-2006, Joe Walnes
@@ -1102,7 +1102,7 @@ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN
CONTRACT, 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.
-
+
======================================================================================================================
For JDOM
@@ -1155,9 +1155,9 @@ For JDOM
created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
on the JDOM Project, please see <http://www.jdom.org/>.
-
+
======================================================================================================================
-The following components are BSD Licensed
+The following components are BSD Licensed
webapps/openmeetings/WEB-INF/lib/xmpcore-*.jar
@@ -1166,7 +1166,7 @@ webapps/openmeetings/WEB-INF/lib/xmpcore-*.jar
For: webapps/openmeetings/WEB-INF/lib/dom4j-*.jar
Containing Project URL: http://sourceforge.net/projects/dom4j/
-
+
Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
Redistribution and use of this software and associated documentation
@@ -1176,25 +1176,25 @@ that the following conditions are met:
1. Redistributions of source code must retain copyright
statements and notices. Redistributions must also contain a
copy of this document.
-
+
2. Redistributions in binary form must reproduce the
above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other
materials provided with the distribution.
-
+
3. The name "DOM4J" must not be used to endorse or promote
products derived from this Software without prior written
permission of MetaStuff, Ltd. For written permission,
please contact [email protected].
-
+
4. Products derived from this Software may not be called "DOM4J"
nor may "DOM4J" appear in their names without prior written
permission of MetaStuff, Ltd. DOM4J is a registered
trademark of MetaStuff, Ltd.
-
-5. Due credit should be given to the DOM4J Project -
+
+5. Due credit should be given to the DOM4J Project -
http://www.dom4j.org
-
+
THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -1210,7 +1210,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
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.
Copyright (c) 1997-2010, PostgreSQL Global Development Group
@@ -1242,7 +1242,7 @@ POSSIBILITY OF SUCH DAMAGE.
webapps/openmeetings/WEB-INF/lib/asm-*.jar
URL: http://asm.objectweb.org/asm/
-
+
======================================================================================================================
SERP License
@@ -1252,34 +1252,34 @@ File: serp-1.15.1.jar
Copyright (c) 2002-2007, A. Abram White
All rights reserved.
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this
+* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of 'serp' nor the names of its contributors may
- be used to endorse or promote products derived from this software without
+ be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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.
======================================================================================================================
iCal4j - License
-
+
webapps/openmeetings/WEB-INF/lib/ical4j-2.1.5.jar
-
+
======================================================================================================================
Copyright (c) 2012, Ben Fortuna
@@ -1417,9 +1417,9 @@ For components:
coin-slider-styles.css
colorbox.css
-coin-slider.min.js
+coin-slider.min.js
jquery.colorbox.js
-jquery-1.11.0.min.js
+jquery-1.11.0.min.js
jquery-ui-1.11.4.custom.min.js
jquery-ui-1.10.4.custom.css
jquery-ui-1.11.4.custom.css
@@ -1476,7 +1476,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
For javax.annotation-api-1.2.jar:
URL: http://jcp.org/en/jsr/detail?id=250
-
+
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
1. Definitions.
@@ -1753,7 +1753,7 @@ For jaxb-core-2.2.11.jar:
URL: http://jaxb.java.net/jaxb-bundles/jaxb-core
For jaxb-impl-2.2.11.jar:
URL: http://jaxb.java.net/jaxb-bundles/jaxb-impl
-
+
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
1. Definitions.
@@ -1955,9 +1955,9 @@ This General Public License does not permit incorporating
your program into prop
"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-Certain source files distributed by Oracle are subject to the following
clarification and special exception to the GPL Version 2, but only where Oracle
has expressly included in the particular source file's header the words "Oracle
designates this particular file as subject to the "Classpath" exception as
provided by Oracle in the License file that accompanied this code."
+Certain source files distributed by Oracle are subject to the following
clarification and special exception to the GPL Version 2, but only where Oracle
has expressly included in the particular source file's header the words "Oracle
designates this particular file as subject to the "Classpath" exception as
provided by Oracle in the License file that accompanied this code."
-Linking this library statically or dynamically with other modules is making a
combined work based on this library. Thus, the terms and conditions of the GNU
General Public License Version 2 cover the whole combination.
+Linking this library statically or dynamically with other modules is making a
combined work based on this library. Thus, the terms and conditions of the GNU
General Public License Version 2 cover the whole combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent modules, and
to copy and distribute the resulting executable under terms of your choice,
provided that you also meet, for each linked independent module, the terms and
conditions of the license of that module. An independent module is a module
which is not derived from or based on th [...]
@@ -1965,10 +1965,10 @@ As a special exception, the copyright holders of this
library give you permissio
Mozilla Public License 1.1 (MPL 1.1)
http://www.mozilla.org/MPL/MPL-1.1.html
-
+
For
webapps/openmeetings/WEB-INF/lib/juniversalchardet-1.0.3.jar
-
+
MOZILLA PUBLIC LICENSE
Version 1.1
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 30404c509..9dbdf7728 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -46,7 +46,6 @@ import javax.persistence.Lob;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
-import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -220,14 +219,6 @@ public class Room extends HistoricalEntity {
@XmlElement(name = "externalId", required = false)
private String externalId;
- @XmlElement(name = "externalType", required = false)
- @Transient
- /**
- * @deprecated External group should be used instead
- */
- @Deprecated(since = "5.0")
- private String externalType;
-
@Column(name = "demo_room", nullable = false)
@XmlElement(name = "isDemoRoom", required = false)
@XmlJavaTypeAdapter(value = BooleanAdapter.class, type = boolean.class)
@@ -458,22 +449,6 @@ public class Room extends HistoricalEntity {
return extType.isPresent() ? extType.get() : null;
}
- /**
- * @deprecated External group should be used instead
- */
- @Deprecated(since = "5.0")
- public String getExternalType() {
- return externalType;
- }
-
- /**
- * @deprecated External group should be used instead
- */
- @Deprecated(since = "5.0")
- public void setExternalType(String externalType) {
- this.externalType = externalType;
- }
-
public boolean isAllowUserQuestions() {
return allowUserQuestions;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index f99c2c1c8..5c99f74f6 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -319,14 +319,6 @@ public class User extends HistoricalEntity {
@XmlElement(name = "externalUserId", required = false)
private String externalId;
- @XmlElement(name = "externalUserType", required = false)
- @Transient
- /**
- * @deprecated External group should be used instead
- */
- @Deprecated(since = "5.0")
- private String externalType;
-
/**
* java.util.TimeZone Id
*/
@@ -579,22 +571,6 @@ public class User extends HistoricalEntity {
return extType.isPresent() ? extType.get() : null;
}
- /**
- * @deprecated External group should be used instead
- */
- @Deprecated(since = "5.0")
- public String getExternalType() {
- return externalType;
- }
-
- /**
- * @deprecated External group should be used instead
- */
- @Deprecated(since = "5.0")
- public void setExternalType(String externalType) {
- this.externalType = externalType;
- }
-
public Sessiondata getSessionData() {
return sessionData;
}
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 4953b6bf6..7e9af5d50 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -639,6 +639,35 @@ public class BackupImport {
}, false);
}
+ private void checkByType(User u) {
+ if (u.getType() == User.Type.LDAP) {
+ if (u.getDomainId() != null &&
ldapMap.containsKey(u.getDomainId())) {
+ u.setDomainId(ldapMap.get(u.getDomainId()));
+ } else {
+ log.error("Unable to find Domain for ID: {}",
u.getDomainId());
+ }
+ }
+ if (u.getType() == User.Type.OAUTH) {
+ if (u.getDomainId() != null &&
oauthMap.containsKey(u.getDomainId())) {
+ u.setDomainId(oauthMap.get(u.getDomainId()));
+ } else {
+ log.error("Unable to find Domain for ID: {}",
u.getDomainId());
+ }
+ }
+ }
+
+ private void checkLogin(User u, Set<UserKey> userLogins) {
+ if (u.getType() == User.Type.CONTACT && u.getLogin().length() <
getMinLoginLength()) {
+ u.setLogin(randomUUID().toString());
+ }
+ if (userLogins.contains(new UserKey(u))) {
+ log.warn("LOGIN is duplicated for USER {}", u);
+ String updateLogin =
String.format("modified_by_import_<%s>%s", randomUUID(), u.getLogin());
+ u.setLogin(updateLogin);
+ }
+ userLogins.add(new UserKey(u));
+ }
+
/*
* ##################### Import Users
*/
@@ -646,20 +675,18 @@ public class BackupImport {
log.info("OAuth2 servers import complete, starting user
import");
String jNameTimeZone = getDefaultTimezone();
//add existent emails from database
- List<User> users = userDao.getAllUsers();
final Set<String> userEmails = new HashSet<>();
final Set<UserKey> userLogins = new HashSet<>();
- for (User u : users){
+ userDao.getAllUsers().stream().forEach(u -> {
if (u.getAddress() != null &&
!Strings.isEmpty(u.getAddress().getEmail())) {
userEmails.add(u.getAddress().getEmail());
}
userLogins.add(new UserKey(u));
- }
+ });
Class<User> eClazz = User.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
Unmarshaller unmarshaller = jc.createUnmarshaller();
unmarshaller.setAdapter(new GroupAdapter(groupDao, groupMap));
- int minLoginLength = getMinLoginLength();
readList(unmarshaller, base, "users.xml", USER_LIST_NODE,
USER_NODE, eClazz, u -> {
if (u.getLogin() == null || u.isDeleted()) {
@@ -674,26 +701,8 @@ public class BackupImport {
}
userEmails.add(u.getAddress().getEmail());
}
- if (u.getType() == User.Type.LDAP) {
- if (u.getDomainId() != null &&
ldapMap.containsKey(u.getDomainId())) {
-
u.setDomainId(ldapMap.get(u.getDomainId()));
- } else {
- log.error("Unable to find Domain for
ID: {}", u.getDomainId());
- }
- }
- if (u.getType() == User.Type.OAUTH) {
- if (u.getDomainId() != null &&
oauthMap.containsKey(u.getDomainId())) {
-
u.setDomainId(oauthMap.get(u.getDomainId()));
- } else {
- log.error("Unable to find Domain for
ID: {}", u.getDomainId());
- }
- }
- if (userLogins.contains(new UserKey(u))) {
- log.warn("LOGIN is duplicated for USER {}", u);
- String updateLogin =
String.format("modified_by_import_<%s>%s", randomUUID(), u.getLogin());
- u.setLogin(updateLogin);
- }
- userLogins.add(new UserKey(u));
+ checkByType(u);
+ checkLogin(u, userLogins);
if (u.getGroupUsers() != null) {
for (Iterator<GroupUser> iter =
u.getGroupUsers().iterator(); iter.hasNext();) {
GroupUser gu = iter.next();
@@ -704,9 +713,6 @@ public class BackupImport {
gu.setUser(u);
}
}
- if (u.getType() == User.Type.CONTACT &&
u.getLogin().length() < minLoginLength) {
- u.setLogin(randomUUID().toString());
- }
String tz = u.getTimeZoneId();
if (tz == null) {
@@ -721,10 +727,6 @@ public class BackupImport {
if (AuthLevelUtil.hasLoginLevel(u.getRights()) &&
!Strings.isEmpty(u.getActivatehash())) {
u.setActivatehash(null);
}
- if (u.getExternalType() != null) {
- Group g =
groupDao.getExternal(u.getExternalType());
- u.addGroup(g);
- }
userDao.update(u, Long.valueOf(-1));
userMap.put(userId, u.getId());
});
@@ -1401,7 +1403,9 @@ public class BackupImport {
return false;
}
UserKey other = (UserKey) obj;
- return Objects.equals(domainId, other.domainId) &&
Objects.equals(login, other.login) && type == other.type;
+ return Objects.equals(domainId, other.domainId)
+ && Objects.equals(login, other.login)
+ && type == other.type;
}
}
}
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.sh
b/openmeetings-server/src/main/assembly/scripts/admin.sh
index b0dede8da..a7ed3073b 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.sh
+++ b/openmeetings-server/src/main/assembly/scripts/admin.sh
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# #############################################
-export OM_HOME=$(cd $(dirname "$0"); pwd)
+export OM_HOME=$(cd $(dirname "$0"); pwd)
export OM_CONTEXT=openmeetings
export JDK_JAVA_OPTIONS="--add-modules java.se --add-exports
java.base/jdk.internal.ref=ALL-UNNAMED --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED
--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens
java.management/sun.management=ALL-UNNAMED --add-opens
jdk.management/com.sun.management.internal=ALL-UNNAMED"
diff --git a/openmeetings-server/src/main/assembly/scripts/network_test.sh
b/openmeetings-server/src/main/assembly/scripts/network_test.sh
index 64cb8e903..f3a45942d 100755
--- a/openmeetings-server/src/main/assembly/scripts/network_test.sh
+++ b/openmeetings-server/src/main/assembly/scripts/network_test.sh
@@ -41,7 +41,7 @@ test_jitter_with_ping (){
## $2 - count of send packets
COUNT_PACKETS=1000
-if [ -z "$1" ]; then
+if [ -z "$1" ]; then
ping -c 1000 -f -s $1 $TESTING_HOST 2>&1 >${1}b.out.txt
else
ping -c $2 -f -s $1 $TESTING_HOST 2>&1 >${1}b.out.txt
@@ -58,7 +58,7 @@ if [ "$JITTER" -lt "0" ];then
fi
echo "Jitter = $JITTER for $COUNT_PACKETS packets with size $1 bites (ping)"
echo "Max latency is $MAX"
-if [ "$AVG" != "0" ]; then
+if [ "$AVG" != "0" ]; then
let "JITTERPS=$JITTER*100/$AVG"
echo "Jitter = $JITTERPS % from $AVG ms"
fi
@@ -116,8 +116,8 @@ echo "========================================"
ssh $SSH_LOGIN@$TESTING_HOST "ps -C iperf|cut -d \" \" -f1 | xargs kill -9"
>>server_log.txt 2>&1 &
echo "End outbound test"
sleep 2
- echo
- #Upload test
+ echo
+ #Upload test
#Comment: This we can use any port for testing, I use 12100
PORT=12100
echo "Start inbound test"
diff --git a/openmeetings-server/src/site/markdown/InstallMediaServer.md
b/openmeetings-server/src/site/markdown/InstallMediaServer.md
index 73b2ec476..d18b94711 100644
--- a/openmeetings-server/src/site/markdown/InstallMediaServer.md
+++ b/openmeetings-server/src/site/markdown/InstallMediaServer.md
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache
# Media Server Installation
## Install Kurento Media server
-Each instance of OpenMeetings requires a running Kurento Media Server (KMS).
There is a complete list of installation modes here:
+Each instance of OpenMeetings requires a running Kurento Media Server (KMS).
There is a complete list of installation modes here:
<a
href="https://doc-kurento.readthedocs.io/en/stable/user/installation.html";>Install
Kurento Media server</a>
The default config of OpenMeetings and Kurento Media Server is a 1:1 mapping.
Each OpenMeetings instance is mapped exactly to 1 KMS instance as well as
OpenMeetings and KMS running on the same host.
@@ -20,10 +20,10 @@ The quickest and easiest way to run KMS is via Docker. But
running the following
// for example /home/$user/work/openmeetings
export OM_HOME=$YOUR_PATH
// for example export
OM_HOME=/Users/wagns1/Documents/apache/openmeetings/_REPO/openmeetings/openmeetings-web/target/openmeetings-web-5.0.0-M5-SNAPSHOT
-
+
docker run -v $OM_HOME/data:$OM_HOME/data -p 8888:8888
kurento/kurento-media-server
```
-Assuming OpenMeetings runs on your machine locally above will work without any
config changes in OpenMeetings and is the most common way to spin up a
development environment.
+Assuming OpenMeetings runs on your machine locally above will work without any
config changes in OpenMeetings and is the most common way to spin up a
development environment.
## Specify/Install Turn server
@@ -59,6 +59,6 @@ kurento.certificateType=
in your local
$OM_HOME/webapps/openmeetings/WEB-INF/classes/openmeetings.properties file. A
server restart is required in order for changes to take affect.
-## Other installation and configuration resources
+## Other installation and configuration resources
See the Wiki for much more detailed and linux distribution specific
instructions: <a
href="https://cwiki.apache.org/confluence/display/openmeetings/tutorials+for+installing+openmeetings+and+tools";>https://cwiki.apache.org/confluence/display/openmeetings/tutorials+for+installing+openmeetings+and+tools</a>
diff --git a/openmeetings-server/src/site/stylesheets/errorvalues.xsd
b/openmeetings-server/src/site/stylesheets/errorvalues.xsd
index 5acb78a25..886812c0a 100644
--- a/openmeetings-server/src/site/stylesheets/errorvalues.xsd
+++ b/openmeetings-server/src/site/stylesheets/errorvalues.xsd
@@ -7,16 +7,16 @@
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.
-
+
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
<xs:element name="ROOT">
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 0acde5705..3d8408ccc 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -97,7 +97,7 @@ mvn install -P allModules,quick,mysql -pl
openmeetings-util,openmeetings-db,open
cd openmeetings-web
# Run NPM install on each of the packages (only required once unless you
change dependency):
mvn frontend:npm@main-install frontend:npm@chat-install
frontend:npm@settings-install frontend:npm@room-install frontend:npm@wb-install
-# Run NPM
+# Run NPM
mvn frontend:npm@main frontend:npm@chat frontend:npm@settings
frontend:npm@room frontend:npm@wb
# Minify CSS
mvn minify:minify@theme-minify minify:minify@nettest-js
diff --git a/openmeetings-server/src/site/xdoc/RestAPISample.xml
b/openmeetings-server/src/site/xdoc/RestAPISample.xml
index f8823f562..cf047495d 100644
--- a/openmeetings-server/src/site/xdoc/RestAPISample.xml
+++ b/openmeetings-server/src/site/xdoc/RestAPISample.xml
@@ -22,7 +22,7 @@
<body>
<section name="Introduction">
<p> For a detailed instruction which services, methods
and params are available see the list in the <a
href="/openmeetings-webservice/apidocs/index.html" target="_blank">SOAP/REST
API</a> .
- ALL methods that are implemented for the SOAP
API are also available via REST.
+ ALL methods that are implemented for the SOAP
API are also available via REST.
</p>
<div class="bd-callout bd-callout-info">
There is a <a
href="https://openmeetings.apache.org/swagger/"; target="_blank">OpenAPI
spec</a> published in swagger format.
@@ -136,11 +136,11 @@ const hashResult = await
userService.getRoomHash(sessionId, {
roomId: 1,
moderator: true
})
-
+
// 3. Construct Login URL
const loginUrl = `${BASE_URL}/hash?secure=${hashResult.message}`
</source>
- <p>Full sample source code for can be found at:
+ <p>Full sample source code for can be found at:
<ol>
<li>JavaScript/ES6 example using simplistic
Express website see <a
href="https://github.com/om-hosting/openmeetings-node-js-sample-project";
target="_BLANK">Github openmeetings-node-js-sample-project</a></li>
<li>TypeScript example using simplistic Express
website <a
href="https://github.com/om-hosting/openmeetings-node-sample-project";
target="_BLANK">Github openmeetings-node-sample-project</a></li>
diff --git a/openmeetings-server/src/site/xdoc/commercial-support.xml
b/openmeetings-server/src/site/xdoc/commercial-support.xml
index 0c1341d6a..574aa9245 100644
--- a/openmeetings-server/src/site/xdoc/commercial-support.xml
+++ b/openmeetings-server/src/site/xdoc/commercial-support.xml
@@ -48,7 +48,7 @@
<b>Dedicated Servers</b> - 100, 200,
and 400 concurrent users, see: <a
href="https://om-hosting.com/dedicated-server-data-sheet/";
target="_blank">Dedicated Server Data-Sheet</a>
</li>
<li>
- <b>Elastic Private Cloud</b> - 800,
1600 or more concurrent users, including clustering of KMS, auto-scaling and
load-balancing see:
+ <b>Elastic Private Cloud</b> - 800,
1600 or more concurrent users, including clustering of KMS, auto-scaling and
load-balancing see:
<a
href="https://om-hosting.com/dedicated-server-data-sheet/";
target="_blank">Elastic Private Cloud Data-Sheet</a>
</li>
</ul>
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
index ff4d2d7f1..fc4cdf637 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
@@ -82,7 +82,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
End Prometheus -->
-
+
<filter-mapping>
<filter-name>OpenmeetingsApplication</filter-name>
<url-pattern>/*</url-pattern>
diff --git a/openmeetings-web/src/main/webapp/data/conf/om_ldap.cfg
b/openmeetings-web/src/main/webapp/data/conf/om_ldap.cfg
index 6c1a89c2e..7e29a86b5 100644
--- a/openmeetings-web/src/main/webapp/data/conf/om_ldap.cfg
+++ b/openmeetings-web/src/main/webapp/data/conf/om_ldap.cfg
@@ -6,16 +6,16 @@
# 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.
-#
+#
#ConfigurationFile for LDAP Auth
#ConfigKey 'ldap_config_path' must be set in DataBase Configration of OM and
point to this file
#o.becherer,14.01.2009
@@ -24,7 +24,7 @@
# This is the URL used to access your LDAP server.
# if you want to use "ldaps://" links, please be aware that you need to import
your CA certificate
# to a java keystore and add the -Djavax.net.ssl.keyStore,
-Djavax.net.ssl.keyStorePassword,
-# -Djavax.net.ssl.trustStore and -Djavax.net.ssl.trustStorePassword
parameters to your
+# -Djavax.net.ssl.trustStore and -Djavax.net.ssl.trustStorePassword
parameters to your
# JAVA_OPT environment
ldap_conn_host=dc2.medint.local
ldap_conn_port=389
@@ -40,7 +40,7 @@ ldap_passwd=dummy07
# base to search for userdata(of user, that wants to login)
ldap_search_base=OU=Company,DC=medint,DC=local
-# Fieldnames (can differ between Ldap servers)
+# Fieldnames (can differ between Ldap servers)
ldap_search_query=(uid=%s)
# the scope of the search might be: OBJECT, ONELEVEL, SUBTREE
@@ -100,7 +100,7 @@ ldap_group_attr=memberOf
#ldap_user_picture_uri=picture_uri
# optional
-# the timezone has to match any timezone available in Java, otherwise the
timezone defined in the value of
+# the timezone has to match any timezone available in Java, otherwise the
timezone defined in the value of
# the conf_key "default.timezone" in OpenMeetings "configurations" table
#ldap_user_timezone=timezone
diff --git a/openmeetings-web/src/main/webapp/images/arcArrow.svg
b/openmeetings-web/src/main/webapp/images/arcArrow.svg
index 2eecd4064..762ad73ae 100644
--- a/openmeetings-web/src/main/webapp/images/arcArrow.svg
+++ b/openmeetings-web/src/main/webapp/images/arcArrow.svg
@@ -7,16 +7,16 @@
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.
-
+
-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
diff --git a/openmeetings-web/src/main/webapp/images/profile.svg
b/openmeetings-web/src/main/webapp/images/profile.svg
index c7cea7cc3..9742b9df7 100644
--- a/openmeetings-web/src/main/webapp/images/profile.svg
+++ b/openmeetings-web/src/main/webapp/images/profile.svg
@@ -7,16 +7,16 @@
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.
-
+
-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
index 2de263a28..3f52b008f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
@@ -48,8 +48,10 @@ class TestImportUser extends AbstractTestImport {
@Test
void importUsers() throws Exception {
long userCount = userDao.count();
- File users = new
File(getClass().getClassLoader().getResource(BACKUP_ROOT +
"user/users.xml").toURI());
- backupImport.importUsers(users.getParentFile());
+ File userRoot = new
File(getClass().getClassLoader().getResource(BACKUP_ROOT +
"user/users.xml").toURI())
+ .getParentFile();
+ backupImport.importGroups(userRoot);
+ backupImport.importUsers(userRoot);
assertEquals(userCount + 8, userDao.count(), "Users should be
added");
User ext = userDao.getExternalUser("234", "TheBestCms");
assertNotNull(ext, "External user should be imported");
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
index f4c4683c1..5233a9cbb 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
@@ -108,6 +108,7 @@ class TestUserGroup extends AbstractOmServerTest {
@Test
@Tag("heavy-test")
void add10kUsers() throws Exception {
+ final int amount = 10_000;
List<Group> groups = groupDao.get(GROUP_NAME, 0, 1, null);
Group g = null;
if (groups == null || groups.isEmpty()) {
@@ -117,10 +118,13 @@ class TestUserGroup extends AbstractOmServerTest {
} else {
g = groups.get(0);
}
- for (int i = 0; i < 10000; ++i) {
+ long count = userDao.count();
+ for (int i = 0; i < amount; ++i) {
User u = createUser();
u.addGroup(g);
userDao.update(u, null);
}
+ long newCount = userDao.count();
+ assertEquals(count + amount, newCount, "All users should be
added");
}
}
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
index 0a43f26e9..51c198a65 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see https://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see https://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<organisations>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/ldap/ldapconfigs.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/ldap/ldapconfigs.xml
index b95252fcf..89b229589 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/ldap/ldapconfigs.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/ldap/ldapconfigs.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see https://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see https://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<ldapconfigs>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/menu/extraMenus.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/menu/extraMenus.xml
index d3e46560d..5a34fade1 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/menu/extraMenus.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/menu/extraMenus.xml
@@ -24,12 +24,6 @@ you should use the BackupPanel to modify or change this file
see http://openmeetings.apache.org/Upgrade.html for Details
###############################################
-->
- <!--###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see https://openmeetings.apache.org/Upgrade.html for Details
-###############################################
--->
<root>
<ExtraMenus>
<ExtraMenu>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/ldapconfigs.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/ldapconfigs.xml
index 9962f549f..68bde5b1e 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/ldapconfigs.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/ldap/ldapconfigs.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see https://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see https://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<ldapconfigs>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/organizations.xml
similarity index 83%
copy from
openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
copy to
openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/organizations.xml
index 0a43f26e9..63437a651 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/group/organizations.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/organizations.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see https://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see https://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<organisations>
@@ -29,8 +29,8 @@ see https://openmeetings.apache.org/Upgrade.html for Details
<created class="java.util.Date"><![CDATA[1576589928000]]></created>
<updated class="java.util.Date"><![CDATA[1539919117000]]></updated>
<deleted><![CDATA[false]]></deleted>
- <organisation_id><![CDATA[1]]></organisation_id>
- <name><![CDATA[unit_test_1]]></name>
+ <organisation_id><![CDATA[1001]]></organisation_id>
+ <name><![CDATA[TheBestCms]]></name>
<limited><![CDATA[false]]></limited>
<restricted><![CDATA[false]]></restricted>
<maxFilesSize><![CDATA[0]]></maxFilesSize>
@@ -38,7 +38,7 @@ see https://openmeetings.apache.org/Upgrade.html for Details
<maxRooms><![CDATA[0]]></maxRooms>
<recordingTtl><![CDATA[0]]></recordingTtl>
<reminderDays><![CDATA[0]]></reminderDays>
- <external><![CDATA[false]]></external>
+ <external><![CDATA[true]]></external>
</organisation>
</organisations>
</root>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
index d3b940098..08e327dab 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/user/users.xml
@@ -239,6 +239,12 @@ see http://openmeetings.apache.org/Upgrade.html for Details
<type><![CDATA[eXtErNaL]]></type>
<rights class="org.apache.openjpa.util.java$util$HashSet$proxy"/>
<externalUserId>234</externalUserId>
+ <organisations
class="org.apache.openjpa.util.java$util$ArrayList$proxy">
+ <user_organisation>
+ <organisation_id><![CDATA[1001]]></organisation_id>
+ <moderator><![CDATA[false]]></moderator>
+ </user_organisation>
+ </organisations>
<externalUserType>TheBestCms</externalUserType>
</user>
</users>
diff --git
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/version/version.xml
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/version/version.xml
index bab98e90c..ccd9b953b 100644
---
a/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/version/version.xml
+++
b/openmeetings-web/src/test/resources/org/apache/openmeetings/backup/version/version.xml
@@ -19,9 +19,9 @@
-->
<!-- ###############################################
-This File is auto-generated by the Backup Tool
-you should use the BackupPanel to modify or change this file
-see https://openmeetings.apache.org/Upgrade.html for Details
+This File is auto-generated by the Backup Tool
+you should use the BackupPanel to modify or change this file
+see https://openmeetings.apache.org/Upgrade.html for Details
###############################################
--><root>
<version>
