You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/08/29 04:53:24 UTC
[openmeetings] branch java11-modules updated (6fe76fbd7 -> 58ff1891d)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
discard 6fe76fbd7 More work on JPMS
discard 5c41669cb [OPENMEETINGS-2732] logback
discard f810250bd Build fixed
discard 09113dae6 Code clean-up
discard 879e14624 The build is green
discard 7b8ac068b Some more work on modules
discard 0f46d3f7c Another attempt to fix the build
discard 5ddae76e5 some compilation errors are resolved
discard a77d4f33e OpenJpa modules were changed
discard b6a781670 Simple-xml is dropped
discard eb942546d no jira: project is partially converted to use java11 modules
add 1842b0381 [OPENMEETINGS-2732] tomcat, asterisk-java, swagger
add 8346c499c [OPENMEETINGS-2732] junit and plugins
add efbb6c35b [OPENMEETINGS-2732] build is fixed
add 0f379f363 OPENMEETINGS-2748 Add and update build instructions.
add 9eb4d4afa [OPENMEETINGS-2732] maven-site-plugin, font-awesome, postgresql, mssql, ldap-api, bytebuddy
add 41f43c7b7 [OPENMEETINGS-2732] maven-javadoc-plugin, maven-project-info-reports-plugin, mockito
add d6adb81b3 [OPENMEETINGS-2738] fabric is updated, temporary fix is dropped
add c3ec5989f [OPENMEETINGS-2732] ical4j, oracle and postgress DB driver, LDAP API, slf4j, logback and bytebuddy
new 7d2b24a87 no jira: project is partially converted to use java11 modules
new 10be8ec94 Simple-xml is dropped
new 164f9284b OpenJpa modules were changed
new 87c2fd260 some compilation errors are resolved
new 92a413091 Another attempt to fix the build
new d8cfb4bbf Some more work on modules
new 316e65970 The build is green
new 67926eec5 Code clean-up
new 2da5cb568 Build fixed
new 58ff1891d More work on JPMS
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6fe76fbd7)
\
N -- N -- N refs/heads/java11-modules (58ff1891d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
openmeetings-server/pom.xml | 2 +-
.../src/site/xdoc/BuildInstructions.xml | 20 ++++++++-
openmeetings-web/src/main/front/chat/package.json | 2 +-
openmeetings-web/src/main/front/main/package.json | 2 +-
openmeetings-web/src/main/front/room/package.json | 2 +-
.../src/main/front/settings/package.json | 2 +-
openmeetings-web/src/main/front/wb/package.json | 4 +-
openmeetings-web/src/main/front/wb/src/wb.js | 6 +--
pom.xml | 50 ++++++++++++----------
9 files changed, 54 insertions(+), 36 deletions(-)
[openmeetings] 05/10: Another attempt to fix the build
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 92a413091a50c4c004e761385b6c9c52acf7e08a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jul 3 18:07:33 2021 +0700
Another attempt to fix the build
---
openmeetings-core/src/main/java/module-info.java | 3 ---
openmeetings-db/src/main/java/module-info.java | 1 -
openmeetings-util/src/main/java/module-info.java | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java
index 7b874cd9c..6495df2b8 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -22,8 +22,6 @@ module apache.openmeetings.core {
requires transitive org.apache.commons.io;
- requires transitive spring.context;
-
requires kurento.client;
requires kurento.commons;
requires kurento.jsonrpc.client;
@@ -36,7 +34,6 @@ module apache.openmeetings.core {
requires jodconverter.core;
requires jodconverter.local;
requires org.apache.directory.ldap.api.all;
- requires tika.core;
requires tika.parsers;
requires javax.inject;
requires wicket.ioc;
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index d8849cf89..671932f9f 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -56,7 +56,6 @@ module apache.openmeetings.db {
requires transitive spring.core;
requires spring.tx;
- requires spring.context;
requires javax.persistence;
requires openjpa;
requires java.xml.bind;
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index 65ecb4f2b..3032e41b1 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -44,6 +44,6 @@ module apache.openmeetings.util {
requires transitive org.mnode.ical4j.core;
requires transitive tika.core;
requires org.aspectj.tools;
- requires spring.context;
+ requires transitive spring.context;
requires simpleclient;
}
[openmeetings] 04/10: some compilation errors are resolved
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 87c2fd26065926e4870c442e14bcaa76bfc62e87
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jul 3 13:00:04 2021 +0700
some compilation errors are resolved
---
openmeetings-core/src/main/java/module-info.java | 11 +++++++++--
openmeetings-db/src/main/java/module-info.java | 5 ++---
openmeetings-util/src/main/java/module-info.java | 12 ++++++++----
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java
index 833be8717..7b874cd9c 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -30,11 +30,18 @@ module apache.openmeetings.core {
requires java.activation;
requires com.google.gson;
requires java.mail;
- requires api.all;
- requires org.apache.tika.parsers;
requires java.xml;
requires xstream;
requires jodconverter.core;
requires jodconverter.local;
+ requires org.apache.directory.ldap.api.all;
+ requires tika.core;
+ requires tika.parsers;
+ requires javax.inject;
+ requires wicket.ioc;
+ requires java.annotation;
+ requires apache.openmeetings.util;
+ requires asterisk.java;
+ requires jain.sip.ri;
}
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 120187f78..d8849cf89 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -49,8 +49,8 @@ module apache.openmeetings.db {
exports org.apache.openmeetings.db.util.ws;
requires transitive apache.openmeetings.util;
- requires transitive org.apache.wicket.request;
- requires transitive org.apache.wicket.websocket.core;
+ requires transitive wicket.request;
+ requires transitive wicket.native.websocket.core;
requires transitive spring.beans;
requires transitive spring.web;
requires transitive spring.core;
@@ -59,7 +59,6 @@ module apache.openmeetings.db {
requires spring.context;
requires javax.persistence;
requires openjpa;
- requires asterisk.java;
requires java.xml.bind;
requires org.apache.commons.text;
}
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index 72dfb3c61..65ecb4f2b 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -22,16 +22,16 @@ module apache.openmeetings.util {
exports org.apache.openmeetings.util.mail;
exports org.apache.openmeetings.util.process;
exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
requires transitive javax.servlet.api;
- requires transitive org.apache.wicket.util;
- requires transitive org.apache.wicket.core;
- requires transitive org.apache.wicket.extensions;
+ requires transitive wicket.util;
+ requires transitive wicket.core;
+ requires transitive wicket.extensions;
requires transitive org.apache.commons.codec;
requires transitive org.apache.commons.lang3;
- requires transitive org.apache.tika.core;
requires transitive com.github.openjson;
requires transitive org.slf4j;
@@ -42,4 +42,8 @@ module apache.openmeetings.util {
requires transitive org.bouncycastle.provider;
requires transitive java.activation;
requires transitive org.mnode.ical4j.core;
+ requires transitive tika.core;
+ requires org.aspectj.tools;
+ requires spring.context;
+ requires simpleclient;
}
[openmeetings] 08/10: Code clean-up
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 67926eec5172f6658f430e47fa24d68b5d614e64
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Apr 21 16:52:42 2022 +0700
Code clean-up
---
.../src/test/java/org/apache/openmeetings/backup/TestExport.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
index 5e51cb8de..6325193a4 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
@@ -64,14 +64,6 @@ class TestExport extends AbstractOmServerTest {
JAXBContext jc = JAXBContext.newInstance(eClazz);
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- /* FIXME TODO
- marshaller.setProperty(CharacterEscapeHandler.class.getName(), new CharacterEscapeHandler() {
- @Override
- public void escape(char[] ac, int i, int j, boolean flag, Writer writer) throws IOException {
- writer.write(ac, i, j);
- }
- });
- */
StringWriter writer = new StringWriter();
marshaller.marshal(u, writer);
Assertions.assertNotNull(writer.getBuffer());
[openmeetings] 01/10: no jira: project is partially converted to use java11 modules
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 7d2b24a876df9a02b73d16c88db877c90c0c2fcc
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Feb 18 00:32:32 2020 +0700
no jira: project is partially converted to use java11 modules
---
openmeetings-core/src/main/java/module-info.java | 40 +++++++++++++
openmeetings-db/src/main/java/module-info.java | 66 ++++++++++++++++++++++
.../apache/openmeetings/db/dao/label/LabelDao.java | 4 +-
openmeetings-util/src/main/java/module-info.java | 45 +++++++++++++++
4 files changed, 153 insertions(+), 2 deletions(-)
diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java
new file mode 100644
index 000000000..833be8717
--- /dev/null
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+module apache.openmeetings.core {
+ requires transitive apache.openmeetings.db;
+
+ requires transitive org.apache.commons.io;
+
+ requires transitive spring.context;
+
+ requires kurento.client;
+ requires kurento.commons;
+ requires kurento.jsonrpc.client;
+ requires java.activation;
+ requires com.google.gson;
+ requires java.mail;
+ requires api.all;
+ requires org.apache.tika.parsers;
+ requires java.xml;
+ requires xstream;
+
+ requires jodconverter.core;
+ requires jodconverter.local;
+}
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
new file mode 100644
index 000000000..2d01a8c92
--- /dev/null
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+module apache.openmeetings.db {
+ exports org.apache.openmeetings;
+ exports org.apache.openmeetings.db.dao;
+ exports org.apache.openmeetings.db.dao.basic;
+ exports org.apache.openmeetings.db.dao.calendar;
+ exports org.apache.openmeetings.db.dao.file;
+ exports org.apache.openmeetings.db.dao.label;
+ exports org.apache.openmeetings.db.dao.log;
+ exports org.apache.openmeetings.db.dao.record;
+ exports org.apache.openmeetings.db.dao.room;
+ exports org.apache.openmeetings.db.dao.server;
+ exports org.apache.openmeetings.db.dao.user;
+ exports org.apache.openmeetings.db.dto.basic;
+ exports org.apache.openmeetings.db.dto.calendar;
+ exports org.apache.openmeetings.db.dto.file;
+ exports org.apache.openmeetings.db.dto.record;
+ exports org.apache.openmeetings.db.dto.room;
+ exports org.apache.openmeetings.db.dto.user;
+ exports org.apache.openmeetings.db.entity;
+ exports org.apache.openmeetings.db.entity.basic;
+ exports org.apache.openmeetings.db.entity.calendar;
+ exports org.apache.openmeetings.db.entity.file;
+ exports org.apache.openmeetings.db.entity.label;
+ exports org.apache.openmeetings.db.entity.log;
+ exports org.apache.openmeetings.db.entity.record;
+ exports org.apache.openmeetings.db.entity.room;
+ exports org.apache.openmeetings.db.entity.server;
+ exports org.apache.openmeetings.db.entity.user;
+ exports org.apache.openmeetings.db.manager;
+ exports org.apache.openmeetings.db.util;
+ exports org.apache.openmeetings.db.util.ws;
+
+ requires transitive apache.openmeetings.util;
+ requires transitive org.apache.wicket.request;
+ requires transitive org.apache.wicket.websocket.core;
+ requires transitive spring.beans;
+ requires transitive simple.xml;
+ requires transitive spring.web;
+ requires transitive spring.core;
+
+ requires spring.tx;
+ requires spring.context;
+ requires java.persistence;
+ requires openjpa;
+ requires asterisk.java;
+ requires java.xml.bind;
+ requires org.apache.commons.text;
+}
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 5c7db7d25..8560f8727 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
@@ -46,7 +46,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.label.OmLanguage;
import org.apache.openmeetings.db.entity.label.StringLabel;
@@ -193,7 +192,8 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
}
List<StringLabel> result = new ArrayList<>(labelCache.containsKey(l) ? labelCache.get(l) : new ArrayList<StringLabel>());
if (!Strings.isEmpty(search)) {
- CollectionUtils.filter(result, o -> o != null && (o.getKey().contains(search) || o.getValue().contains(search)));
+ result = result.stream().filter(o -> o != null && (o.getKey().contains(search) || o.getValue().contains(search)))
+ .collect(Collectors.toList());
}
return result;
}
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
new file mode 100644
index 000000000..72dfb3c61
--- /dev/null
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+module apache.openmeetings.util {
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+
+ requires transitive javax.servlet.api;
+
+ requires transitive org.apache.wicket.util;
+ requires transitive org.apache.wicket.core;
+ requires transitive org.apache.wicket.extensions;
+
+ requires transitive org.apache.commons.codec;
+ requires transitive org.apache.commons.lang3;
+ requires transitive org.apache.tika.core;
+
+ requires transitive com.github.openjson;
+ requires transitive org.slf4j;
+ requires transitive logback.classic;
+ requires transitive logback.core;
+ requires transitive dom4j;
+ requires transitive jcip.annotations;
+ requires transitive org.bouncycastle.provider;
+ requires transitive java.activation;
+ requires transitive org.mnode.ical4j.core;
+}
[openmeetings] 06/10: Some more work on modules
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit d8cfb4bbfe8e54caf126015a631ab61223431ca2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jul 23 10:22:37 2021 +0700
Some more work on modules
---
openmeetings-db/src/main/java/module-info.java | 4 +--
openmeetings-util/src/main/java/module-info.java | 37 ++++++++++++------------
openmeetings-util/src/test/java/module-info.test | 25 ++++++++++++++++
pom.xml | 10 +++++++
4 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 671932f9f..aa1690d87 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -49,8 +49,8 @@ module apache.openmeetings.db {
exports org.apache.openmeetings.db.util.ws;
requires transitive apache.openmeetings.util;
- requires transitive wicket.request;
- requires transitive wicket.native.websocket.core;
+ requires transitive org.apache.wicket.request;
+ requires transitive org.apache.wicket.websocket.core;
requires transitive spring.beans;
requires transitive spring.web;
requires transitive spring.core;
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index 3032e41b1..ecd52506e 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -16,34 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-module apache.openmeetings.util {
- exports org.apache.openmeetings.util;
- exports org.apache.openmeetings.util.crypt;
- exports org.apache.openmeetings.util.mail;
- exports org.apache.openmeetings.util.process;
- exports org.apache.openmeetings.util.ws;
- exports org.apache.openmeetings.util.logging;
-
- requires transitive javax.servlet.api;
-
- requires transitive wicket.util;
- requires transitive wicket.core;
- requires transitive wicket.extensions;
+module org.apache.openmeetings.util {
+ requires transitive org.apache.wicket.util;
+ requires transitive org.apache.wicket.core;
+ requires transitive org.apache.wicket.extensions;
requires transitive org.apache.commons.codec;
requires transitive org.apache.commons.lang3;
requires transitive com.github.openjson;
requires transitive org.slf4j;
- requires transitive logback.classic;
- requires transitive logback.core;
- requires transitive dom4j;
- requires transitive jcip.annotations;
requires transitive org.bouncycastle.provider;
- requires transitive java.activation;
+ requires transitive jakarta.activation;
requires transitive org.mnode.ical4j.core;
- requires transitive tika.core;
requires org.aspectj.tools;
+ requires transitive javax.servlet.api;
+ requires transitive tika.core;
requires transitive spring.context;
+ requires transitive logback.classic;
+ requires transitive logback.core;
+ requires transitive dom4j;
+ requires transitive jcip.annotations;
requires simpleclient;
+
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
}
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-util/src/test/java/module-info.test
new file mode 100644
index 000000000..5987c837c
--- /dev/null
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+module org.apache.openmeetings.util.test {
+ requires transitive org.apache.openmeetings.util;
+
+ //tests
+ requires org.junit.jupiter.engine;
+ requires org.junit.jupiter.api;
+}
diff --git a/pom.xml b/pom.xml
index c6a176a79..03ba9e64c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,6 +659,16 @@
<artifactId>wicket-spring</artifactId>
<version>${wicket.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-datastore-hazelcast</artifactId>
+ <version>${wicketstuff.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-jquery-ui-calendar</artifactId>
+ <version>${wicket-jquery-ui.version}</version>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
[openmeetings] 10/10: More work on JPMS
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 58ff1891d80a97e69ee1f70e9c74272aeabf4152
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 14 15:48:18 2022 +0700
More work on JPMS
---
openmeetings-core/pom.xml | 1 -
openmeetings-core/src/main/java/module-info.java | 28 ++++++------
openmeetings-db/pom.xml | 1 -
openmeetings-db/src/main/java/module-info.java | 13 +++---
openmeetings-install/pom.xml | 1 -
.../src/main/java/module-info.java | 15 ++++---
openmeetings-mediaserver/pom.xml | 1 -
.../src/main/java/module-info.java | 16 ++++---
openmeetings-screenshare/pom.xml | 1 -
openmeetings-server/pom.xml | 1 -
openmeetings-service/pom.xml | 1 -
.../src/main/java/module-info.java | 20 +++++----
openmeetings-util/pom.xml | 1 -
openmeetings-util/src/main/java/module-info.java | 36 ++++++++--------
openmeetings-util/src/test/java/module-info.test | 30 ++++++++++++-
openmeetings-web/pom.xml | 1 -
openmeetings-web/src/main/java/module-info.java | 50 ++++++++++++++++++++++
.../openmeetings/web/admin/extra/ExtraPanel.java | 2 +-
.../util/logging/OpenMeetingsMetricsServlet.java | 3 +-
openmeetings-webservice/pom.xml | 1 -
.../src/main/java/module-info.java | 20 ++++-----
pom.xml | 12 ------
22 files changed, 162 insertions(+), 93 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 02360662b..652baa6da 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -31,7 +31,6 @@
<description>Module for OpenMeetings core classes and services</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.core</autoModuleName>
</properties>
<build>
<plugins>
diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java
index 6495df2b8..ec9973b40 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -17,28 +17,30 @@
* under the License.
*/
-module apache.openmeetings.core {
- requires transitive apache.openmeetings.db;
+module org.apache.openmeetings.core {
+ exports org.apache.openmeetings.core.converter;
+ exports org.apache.openmeetings.core.data.file;
+ exports org.apache.openmeetings.core.ldap;
+ exports org.apache.openmeetings.core.mail;
+ exports org.apache.openmeetings.core.notifier;
+ exports org.apache.openmeetings.core.rss;
+ exports org.apache.openmeetings.core.sip;
+ exports org.apache.openmeetings.core.util;
+
+ requires transitive org.apache.openmeetings.db;
requires transitive org.apache.commons.io;
+ requires transitive java.annotation;
+ requires transitive java.xml;
- requires kurento.client;
- requires kurento.commons;
- requires kurento.jsonrpc.client;
- requires java.activation;
- requires com.google.gson;
- requires java.mail;
- requires java.xml;
requires xstream;
requires jodconverter.core;
requires jodconverter.local;
requires org.apache.directory.ldap.api.all;
- requires tika.parsers;
requires javax.inject;
- requires wicket.ioc;
- requires java.annotation;
- requires apache.openmeetings.util;
requires asterisk.java;
requires jain.sip.ri;
+ requires org.apache.tika.parsers;
+ requires jakarta.mail;
}
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 9e754e4ed..e43709042 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -31,7 +31,6 @@
<description>OpenMeetings module for all Database/DTO related classes</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.db</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index aa1690d87..f65ad04b8 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-module apache.openmeetings.db {
+module org.apache.openmeetings.db {
exports org.apache.openmeetings;
+ exports org.apache.openmeetings.db.bind;
+ exports org.apache.openmeetings.db.bind.adapter;
exports org.apache.openmeetings.db.dao;
exports org.apache.openmeetings.db.dao.basic;
exports org.apache.openmeetings.db.dao.calendar;
@@ -45,19 +47,20 @@ module apache.openmeetings.db {
exports org.apache.openmeetings.db.entity.server;
exports org.apache.openmeetings.db.entity.user;
exports org.apache.openmeetings.db.manager;
+ exports org.apache.openmeetings.db.mapper;
exports org.apache.openmeetings.db.util;
exports org.apache.openmeetings.db.util.ws;
- requires transitive apache.openmeetings.util;
+ requires transitive org.apache.openmeetings.util;
requires transitive org.apache.wicket.request;
requires transitive org.apache.wicket.websocket.core;
+ requires transitive org.apache.commons.text;
+ requires transitive java.xml.bind;
+ requires transitive org.apache.openjpa;
requires transitive spring.beans;
requires transitive spring.web;
requires transitive spring.core;
requires spring.tx;
requires javax.persistence;
- requires openjpa;
- requires java.xml.bind;
- requires org.apache.commons.text;
}
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index 73c79c29f..8e5dbb082 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -31,7 +31,6 @@
<description>Module for OpenMeetings command line admin and classes necessary for installer.</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.install</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-install/src/main/java/module-info.java
similarity index 71%
copy from openmeetings-util/src/test/java/module-info.test
copy to openmeetings-install/src/main/java/module-info.java
index 5987c837c..cb5c126f9 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-install/src/main/java/module-info.java
@@ -16,10 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-module org.apache.openmeetings.util.test {
- requires transitive org.apache.openmeetings.util;
- //tests
- requires org.junit.jupiter.engine;
- requires org.junit.jupiter.api;
+module org.apache.openmeetings.install {
+ exports org.apache.openmeetings.backup;
+ exports org.apache.openmeetings.cli;
+ exports org.apache.openmeetings.installation;
+
+ requires transitive org.apache.openmeetings.core;
+ requires java.desktop;
+ requires commons.cli;
+ requires spring.context.support;
+ requires quartz;
}
diff --git a/openmeetings-mediaserver/pom.xml b/openmeetings-mediaserver/pom.xml
index 2f725fdc7..79713d9f8 100644
--- a/openmeetings-mediaserver/pom.xml
+++ b/openmeetings-mediaserver/pom.xml
@@ -31,7 +31,6 @@
<description>Module for OpenMeetings MediaServer classes and services</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.mediaserver</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-mediaserver/src/main/java/module-info.java
similarity index 71%
copy from openmeetings-util/src/test/java/module-info.test
copy to openmeetings-mediaserver/src/main/java/module-info.java
index 5987c837c..47ee94e67 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-mediaserver/src/main/java/module-info.java
@@ -16,10 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-module org.apache.openmeetings.util.test {
- requires transitive org.apache.openmeetings.util;
- //tests
- requires org.junit.jupiter.engine;
- requires org.junit.jupiter.api;
+module org.apache.openmeetings.mediaserver {
+ exports org.apache.openmeetings.mediaserver;
+
+ requires transitive org.apache.openmeetings.core;
+ requires transitive org.apache.wicket.ioc;
+
+ requires kurento.client;
+ requires kurento.jsonrpc.client;
+ requires kurento.commons;
+ requires javax.inject;
+ requires com.google.gson;
}
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 8ed871c9a..b556bb90c 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -37,7 +37,6 @@
<key.alias>screen</key.alias>
<site.basedir>${project.parent.basedir}</site.basedir>
<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
- <autoModuleName>apache.openmeetings.screenshare</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index a31e48ec7..eb0088e93 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -40,7 +40,6 @@
<om.webapp>webapps/openmeetings</om.webapp>
<root.webapp>webapps/ROOT</root.webapp>
<server-file.dir>web-server</server-file.dir>
- <autoModuleName>apache.openmeetings.server</autoModuleName>
</properties>
<url>https://openmeetings.apache.org</url>
<scm>
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index 064613460..cfdf4a7a6 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/pom.xml
@@ -31,7 +31,6 @@
<description>Module for OpenMeetings schedulers, mail templates and managers.</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.service</autoModuleName>
</properties>
<dependencies>
<dependency>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-service/src/main/java/module-info.java
similarity index 62%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
copy to openmeetings-service/src/main/java/module-info.java
index 05c1555a6..2969affec 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++ b/openmeetings-service/src/main/java/module-info.java
@@ -16,17 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.util.logging;
-import io.prometheus.client.exporter.MetricsServlet;
+module org.apache.openmeetings.service {
+ exports org.apache.openmeetings.service.calendar.caldav;
+ exports org.apache.openmeetings.service.mail;
+ exports org.apache.openmeetings.service.mail.template;
+ exports org.apache.openmeetings.service.room;
-public class OpenMeetingsMetricsServlet extends MetricsServlet {
+ requires transitive org.apache.openmeetings.core;
- private static final long serialVersionUID = -2488393857088858502L;
-
- public OpenMeetingsMetricsServlet() {
- super();
- new TomcatGenericExports(false).register();
- }
+ requires transitive org.apache.wicket.spring;
+ requires org.apache.httpcomponents.httpcore;
+ requires org.apache.httpcomponents.httpclient;
+ requires jackrabbit.webdav;
+ requires caldav4j;
}
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 11f0d4473..d863c0f9a 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -31,7 +31,6 @@
<description>Module for utility classes being used by all OpenMeetings modules</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.util</autoModuleName>
</properties>
<build>
<plugins>
diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java
index ecd52506e..fdb492512 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -17,32 +17,30 @@
* under the License.
*/
module org.apache.openmeetings.util {
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
+
requires transitive org.apache.wicket.util;
requires transitive org.apache.wicket.core;
requires transitive org.apache.wicket.extensions;
-
- requires transitive org.apache.commons.codec;
requires transitive org.apache.commons.lang3;
-
requires transitive com.github.openjson;
requires transitive org.slf4j;
- requires transitive org.bouncycastle.provider;
- requires transitive jakarta.activation;
- requires transitive org.mnode.ical4j.core;
- requires org.aspectj.tools;
requires transitive javax.servlet.api;
- requires transitive tika.core;
+ requires transitive org.apache.tika.core;
requires transitive spring.context;
- requires transitive logback.classic;
- requires transitive logback.core;
- requires transitive dom4j;
- requires transitive jcip.annotations;
- requires simpleclient;
+ requires transitive org.apache.commons.codec;
- exports org.apache.openmeetings.util;
- exports org.apache.openmeetings.util.crypt;
- exports org.apache.openmeetings.util.mail;
- exports org.apache.openmeetings.util.process;
- exports org.apache.openmeetings.util.ws;
- exports org.apache.openmeetings.util.logging;
+ requires org.bouncycastle.provider;
+ requires jakarta.activation;
+ requires org.mnode.ical4j.core;
+ requires org.aspectj.tools;
+ requires dom4j;
+ requires simpleclient;
+ requires ch.qos.logback.classic;
+ requires ch.qos.logback.core;
}
diff --git a/openmeetings-util/src/test/java/module-info.test b/openmeetings-util/src/test/java/module-info.test
index 5987c837c..b65dab769 100644
--- a/openmeetings-util/src/test/java/module-info.test
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -16,8 +16,34 @@
* specific language governing permissions and limitations
* under the License.
*/
-module org.apache.openmeetings.util.test {
- requires transitive org.apache.openmeetings.util;
+open module org.apache.openmeetings.util {
+ // This one should be in-sync with module-info.java
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
+
+ requires transitive org.apache.wicket.util;
+ requires transitive org.apache.wicket.core;
+ requires transitive org.apache.wicket.extensions;
+ requires transitive org.apache.commons.lang3;
+ requires transitive com.github.openjson;
+ requires transitive org.slf4j;
+ requires transitive javax.servlet.api;
+ requires transitive org.apache.tika.core;
+ requires transitive spring.context;
+ requires transitive org.apache.commons.codec;
+
+ requires org.bouncycastle.provider;
+ requires jakarta.activation;
+ requires org.mnode.ical4j.core;
+ requires org.aspectj.tools;
+ requires dom4j;
+ requires simpleclient;
+ requires ch.qos.logback.classic;
+ requires ch.qos.logback.core;
//tests
requires org.junit.jupiter.engine;
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 45331cbcf..a9b4d5d3c 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -32,7 +32,6 @@
<properties>
<old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.web</autoModuleName>
</properties>
<profiles>
<profile>
diff --git a/openmeetings-web/src/main/java/module-info.java b/openmeetings-web/src/main/java/module-info.java
new file mode 100644
index 000000000..346ccc2c1
--- /dev/null
+++ b/openmeetings-web/src/main/java/module-info.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+module org.apache.openmeetings.web {
+ requires org.apache.openmeetings.install;
+ requires org.apache.openmeetings.mediaserver;
+ requires org.apache.openmeetings.webservice;
+
+ requires org.apache.wicket.auth.roles;
+ requires org.apache.wicket.devutils;
+ requires wicketstuff.dashboard.core;
+ requires wicketstuff.datastore.hazelcast;
+ requires wicketstuff.select2;
+ requires wicketstuff.urlfragment;
+ requires jqplot;
+ requires jqplot4java;
+ requires wicket.bootstrap.extensions;
+ requires wicket.bootstrap.core;
+ requires wicket.bootstrap.themes;
+ requires wicket.webjars;
+ requires wicket.jquery.ui;
+ requires wicket.jquery.ui.calendar;
+ requires wicket.jquery.ui.core;
+ requires wicket.jquery.ui.plugins;
+
+ requires java.net.http;
+ requires java.sql;
+ requires javax.websocket.api;
+ requires com.hazelcast.core;
+ requires org.danekja.jdk.serializable.functional;
+ requires spring.orm;
+ requires java.management;
+ requires simpleclient.servlet;
+}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java
index 4d0b215e1..0152a6429 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.java
@@ -68,7 +68,7 @@ public class ExtraPanel extends AdminBasePanel {
};
add(list.add(dataView).setOutputMarkupId(true));
final PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID = -1L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
index 05c1555a6..1b9bdd531 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
@@ -21,8 +21,7 @@ package org.apache.openmeetings.web.util.logging;
import io.prometheus.client.exporter.MetricsServlet;
public class OpenMeetingsMetricsServlet extends MetricsServlet {
-
- private static final long serialVersionUID = -2488393857088858502L;
+ private static final long serialVersionUID = 1L;
public OpenMeetingsMetricsServlet() {
super();
diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml
index 8c8516d56..b4aecd0cd 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -31,7 +31,6 @@
<description>Module for OpenMeetings CXF based web services.</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
- <autoModuleName>apache.openmeetings.webservice</autoModuleName>
</properties>
<build>
<plugins>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-webservice/src/main/java/module-info.java
similarity index 70%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
copy to openmeetings-webservice/src/main/java/module-info.java
index 05c1555a6..9fa9d844d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java
+++ b/openmeetings-webservice/src/main/java/module-info.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.util.logging;
-import io.prometheus.client.exporter.MetricsServlet;
+module org.apache.openmeetings.webservice {
+ requires transitive org.apache.openmeetings.service;
-public class OpenMeetingsMetricsServlet extends MetricsServlet {
-
- private static final long serialVersionUID = -2488393857088858502L;
-
- public OpenMeetingsMetricsServlet() {
- super();
- new TomcatGenericExports(false).register();
- }
+ requires transitive java.ws.rs;
+ requires java.jws;
+ requires org.apache.cxf.core;
+ requires io.swagger.v3.oas.annotations;
+ requires org.apache.cxf.frontend.jaxrs;
+ requires org.apache.pdfbox;
+ requires java.desktop;
+ requires java.xml.ws;
}
diff --git a/pom.xml b/pom.xml
index 03ba9e64c..0decba765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
<om.notquick.build>true</om.notquick.build>
<logback.console></logback.console>
<db>h2</db>
- <autoModuleName>apache.openmeetings.parent</autoModuleName>
<jdk.version>17</jdk.version>
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
@@ -664,11 +663,6 @@
<artifactId>wicketstuff-datastore-hazelcast</artifactId>
<version>${wicketstuff.version}</version>
</dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui-calendar</artifactId>
- <version>${wicket-jquery-ui.version}</version>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -821,11 +815,6 @@
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-datastore-hazelcast</artifactId>
- <version>${wicketstuff.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -1201,7 +1190,6 @@
<Built-On>${maven.build.timestamp}</Built-On>
<Git-Revision>${buildNumber}</Git-Revision>
<Product-Version>${project.version}</Product-Version>
- <Automatic-Module-Name>${autoModuleName}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
[openmeetings] 07/10: The build is green
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 316e65970b70fb976a2a9b87525911b860197561
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Apr 21 15:52:27 2022 +0700
The build is green
---
.../openmeetings/db/util/ApplicationHelper.java | 6 ++-
.../apache/openmeetings/backup/BackupImport.java | 46 +++++++++++++++-------
.../service/scheduler/ReminderJob.java | 4 +-
.../org/apache/openmeetings/backup/TestExport.java | 6 +--
.../mail/template/subject/TestSubjTemplate.java | 2 +-
5 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index d63c6c20a..89f3bee09 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -123,7 +123,11 @@ public class ApplicationHelper {
} catch(IllegalStateException e) {
app.setServletContext(new MockServletContext(app, null));
}
- app.setConfigurationType(RuntimeConfigurationType.DEPLOYMENT);
+ try {
+ app.setConfigurationType(RuntimeConfigurationType.DEPLOYMENT);
+ } catch (IllegalStateException e) {
+ // no-op, might be already set
+ }
OMContextListener omcl = new OMContextListener();
omcl.contextInitialized(new ServletContextEvent(app.getServletContext()));
ThreadContext.setApplication(app);
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 7e9af5d50..0f518a1b3 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
@@ -518,7 +518,8 @@ public class BackupImport {
messageFolderMap.put(TRASH_FOLDER_ID, TRASH_FOLDER_ID);
}
- static BackupVersion getVersion(File base) {
+ // public for testing
+ public static BackupVersion getVersion(File base) {
List<BackupVersion> list = new ArrayList<>(1);
readList(base, "version.xml", VERSION_LIST_NODE, VERSION_NODE, BackupVersion.class, list::add, true);
return list.isEmpty() ? new BackupVersion() : list.get(0);
@@ -527,7 +528,8 @@ public class BackupImport {
/*
* ##################### Import Configs
*/
- void importConfigs(File base) throws Exception {
+ // public for testing
+ public void importConfigs(File base) throws Exception {
final Map<Integer, String> keyMap = new HashMap<>();
Arrays.stream(KeyEvent.class.getDeclaredFields())
.filter(fld -> fld.getName().startsWith("VK_"))
@@ -590,7 +592,8 @@ public class BackupImport {
/*
* ##################### Import Groups
*/
- void importGroups(File base) throws Exception {
+ // public for testing
+ public void importGroups(File base) throws Exception {
log.info("Configs import complete, starting group import");
readList(base, "organizations.xml", GROUP_LIST_NODE, GROUP_NODE, Group.class, g -> {
Long oldId = g.getId();
@@ -603,7 +606,8 @@ public class BackupImport {
/*
* ##################### Import LDAP Configs
*/
- Long importLdap(File base) {
+ // public for testing
+ public Long importLdap(File base) {
log.info("Groups import complete, starting LDAP config import");
Long[] defaultLdapId = {cfgDao.getLong(CONFIG_DEFAULT_LDAP_ID, null)};
readList(base, "ldapconfigs.xml", "ldapconfigs", "ldapconfig", LdapConfig.class, c -> {
@@ -626,7 +630,8 @@ public class BackupImport {
/*
* ##################### OAuth2 servers
*/
- void importOauth(File base) {
+ // public for testing
+ public void importOauth(File base) {
log.info("Ldap config import complete, starting OAuth2 server import");
readList(base, "oauth2servers.xml", OAUTH_LIST_NODE, OAUTH_NODE, OAuthServer.class
, s -> {
@@ -671,7 +676,8 @@ public class BackupImport {
/*
* ##################### Import Users
*/
- void importUsers(File base) throws Exception {
+ // public for testing
+ public void importUsers(File base) throws Exception {
log.info("OAuth2 servers import complete, starting user import");
String jNameTimeZone = getDefaultTimezone();
//add existent emails from database
@@ -735,7 +741,8 @@ public class BackupImport {
/*
* ##################### Import Rooms
*/
- void importRooms(File base) throws Exception {
+ // public for testing
+ public void importRooms(File base) throws Exception {
log.info("Users import complete, starting room import");
Class<Room> eClazz = Room.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
@@ -770,7 +777,8 @@ public class BackupImport {
/*
* ##################### Import Room Groups
*/
- void importRoomGroups(File base) throws Exception {
+ // public for testing
+ public void importRoomGroups(File base) throws Exception {
log.info("Room import complete, starting room groups import");
Class<RoomGroup> eClazz = RoomGroup.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
@@ -799,7 +807,8 @@ public class BackupImport {
/*
* ##################### Import Chat messages
*/
- void importChat(File base) throws Exception {
+ // public for testing
+ public void importChat(File base) throws Exception {
log.info("Room groups import complete, starting chat messages import");
Class<ChatMessage> eClazz = ChatMessage.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
@@ -822,7 +831,8 @@ public class BackupImport {
/*
* ##################### Import Calendars
*/
- void importCalendars(File base) throws Exception {
+ // public for testing
+ public void importCalendars(File base) throws Exception {
log.info("Chat messages import complete, starting calendar import");
Class<OmCalendar> eClazz = OmCalendar.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
@@ -840,7 +850,8 @@ public class BackupImport {
/*
* ##################### Import Appointments
*/
- void importAppointments(File base) throws Exception {
+ // public for testing
+ public void importAppointments(File base) throws Exception {
log.info("Calendar import complete, starting appointement import");
Class<Appointment> eClazz = Appointment.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
@@ -875,7 +886,8 @@ public class BackupImport {
*
* Reminder Invitations will be NOT send!
*/
- void importMeetingMembers(File base) throws Exception {
+ // public for testing
+ public void importMeetingMembers(File base) throws Exception {
log.info("Appointement import complete, starting meeting members import");
Class<MeetingMember> eClazz = MeetingMember.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
@@ -965,10 +977,12 @@ public class BackupImport {
remain.entrySet().forEach(e -> log.warn("Doungling file/recording: {}", e.getValue()));
tree.process(f -> isInvalidFile(f, folders), save);
}
+
/*
* ##################### Import Recordings
*/
- void importRecordings(File base) throws Exception {
+ // public for testing
+ public void importRecordings(File base) throws Exception {
log.info("Meeting members import complete, starting recordings server import");
final Map<Long, Long> folders = new HashMap<>();
saveTree(base, "flvRecordings.xml", RECORDING_LIST_NODE, RECORDING_NODE, Recording.class, folders, r -> {
@@ -1011,7 +1025,8 @@ public class BackupImport {
/*
* ##################### Import Private Message Folders
*/
- void importPrivateMsgFolders(File base) {
+ // public for testing
+ public void importPrivateMsgFolders(File base) {
log.info("Recording import complete, starting private message folder import");
readList(base, "privateMessageFolder.xml", MSG_FOLDER_LIST_NODE, MSG_FOLDER_NODE, PrivateMessageFolder.class, p -> {
Long folderId = p.getId();
@@ -1156,7 +1171,8 @@ public class BackupImport {
}, true);
}
- void importExtraMenus(File base) throws Exception {
+ // public for testing
+ public void importExtraMenus(File base) throws Exception {
log.info("Room files complete, starting extra menus import");
Class<ExtraMenu> eClazz = ExtraMenu.class;
JAXBContext jc = JAXBContext.newInstance(eClazz);
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
index 6167681ec..5b27ce913 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
@@ -65,8 +65,8 @@ public class ReminderJob extends AbstractJob {
@Autowired
private GroupUserDao groupUserDao;
- //package private for testing
- Map<Long, LocalDateTime> groupNotifications = new HashMap<>();
+ // public for testing
+ public Map<Long, LocalDateTime> groupNotifications = new HashMap<>();
public void remindMeetings() {
log.trace("ReminderJob.remindMeetings");
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
index 6a22356d3..5e51cb8de 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
@@ -26,9 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.IOException;
import java.io.StringWriter;
-import java.io.Writer;
import java.nio.file.Paths;
import java.time.LocalDate;
@@ -45,8 +43,6 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
-
class TestExport extends AbstractOmServerTest {
@Autowired
private FileItemDao fileItemDao;
@@ -68,12 +64,14 @@ class TestExport extends AbstractOmServerTest {
JAXBContext jc = JAXBContext.newInstance(eClazz);
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+ /* FIXME TODO
marshaller.setProperty(CharacterEscapeHandler.class.getName(), new CharacterEscapeHandler() {
@Override
public void escape(char[] ac, int i, int j, boolean flag, Writer writer) throws IOException {
writer.write(ac, i, j);
}
});
+ */
StringWriter writer = new StringWriter();
marshaller.marshal(u, writer);
Assertions.assertNotNull(writer.getBuffer());
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
index d57918187..e7ed63470 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
@@ -85,7 +85,7 @@ class TestSubjTemplate extends AbstractWicketTesterTest {
private static final long serialVersionUID = 1L;
@Override
- String getPrefix() {
+ public String getPrefix() {
return null;
}
};
[openmeetings] 03/10: OpenJpa modules were changed
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 164f9284b012056d29f2359ac5f2402048199462
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Mar 15 15:24:33 2020 +0700
OpenJpa modules were changed
---
openmeetings-db/src/main/java/module-info.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index b42eb42a0..120187f78 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -57,7 +57,7 @@ module apache.openmeetings.db {
requires spring.tx;
requires spring.context;
- requires java.persistence;
+ requires javax.persistence;
requires openjpa;
requires asterisk.java;
requires java.xml.bind;
[openmeetings] 09/10: Build fixed
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2da5cb56890309c8ce66698fd4028bdd3925f580
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue May 17 10:51:32 2022 +0700
Build fixed
---
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0f518a1b3..8e5a82359 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
@@ -501,7 +501,7 @@ public class BackupImport {
}
}
- void cleanup() {
+ public void cleanup() {
ldapMap.clear();
oauthMap.clear();
userMap.clear();
[openmeetings] 02/10: Simple-xml is dropped
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 10be8ec943f2aa13bb684c7764e6f44ce2830b51
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Mar 14 11:03:03 2020 +0700
Simple-xml is dropped
---
openmeetings-db/src/main/java/module-info.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java
index 2d01a8c92..b42eb42a0 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -52,7 +52,6 @@ module apache.openmeetings.db {
requires transitive org.apache.wicket.request;
requires transitive org.apache.wicket.websocket.core;
requires transitive spring.beans;
- requires transitive simple.xml;
requires transitive spring.web;
requires transitive spring.core;