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 c37124c562f91b88bee5dabfbe4bbc70356c59ac Author: Maxim Solodovnik <[email protected]> AuthorDate: Tue Feb 18 00:32:32 2020 +0700 no jira: project is partially converted to use java11 modules --- .../java/module-info.java} | 24 +++- .../core/converter/DocumentConverter.java | 10 +- .../org/apache/openmeetings/rdc/KeyCodesTest.java | 160 --------------------- .../apache/openmeetings/rdc/ReadKeyCodesTest.java | 118 --------------- .../openmeetings/rdc/TestKeyCodesNumber.java | 48 ------- 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 ++++++ pom.xml | 8 +- 9 files changed, 141 insertions(+), 342 deletions(-) diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java b/openmeetings-core/src/main/java/module-info.java similarity index 63% rename from openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java rename to openmeetings-core/src/main/java/module-info.java index 0a271ae..b6582dc 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java +++ b/openmeetings-core/src/main/java/module-info.java @@ -16,14 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings; +module apache.openmeetings.core { + requires transitive apache.openmeetings.db; -import org.junit.Test; + requires transitive org.apache.commons.io; -public class TestConnection { + requires transitive spring.context; - @Test - public void testNoop() { - //no-op - } + 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-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java index e90c4fb..379f09c 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java @@ -34,11 +34,11 @@ import org.apache.openmeetings.util.StoredFile; import org.apache.openmeetings.util.process.ProcessResult; import org.apache.openmeetings.util.process.ProcessResultList; import org.apache.wicket.util.string.Strings; -import org.jodconverter.LocalConverter; -import org.jodconverter.job.ConversionJob; -import org.jodconverter.office.LocalOfficeManager; -import org.jodconverter.office.OfficeException; -import org.jodconverter.office.OfficeManager; +import org.jodconverter.core.job.ConversionJob; +import org.jodconverter.core.office.OfficeException; +import org.jodconverter.core.office.OfficeManager; +import org.jodconverter.local.LocalConverter; +import org.jodconverter.local.office.LocalOfficeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/KeyCodesTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/KeyCodesTest.java deleted file mode 100644 index 5fae12b..0000000 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/KeyCodesTest.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.rdc; - -import java.awt.Color; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -class WindowClosingAdapter extends WindowAdapter { - @Override - public void windowClosing(WindowEvent event) { - event.getWindow().setVisible(false); - event.getWindow().dispose(); - System.exit(0); - } -} - -public class KeyCodesTest extends Frame implements KeyListener { - private static final long serialVersionUID = 1L; - String msg1 = ""; - String msg2 = ""; - - public KeyCodesTest() { - super("TestKeyCodes"); - addKeyListener(this); - addWindowListener(new WindowClosingAdapter()); - setBackground(Color.lightGray); - setSize(300, 200); - setLocation(200, 100); - setVisible(true); - } - - @Override - public void paint(Graphics g) { - if (msg1.length() > 0) { - draw3DRect(g, 20, 50, 250, 30); - g.setColor(Color.black); - g.drawString(msg1, 30, 70); - } - if (msg2.length() > 0) { - draw3DRect(g, 20, 100, 250, 30); - g.setColor(Color.black); - g.drawString(msg2, 30, 120); - } - } - - void draw3DRect(Graphics g, int x, int y, int width, int height) { - g.setColor(Color.darkGray); - g.drawLine(x, y, x, y + height); - g.drawLine(x, y, x + width, y); - g.setColor(Color.white); - g.drawLine(x + width, y + height, x, y + height); - g.drawLine(x + width, y + height, x + width, y); - } - - @Override - public void keyPressed(KeyEvent event) { - msg1 = ""; - System.out.println("keyPressed CODE1 "+event.getKeyCode()); - - int myCode = event.getKeyCode(); - - System.out.println("keyPressed CODE2 "+myCode); - - System.out.println("keyPressed CHAR3 "+event.getKeyChar()); - - System.out.println("keyPressed CHAR4 "+KeyEvent.getKeyText(event.getKeyCode())); - - System.out.println("keyPressed CHAR5 "+KeyEvent.getKeyText(myCode)); - - System.out.println("keyPressed isActionKey "+event.isActionKey()); - System.out.println("keyPressed isAltDown "+event.isAltDown()); - System.out.println("keyPressed isAltGraphDown "+event.isAltGraphDown()); - System.out.println("keyPressed isConsumed "+event.isConsumed()); - System.out.println("keyPressed isControlDown "+event.isControlDown()); - System.out.println("keyPressed isMetaDown "+event.isMetaDown()); - System.out.println("keyPressed isShiftDown "+event.isShiftDown()); - - System.out.println("keyPressed paramString "+event.paramString()); - - if (event.getKeyChar() == KeyEvent.CHAR_UNDEFINED) { - int key = event.getKeyCode(); - // Funktionstaste abfragen - if (key == KeyEvent.VK_F1) { - msg1 = "F1"; - } else if (key == KeyEvent.VK_F2) { - msg1 = "F2"; - } else if (key == KeyEvent.VK_F3) { - msg1 = "F3"; - } - // Modifier abfragen - if (msg1.length() > 0) { - if (event.isAltDown()) { - msg1 = "ALT + " + msg1; - } - if (event.isControlDown()) { - msg1 = "STRG + " + msg1; - } - if (event.isShiftDown()) { - msg1 = "UMSCHALT + " + msg1; - } - } - } - repaint(); - } - - @Override - public void keyReleased(KeyEvent event) { - msg1 = ""; - repaint(); - } - - @Override - public void keyTyped(KeyEvent event) { - char key = event.getKeyChar(); - -// System.out.println("keyTyped CODE1 "+event.getKeyCode()); -// -// Integer myCode = event.getKeyCode(); -// -// System.out.println("keyTyped CODE2 "+myCode); -// -// System.out.println("keyTyped CHAR3 "+event.getKeyChar()); -// -// System.out.println("keyTyped CHAR4 "+event.getKeyText(event.getKeyCode())); -// -// System.out.println("keyTyped CHAR5 "+event.getKeyText(myCode)); - - if (key == KeyEvent.VK_BACK_SPACE) { - if (msg2.length() > 0) { - msg2 = msg2.substring(0, msg2.length() - 1); - } - } else if (key >= KeyEvent.VK_SPACE) { - if (msg2.length() < 40) { - msg2 += event.getKeyChar(); - } - } - repaint(); - } -} diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/ReadKeyCodesTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/ReadKeyCodesTest.java deleted file mode 100644 index acf0780..0000000 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/ReadKeyCodesTest.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.rdc; - -import java.awt.Color; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; - -public class ReadKeyCodesTest extends Frame implements KeyListener { - private static final long serialVersionUID = 1L; - String msg1 = ""; - String msg2 = ""; - - public ReadKeyCodesTest() { - super("TestKeyCodes"); - addKeyListener(this); - addWindowListener(new WindowClosingAdapter()); - setBackground(Color.lightGray); - setSize(300, 200); - setLocation(200, 100); - setVisible(true); - } - - @Override - public void paint(Graphics g) { - if (msg1.length() > 0) { - draw3DRect(g, 20, 50, 250, 30); - g.setColor(Color.black); - g.drawString(msg1, 30, 70); - } - if (msg2.length() > 0) { - draw3DRect(g, 20, 100, 250, 30); - g.setColor(Color.black); - g.drawString(msg2, 30, 120); - } - } - - void draw3DRect(Graphics g, int x, int y, int width, int height) { - g.setColor(Color.darkGray); - g.drawLine(x, y, x, y + height); - g.drawLine(x, y, x + width, y); - g.setColor(Color.white); - g.drawLine(x + width, y + height, x, y + height); - g.drawLine(x + width, y + height, x + width, y); - } - - @Override - public void keyPressed(KeyEvent event) { - msg1 = ""; - System.out.println("keyPressed "+event.getKeyCode()); - if (event.getKeyChar() == KeyEvent.CHAR_UNDEFINED) { - int key = event.getKeyCode(); - // Funktionstaste abfragen - if (key == KeyEvent.VK_F1) { - msg1 = "F1"; - } else if (key == KeyEvent.VK_F2) { - msg1 = "F2"; - } else if (key == KeyEvent.VK_F3) { - msg1 = "F3"; - } - // Modifier abfragen - if (msg1.length() > 0) { - if (event.isAltDown()) { - msg1 = "ALT + " + msg1; - } - if (event.isControlDown()) { - msg1 = "STRG + " + msg1; - } - if (event.isShiftDown()) { - msg1 = "UMSCHALT + " + msg1; - } - } - } - repaint(); - } - - @Override - public void keyReleased(KeyEvent event) { - msg1 = ""; - repaint(); - } - - @Override - public void keyTyped(KeyEvent event) { - char key = event.getKeyChar(); - - System.out.println("keyTyped "+event.getKeyCode()); - - if (key == KeyEvent.VK_BACK_SPACE) { - if (msg2.length() > 0) { - msg2 = msg2.substring(0, msg2.length() - 1); - } - } else if (key >= KeyEvent.VK_SPACE) { - if (msg2.length() < 40) { - msg2 += event.getKeyChar(); - } - } - repaint(); - } -} diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java deleted file mode 100644 index 14e1a9b..0000000 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.rdc; - -import java.awt.event.KeyEvent; - -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TestKeyCodesNumber { - private static final Logger log = LoggerFactory.getLogger(TestKeyCodesNumber.class); - - @Test - public void testKeyCodes() { - try { - - for (int i = 1; i < 600; i++) { - - String charText = KeyEvent.getKeyText(i); - - log.debug("ERROR " + i + " " + charText); - - } - - } catch (Exception err) { - log.error("[testKeyCodes]", err); - } - - } - -} 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 0000000..2d01a8c --- /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 35566b1..c6d1931 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; @@ -180,7 +179,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 0000000..72dfb3c --- /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; +} diff --git a/pom.xml b/pom.xml index 01c6744..1517123 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ <h2.version>1.4.200</h2.version> <commons-lang3.version>3.9</commons-lang3.version> <javax.mail.version>1.6.2</javax.mail.version> - <openjpa.version>3.1.0</openjpa.version> + <openjpa.version>3.1.1-SNAPSHOT</openjpa.version> <asterisk-java.version>2.0.2</asterisk-java.version> <commons-dbcp.version>2.7.0</commons-dbcp.version> <commons-pool2.version>2.8.0</commons-pool2.version> @@ -658,6 +658,10 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -698,7 +702,7 @@ <dependency> <groupId>org.jodconverter</groupId> <artifactId>jodconverter-local</artifactId> - <version>4.2.4</version> + <version>4.3.0-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement>
