no jira: version is switched, code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/52791442 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/52791442 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/52791442 Branch: refs/heads/3.2.x Commit: 527914424ed9968c123eb05779cea4c4585b9a95 Parents: 914da1d Author: Maxim Solodovnik <[email protected]> Authored: Tue Mar 21 06:23:20 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Mar 21 06:23:20 2017 +0000 ---------------------------------------------------------------------- openmeetings-core/pom.xml | 2 +- .../openmeetings/core/mail/MailHandler.java | 6 ++-- .../test/asf/AsfCopyRightReplace.java | 27 +++++++------- .../openmeetings/test/rdc/KeyCodesTest.java | 38 +++++++++++--------- .../openmeetings/test/rdc/ReadKeyCodesTest.java | 12 ++++--- .../openmeetings/test/rtmp/SimulateLoad.java | 3 +- openmeetings-db/pom.xml | 6 +--- openmeetings-flash/pom.xml | 2 +- openmeetings-install/pom.xml | 2 +- .../java/org/apache/openmeetings/cli/Admin.java | 10 +----- openmeetings-screenshare/pom.xml | 2 +- .../apache/openmeetings/screenshare/Core.java | 1 + .../screenshare/gui/ScreenSharerFrame.java | 5 +-- openmeetings-server/pom.xml | 23 +++++++++++- openmeetings-service/pom.xml | 2 +- .../mail/template/AbstractTemplatePanel.java | 4 +-- openmeetings-util/pom.xml | 6 +++- .../apache/openmeetings/util/mail/MailUtil.java | 18 +++++----- openmeetings-web/pom.xml | 17 +-------- .../web/admin/groups/GroupUsersPanel.java | 4 +-- .../openmeetings/web/admin/rooms/RoomForm.java | 4 +-- .../openmeetings/web/app/Application.java | 9 ++--- .../openmeetings/web/common/menu/MenuPanel.java | 10 +++--- .../web/common/tree/FolderPanel.java | 11 ++---- .../apache/openmeetings/web/pages/BasePage.java | 3 +- .../apache/openmeetings/web/room/RoomPanel.java | 10 +++--- .../web/room/activities/ActivitiesPanel.java | 3 +- .../web/room/menu/RoomMenuPanel.java | 5 +-- .../web/room/sidebar/RoomClientPanel.java | 10 +++--- .../web/room/sidebar/RoomSidebar.java | 2 +- .../web/room/sidebar/UploadDialog.java | 4 +-- .../web/room/sidebar/icon/ClientIcon.java | 10 +++--- .../web/user/profile/MessagesContactsPanel.java | 15 ++++---- .../web/user/profile/UserSearchPanel.java | 9 +++-- .../test/calendar/TestSendIcalMessage.java | 2 +- openmeetings-webservice/pom.xml | 2 +- pom.xml | 16 +++++---- 37 files changed, 159 insertions(+), 156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-core/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index 96d5a32..54295e6 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-core</artifactId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java index 6ac52e9..a77e397 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java @@ -203,7 +203,7 @@ public class MailHandler { String replyTo = m.getReplyTo(); if (replyTo != null && mailAddReplyTo) { log.debug("setReplyTo " + replyTo); - if (MailUtil.matches(replyTo)) { + if (MailUtil.isValid(replyTo)) { msg.setReplyTo(new InternetAddress[]{new InternetAddress(replyTo)}); } } @@ -246,9 +246,7 @@ public class MailHandler { log.error("Error while sending message", e); m.setErrorCount(m.getErrorCount() + 1); StringWriter sw = new StringWriter(); - try (PrintWriter pw = new PrintWriter(sw)) { - e.printStackTrace(pw); - } + e.printStackTrace(new PrintWriter(sw)); m.setLastError(sw.getBuffer().toString()); m.setStatus(m.getErrorCount() < MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java index cdcc13a..acab791 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; public class AsfCopyRightReplace { private static final Logger log = Red5LoggerFactory.getLogger(AsfCopyRightReplace.class, webAppRootKey); - String asf_copyright = "/*\n" + private static String asf_copyright = "/*\n" + " * Licensed to the Apache Software Foundation (ASF) under one\n" + " * or more contributor license agreements. See the NOTICE file\n" + " * distributed with this work for additional information\n" @@ -54,7 +54,7 @@ public class AsfCopyRightReplace { + " * specific language governing permissions and limitations\n" + " * under the License.\n" + " */\n"; - String asf_xml_copyright = "<!--\n" + private static String asf_xml_copyright = "<!--\n" + " Licensed to the Apache Software Foundation (ASF) under one\n" + " or more contributor license agreements. See the NOTICE file\n" + " distributed with this work for additional information\n" @@ -62,16 +62,17 @@ public class AsfCopyRightReplace { + " to you under the Apache License, Version 2.0 (the\n" + " \"License\"); you may not use this file except in compliance\n" + " with the License. You may obtain a copy of the License at\n" - + " \n" + " http://www.apache.org/licenses/LICENSE-2.0\n"; - + " \n" + + "\n" + + " http://www.apache.org/licenses/LICENSE-2.0\n"; + + "\n" + " Unless required by applicable law or agreed to in writing,\n" + " software distributed under the License is distributed on an\n" + " \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" + " KIND, either express or implied. See the License for the\n" + " specific language governing permissions and limitations\n" + " under the License.\n" + " \n" + "-->\n"; - - String asf_vm_copyright = "#\n" + + private static String asf_vm_copyright = "#\n" + "# Licensed to the Apache Software Foundation (ASF) under one\n" + "# or more contributor license agreements. See the NOTICE file\n" + "# distributed with this work for additional information\n" @@ -90,14 +91,10 @@ public class AsfCopyRightReplace { + "# under the License.\n" + "#/\n"; public static void main(String... args) { - new AsfCopyRightReplace(); - } - - public AsfCopyRightReplace() { scanFolder(new File("./src/main")); } - private void scanFolder(File folder) { + private static void scanFolder(File folder) { for (File javaFile : folder.listFiles(new FilenameFilter() { @Override @@ -128,7 +125,7 @@ public class AsfCopyRightReplace { } } - private void scanAndWriteXMLFile(File javaFile) { + private static void scanAndWriteXMLFile(File javaFile) { StringWriter strWriter = new StringWriter(); try (BufferedReader is = new BufferedReader(new InputStreamReader(new FileInputStream(javaFile), UTF_8))) { log.debug("Processing " + javaFile.getCanonicalPath()); @@ -140,7 +137,7 @@ public class AsfCopyRightReplace { while ((line = is.readLine()) != null) { if (i == 0) { firstline = line; - + if (firstline.startsWith("<canvas")) { strWriter.append(asf_xml_copyright); } else if (firstline.startsWith("<library")) { @@ -173,7 +170,7 @@ public class AsfCopyRightReplace { } } - private void scanAndWriteJavaFile(File javaFile) { + private static void scanAndWriteJavaFile(File javaFile) { StringWriter strWriter = new StringWriter(); try (BufferedReader is = new BufferedReader(new InputStreamReader(new FileInputStream(javaFile), UTF_8))) { log.debug("Processing " + javaFile.getCanonicalPath()); @@ -185,7 +182,7 @@ public class AsfCopyRightReplace { if (i == 0) { if (line.startsWith("package ")) { strWriter.append(asf_copyright); - } else if (line.startsWith("## OpenMeetings") + } else if (line.startsWith("## OpenMeetings") && javaFile.getName().endsWith(".vm")) { strWriter.append(asf_vm_copyright); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java index c33f590..cfb0ef3 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java @@ -18,8 +18,13 @@ */ package org.apache.openmeetings.test.rdc; -import java.awt.*; -import java.awt.event.*; +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 @@ -35,6 +40,7 @@ public class KeyCodesTest extends Frame implements KeyListener { String msg1 = ""; String msg2 = ""; + @SuppressWarnings("unused") public static void main(String[] args) { new KeyCodesTest(); } @@ -76,17 +82,17 @@ public class KeyCodesTest extends Frame implements KeyListener { 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()); @@ -96,7 +102,7 @@ public class KeyCodesTest extends Frame implements KeyListener { 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 @@ -132,19 +138,19 @@ public class KeyCodesTest extends Frame implements KeyListener { @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); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java index 9233769..12d73b2 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java @@ -18,14 +18,18 @@ */ package org.apache.openmeetings.test.rdc; -import java.awt.*; -import java.awt.event.*; +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 = ""; + @SuppressWarnings("unused") public static void main(String[] args) { new ReadKeyCodesTest(); } @@ -102,9 +106,9 @@ public class ReadKeyCodesTest extends Frame implements KeyListener { @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); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java index ed9927e..fd95155 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java @@ -40,8 +40,7 @@ public class SimulateLoad extends Thread { public static void main(String... args) { try { if (args.length != 4) { - new RuntimeException( - "4 args needed, host, port, context, instanceId"); + throw new RuntimeException("4 args needed, host, port, context, instanceId"); } for (String arg : args) { System.err.println("arg: " + arg); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-db/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml index 5a311e6..6fd9b17 100644 --- a/openmeetings-db/pom.xml +++ b/openmeetings-db/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-db</artifactId> @@ -44,10 +44,6 @@ <artifactId>openmeetings-util</artifactId> </dependency> <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> - </dependency> - <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> <version>${openjpa.version}</version> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-flash/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-flash/pom.xml b/openmeetings-flash/pom.xml index 0d48f63..5a518d3 100644 --- a/openmeetings-flash/pom.xml +++ b/openmeetings-flash/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-flash</artifactId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-install/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml index 29f59b3..56ca27c 100644 --- a/openmeetings-install/pom.xml +++ b/openmeetings-install/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-install</artifactId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 15436c2..f5375ea 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -34,9 +34,6 @@ import java.util.Date; import java.util.Map; import java.util.TimeZone; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; @@ -411,12 +408,7 @@ public class Admin { System.exit(1); } - try { - if (cfg.email == null || !MailUtil.matches(cfg.email)) { - throw new AddressException("Invalid address"); - } - new InternetAddress(cfg.email, true); - } catch (AddressException ae) { + if (!MailUtil.isValid(cfg.email)) { System.out.println("Please provide non-empty valid email: '" + cfg.email + "' is not valid."); System.exit(1); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-screenshare/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml index b426490..ec6b8b6 100644 --- a/openmeetings-screenshare/pom.xml +++ b/openmeetings-screenshare/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-screenshare</artifactId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index 3f826d2..defeadc 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -188,6 +188,7 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { } } + @SuppressWarnings("unused") public static void main(String[] args) { new Core(args); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java index 60a4d0a..bab4136 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java @@ -50,6 +50,7 @@ import javax.swing.JPanel; import javax.swing.JTabbedPane; import javax.swing.JTextField; import javax.swing.SwingConstants; +import javax.swing.WindowConstants; import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -76,7 +77,7 @@ public class ScreenSharerFrame extends JFrame { private HorizontalSlider leftSlider = new HorizontalSlider(); private HorizontalSlider rightSlider = new HorizontalSlider(); private BlankArea virtualScreen = new BlankArea(new Color(255, 255, 255, 100)); - private JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); + private JTabbedPane tabbedPane = new JTabbedPane(SwingConstants.TOP); private boolean doUpdateBounds = true; private boolean showWarning = true; private JButton btnStartStopSharing; @@ -232,7 +233,7 @@ public class ScreenSharerFrame extends JFrame { setTitle(getTextLabel(textLabels, 0)); //#id 730 setBackground(Color.WHITE); setResizable(false); - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-server/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index b64cd5b..febb20b 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-server</artifactId> @@ -316,6 +316,27 @@ <ignore></ignore> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + com.internetitem + </groupId> + <artifactId> + write-properties-file-maven-plugin + </artifactId> + <versionRange> + [1.0.1,) + </versionRange> + <goals> + <goal> + write-properties-file + </goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-service/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml index 0baa405..616e2ec 100644 --- a/openmeetings-service/pom.xml +++ b/openmeetings-service/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-service</artifactId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java index 54be034..ac3e666 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java @@ -27,7 +27,7 @@ import org.apache.openmeetings.IWebSession; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.util.FormatHelper; -import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.TransparentWebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.protocol.http.WebSession; @@ -53,7 +53,7 @@ public abstract class AbstractTemplatePanel extends Panel { public AbstractTemplatePanel(Locale locale) { super(COMP_ID); this.locale = locale == null ? getDefault() : locale; - add(new TransparentWebMarkupContainer("container").add(AttributeAppender.append("dir", FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr"))); + add(new TransparentWebMarkupContainer("container").add(AttributeModifier.append("dir", FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr"))); } public static String getString(String id, Locale locale, String... params) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-util/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index eb5fa5a..acfa2b7 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-util</artifactId> @@ -99,5 +99,9 @@ <artifactId>wicket-native-websocket-core</artifactId> <version>${wicket.version}</version> </dependency> + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-extensions</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java index f54fe9d..e43cfaa 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/MailUtil.java @@ -18,15 +18,17 @@ */ package org.apache.openmeetings.util.mail; -import java.util.regex.Pattern; +import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator; +import org.apache.wicket.util.string.Strings; +import org.apache.wicket.validation.Validatable; public class MailUtil { - - private static final Pattern rfc2822 = Pattern.compile( - "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" - ); - - public static boolean matches(String email) { - return rfc2822.matcher(email).matches(); + public static boolean isValid(String email) { + if (Strings.isEmpty(email)) { + return false; + } + Validatable<String> eml = new Validatable<>(email); + RfcCompliantEmailAddressValidator.getInstance().validate(eml); + return eml.isValid(); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 3880610..fac0bf4 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-web</artifactId> @@ -372,10 +372,6 @@ </dependency> <dependency> <groupId>org.apache.wicket</groupId> - <artifactId>wicket-extensions</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wicket</groupId> <artifactId>wicket-auth-roles</artifactId> <version>${wicket.version}</version> </dependency> @@ -436,17 +432,6 @@ </dependency> <dependency> <groupId>org.wicketstuff</groupId> - <artifactId>wicketstuff-whiteboard</artifactId> - <version>${wickets.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket-native-websocket-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.wicketstuff</groupId> <artifactId>wicketstuff-select2</artifactId> <version>${wickets.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java index 6cb9fff..4284b86 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java @@ -32,9 +32,9 @@ import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.data.SearchableDataProvider; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.panel.Panel; @@ -69,7 +69,7 @@ public class GroupUsersPanel extends Panel { User u = grpUser.getUser(); Label label = new Label("label", u == null ? "" : GroupForm.formatUser(u)); if (grpUser.getId() == null) { - label.add(AttributeAppender.append("class", "newItem")); + label.add(AttributeModifier.append("class", "newItem")); } item.add(label); item.add(new ConfirmableAjaxBorder("deleteUserBtn", getString("80"), getString("833")) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index fd87950..f2e3a2a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -47,11 +47,11 @@ import org.apache.openmeetings.web.admin.AdminUserChoiceProvider; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.util.RoomTypeDropDown; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior; import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.CheckBox; @@ -289,7 +289,7 @@ public class RoomForm extends AdminBaseForm<Room> { RoomModerator moderator = item.getModelObject(); Label name = new Label("uName", moderator.getUser().getFirstname() + " " + moderator.getUser().getLastname()); if (moderator.getId() == null) { - name.add(AttributeAppender.append("class", "newItem")); + name.add(AttributeModifier.append("class", "newItem")); } item.add(new CheckBox("superModerator", new PropertyModel<Boolean>(moderator, "superModerator"))) .add(new Label("userId", "" + moderator.getUser().getId())) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 51d57f9..b40c9e2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -84,6 +84,7 @@ import org.apache.wicket.Localizer; import org.apache.wicket.Page; import org.apache.wicket.RestartResponseException; import org.apache.wicket.RuntimeConfigurationType; +import org.apache.wicket.Session; import org.apache.wicket.ThreadContext; import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession; import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; @@ -91,7 +92,6 @@ import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.mapper.MountedMapper; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; import org.apache.wicket.request.component.IRequestablePage; @@ -138,6 +138,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica //chain of Resource Loaders, if not found it will search in Wicket's internal //Resource Loader for a the property key getResourceSettings().getStringResourceLoaders().add(0, new LabelResourceLoader()); + //FIXME TODO v3 on the way getJavaScriptLibrarySettings().setJQueryReference(new JavaScriptResourceReference(DynamicJQueryResourceReference.class, DynamicJQueryResourceReference.VERSION_2)); super.init(); @@ -216,7 +217,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica } public static Application get() { - return (Application) WebApplication.get(wicketApplicationName); + return (Application)org.apache.wicket.Application.get(wicketApplicationName); } public static DashboardContext getDashboardContext() { @@ -492,7 +493,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static Locale getLocale(final long languageId) { Locale loc = LabelDao.languages.get(languageId); if (loc == null) { - loc = WebSession.exists() ? WebSession.get().getLocale() : Locale.ENGLISH; + loc = Session.exists() ? WebSession.get().getLocale() : Locale.ENGLISH; } return loc; } @@ -511,7 +512,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static String getString(String key, final Locale loc, String... params) { if (!exists()) { - ThreadContext.setApplication(Application.get(appName)); + ThreadContext.setApplication(org.apache.wicket.Application.get(appName)); } if ((params == null || params.length == 0) && STRINGS_WITH_APP.contains(key)) { params = new String[]{getBean(ConfigurationDao.class).getAppName()}; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java index e234636..f22381f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java @@ -21,7 +21,7 @@ package org.apache.openmeetings.web.common.menu; import java.util.List; import org.apache.openmeetings.web.common.BasePanel; -import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.util.string.Strings; @@ -32,7 +32,7 @@ import com.googlecode.wicket.jquery.ui.widget.menu.Menu; /** * Loads the menu items into the main area - * + * * @author sebawagner * */ @@ -52,12 +52,12 @@ public class MenuPanel extends BasePanel { protected void addMenuItem(ListItem<IMenuItem> item, IMenuItem menuItem) { super.addMenuItem(item, menuItem); MenuItem m = (MenuItem)menuItem; - item.add(AttributeAppender.append("class", m.isTop() ? "top" : "sub")); + item.add(AttributeModifier.append("class", m.isTop() ? "top" : "sub")); if (!Strings.isEmpty(m.getDesc())) { - item.add(AttributeAppender.append("title", m.getDesc())); + item.add(AttributeModifier.append("title", m.getDesc())); } if (!Strings.isEmpty(m.getIcon())) { - item.add(AttributeAppender.append("class", m.getIcon())); + item.add(AttributeModifier.append("class", m.getIcon())); } } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java index 2cc6eaf..4f50487 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java @@ -28,10 +28,10 @@ import org.apache.openmeetings.db.entity.file.FileExplorerItem; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.file.FileItem.Type; import org.apache.openmeetings.db.entity.record.Recording; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -93,7 +93,7 @@ public class FolderPanel extends Panel { behavior.setOption("helper", "dragHelper"); } }.setContainment(treePanel.getContainment()); - drag.add(AttributeAppender.append("class", r instanceof Recording ? "recorditem" : "fileitem")); + drag.add(AttributeModifier.append("class", r instanceof Recording ? "recorditem" : "fileitem")); } Component name = r.getId() == null || !editable ? new Label("name", r.getName()) : new AjaxEditableLabel<String>("name", Model.of(model.getObject().getName())) { private static final long serialVersionUID = 1L; @@ -114,13 +114,8 @@ public class FolderPanel extends Panel { getBean(FileExplorerItemDao.class).update((FileExplorerItem)fi); } } - - @Override - public void onEdit(AjaxRequestTarget target) { - super.onEdit(target); - } }; - drag.add(name.add(AttributeAppender.append("title", r.getName()))); + drag.add(name.add(AttributeModifier.append("title", r.getName()))); add(drop.add(drag).setOutputMarkupId(true)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java index 3a97427..1339a2d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java @@ -33,7 +33,6 @@ import org.apache.openmeetings.web.util.OmUrlFragment.AreaKeys; import org.apache.wicket.AttributeModifier; import org.apache.wicket.RuntimeConfigurationType; import org.apache.wicket.markup.head.CssHeaderItem; -import org.apache.wicket.markup.head.CssReferenceHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; @@ -100,7 +99,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage { public void renderHead(IHeaderResponse response) { response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()))); super.renderHead(response); - response.render(CssReferenceHeaderItem.forUrl(String.format("css/theme_om/jquery-ui.%scss" + response.render(CssHeaderItem.forUrl(String.format("css/theme_om/jquery-ui.%scss" , RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType() ? "" : "min."))); if (isRtl()) { response.render(CssHeaderItem.forUrl("css/theme-rtl.css")); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 378ee2a..861c352 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -66,11 +66,11 @@ import org.apache.openmeetings.web.room.activities.Activity; import org.apache.openmeetings.web.room.menu.RoomMenuPanel; import org.apache.openmeetings.web.room.sidebar.RoomSidebar; import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.event.IEvent; import org.apache.wicket.markup.head.IHeaderResponse; @@ -173,7 +173,7 @@ public class RoomPanel extends BasePanel { Component eventDetail = new WebMarkupContainer(EVENT_DETAILS_ID).setVisible(false); room.add(menu = new RoomMenuPanel("menu", this)); - room.add(AttributeAppender.append("data-room-id", r.getId())); + room.add(AttributeModifier.append("data-room-id", r.getId())); Droppable<FileItem> wbArea = new Droppable<FileItem>("wb-area") { private static final long serialVersionUID = 1L; @@ -367,18 +367,18 @@ public class RoomPanel extends BasePanel { } break; case rightUpdated: - sidebar.updateUsers(handler); + sidebar.update(handler); menu.update(handler); break; case roomEnter: - sidebar.updateUsers(handler); + sidebar.update(handler); menu.update(handler); // TODO should this be fixed? //activities.addActivity(new Activity(m, Activity.Type.roomEnter), handler); break; case roomExit: //TODO check user/remove tab - sidebar.updateUsers(handler); + sidebar.update(handler); activities.add(new Activity(m, Activity.Type.roomExit), handler); break; case roomClosed: http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index c08d5c9..f15b5a7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -40,6 +40,7 @@ import org.apache.openmeetings.util.message.RoomMessage; import org.apache.openmeetings.util.message.TextRoomMessage; import org.apache.openmeetings.web.common.BasePanel; import org.apache.openmeetings.web.room.RoomPanel; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -216,7 +217,7 @@ public class ActivitiesPanel extends BasePanel { } item.add(new WebMarkupContainer("close").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.close.name(), a.getId())))); item.add(accept, decline, new Label("text", text)); - item.add(AttributeAppender.append("class", getClass(a))); + item.add(AttributeModifier.append("class", getClass(a))); } private String getClass(Activity a) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 0679589..6cbec34 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -51,6 +51,7 @@ import org.apache.openmeetings.web.room.RoomPanel; import org.apache.openmeetings.web.room.poll.CreatePollDialog; import org.apache.openmeetings.web.room.poll.PollResultsDialog; import org.apache.openmeetings.web.room.poll.VoteDialog; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; @@ -224,7 +225,7 @@ public class RoomMenuPanel extends Panel { @Override protected void onTimer(int remain) { - getComponent().add(AttributeAppender.replace("title", getText("639", remain))); + getComponent().add(AttributeModifier.replace("title", getText("639", remain))); } @Override @@ -311,7 +312,7 @@ public class RoomMenuPanel extends Panel { roomClass.append(" screen"); } } - handler.add(roomName.add(AttributeAppender.replace("class", roomClass), AttributeAppender.replace("title", roomTitle))); + handler.add(roomName.add(AttributeModifier.replace("class", roomClass), AttributeModifier.replace("title", roomTitle))); handler.add(askBtn.setVisible(!moder && r.isAllowUserQuestions())); handler.add(shareBtn.setVisible(shareVisible)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java index afadb18..f6eeee2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java @@ -27,7 +27,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.room.RoomPanel; import org.apache.openmeetings.web.room.sidebar.icon.KickIcon; import org.apache.openmeetings.web.room.sidebar.icon.RefreshIcon; -import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.list.ListItem; @@ -42,8 +42,8 @@ public class RoomClientPanel extends Panel { setRenderBodyOnly(true); Client c = item.getModelObject(); item.setMarkupId(String.format("user%s", c.getUid())); - item.add(AttributeAppender.append("style", String.format("background-image: url(profile/%s);", c.getUserId()))); - item.add(AttributeAppender.append("data-userid", c.getUserId())); + item.add(AttributeModifier.append("style", String.format("background-image: url(profile/%s);", c.getUserId()))); + item.add(AttributeModifier.append("data-userid", c.getUserId())); add(new RefreshIcon("refresh", c, room)); add(new Label("name", getName(c))); WebMarkupContainer actions = new WebMarkupContainer("actions"); @@ -52,7 +52,7 @@ public class RoomClientPanel extends Panel { actions.setVisible(room.getClient().hasRight(Right.moderator)); if (c.getUid().equals(room.getClient().getUid())) { actions.add(new SelfIconsPanel("icons", c, room, false)); - item.add(AttributeAppender.append("class", "current")); + item.add(AttributeModifier.append("class", "current")); } else { actions.add(new ClientIconsPanel("icons", c, room)); } @@ -97,6 +97,6 @@ public class RoomClientPanel extends Panel { } //FIXME TODO add 'typingActivity' //FIXME TODO add ability to change 'first/last name' - add(new WebMarkupContainer("status").add(AttributeAppender.append("class", status), AttributeAppender.replace("title", getString(statusTitle)))); + add(new WebMarkupContainer("status").add(AttributeModifier.append("class", status), AttributeModifier.replace("title", getString(statusTitle)))); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index d69c7f0..611031f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -365,7 +365,7 @@ public class RoomSidebar extends Panel { roomFiles.setReadOnly(!showFiles, handler); } - public void updateUsers(IPartialPageRequestHandler handler) { + public void update(IPartialPageRequestHandler handler) { updateShowFiles(handler); updateUsers(); selfRights.setVisible(room.getRoom().isAllowUserQuestions() || room.getClient().hasRight(Right.moderator)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java index b7f14cc..d01c588 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java @@ -37,10 +37,10 @@ import org.apache.openmeetings.util.process.ConverterProcessResultList; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.room.RoomPanel; import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; import org.apache.wicket.markup.head.IHeaderResponse; @@ -123,7 +123,7 @@ public class UploadDialog extends AbstractFormDialog<String> { return null; } })); - uploadField.add(AttributeAppender.append("accept", StoredFile.getAcceptAttr())); + uploadField.add(AttributeModifier.append("accept", StoredFile.getAcceptAttr())); Form<String> nameForm = new Form<>("name-form"); fileName = new HiddenField<>("name", Model.of("")); fileName.add(new AjaxFormSubmitBehavior(nameForm, "change") { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java index bddda75..8a6af36 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.web.room.sidebar.icon; import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.web.room.RoomPanel; -import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -71,13 +71,13 @@ public abstract class ClientIcon extends WebMarkupContainer { if (isClickable()) { //request/remove cls.append(CLS_CLICKABLE); - add(AttributeAppender.replace("onclick", getScript())); + add(AttributeModifier.replace("onclick", getScript())); } else { - add(AttributeAppender.replace("onclick", "")); + add(AttributeModifier.replace("onclick", "")); } internalUpdate(); - add(AttributeAppender.replace("title", getTitle())); - add(AttributeAppender.replace("class", cls.append(cssClass))); + add(AttributeModifier.replace("title", getTitle())); + add(AttributeModifier.replace("class", cls.append(cssClass))); if (handler != null) { handler.add(this); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index 2a62170..bc68354 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -61,7 +61,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.EventPropagation; import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; @@ -150,17 +149,17 @@ public class MessagesContactsPanel extends UserPanel { private WebMarkupContainer selectedFolder; private void setDefaultFolderClass() { - inbox.add(AttributeAppender.replace("class", "email inbox clickable")); - sent.add(AttributeAppender.replace("class", "email sent clickable")); - trash.add(AttributeAppender.replace("class", "email trash clickable")); + inbox.add(AttributeModifier.replace("class", "email inbox clickable")); + sent.add(AttributeModifier.replace("class", "email sent clickable")); + trash.add(AttributeModifier.replace("class", "email trash clickable")); } private static void selectFolder(WebMarkupContainer folder) { - folder.add(AttributeAppender.append("class", "ui-widget-header ui-corner-all")); + folder.add(AttributeModifier.append("class", "ui-widget-header ui-corner-all")); } private void setFolderClass(ListItem<PrivateMessageFolder> folder) { - folder.add(AttributeAppender.replace("class", "email folder clickable")); + folder.add(AttributeModifier.replace("class", "email folder clickable")); if (folder.getModelObject().getId().equals(selectedFolderModel.getObject())) { selectFolder(folder); } @@ -578,8 +577,8 @@ public class MessagesContactsPanel extends UserPanel { updateContacts(target); } }).setVisible(uc.isPending())); - item.add(new WebMarkupContainer("view").add(AttributeAppender.append("onclick", String.format("showUserInfo(%s);", userId)))); - item.add(new WebMarkupContainer("message").add(AttributeAppender.append("onclick", String.format("privateMessage(%s);", userId))).setVisible(!uc.isPending())); + item.add(new WebMarkupContainer("view").add(AttributeModifier.append("onclick", String.format("showUserInfo(%s);", userId)))); + item.add(new WebMarkupContainer("message").add(AttributeModifier.append("onclick", String.format("privateMessage(%s);", userId))).setVisible(!uc.isPending())); item.add(new ConfirmableAjaxBorder("delete", getString("80"), getString("833")) { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index 2d3f3fe..02be695 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -35,7 +35,6 @@ import org.apache.openmeetings.web.common.PagingNavigatorPanel; import org.apache.openmeetings.web.common.UserPanel; import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -125,11 +124,11 @@ public class UserSearchPanel extends UserPanel { item.add(new Label("tz", getBean(TimezoneUtil.class).getTimeZone(u).getID())); item.add(new Label("offer", u.getUserOffers())); item.add(new Label("search", u.getUserSearchs())); - item.add(new WebMarkupContainer("view").add(AttributeAppender.append("onclick", String.format("showUserInfo(%s);", userId)))); + item.add(new WebMarkupContainer("view").add(AttributeModifier.append("onclick", String.format("showUserInfo(%s);", userId)))); item.add(new WebMarkupContainer("add").setVisible(userId != getUserId() && !contactsDao.isContact(userId, getUserId())) - .add(AttributeAppender.append("onclick", String.format("addContact(%s);", userId)))); - item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(AttributeAppender.append("onclick", String.format("privateMessage(%s);", userId)))); - item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(AttributeAppender.append("onclick", String.format("inviteUser(%s);", userId)))); + .add(AttributeModifier.append("onclick", String.format("addContact(%s);", userId)))); + item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("privateMessage(%s);", userId)))); + item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("inviteUser(%s);", userId)))); //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java index a319ecf..91b1827 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java @@ -182,7 +182,7 @@ public class TestSendIcalMessage extends AbstractJUnitDefaults { // Create ICal Message String meetingId = handler.addNewMeeting(start.getTime(), end.getTime(), "test event", atts, "localhost:5080/link_openmeetings", - organizerAttendee, "", TimeZone.getDefault().getID()); + organizerAttendee, "", java.util.TimeZone.getDefault().getID()); log.debug("meetingId " + meetingId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/openmeetings-webservice/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml index a0c383b..2588c67 100644 --- a/openmeetings-webservice/pom.xml +++ b/openmeetings-webservice/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-webservice</artifactId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52791442/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a993c9a..701586f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Openmeetings</name> <description>Parent project for all OpenMeetings Maven modules. Required to hold general settings</description> @@ -442,14 +442,10 @@ </mailingLists> <repositories> <repository> - <releases><enabled>false</enabled></releases> - <snapshots><enabled>true</enabled></snapshots> <id>apache-snapshots</id> <url>https://repository.apache.org/content/groups/snapshots</url> - </repository> - <repository> - <id>openmeetings-bintray</id> - <url>https://dl.bintray.com/openmeetings/maven</url> + <releases><enabled>false</enabled></releases> + <snapshots><enabled>true</enabled></snapshots> </repository> <repository> <id>sonatype-snapshots</id> @@ -458,6 +454,12 @@ <releases><enabled>false</enabled></releases> <snapshots><enabled>true</enabled></snapshots> </repository> + <repository> + <id>openmeetings-bintray</id> + <url>https://dl.bintray.com/openmeetings/maven</url> + <releases><enabled>true</enabled></releases> + <snapshots><enabled>false</enabled></snapshots> + </repository> </repositories> <pluginRepositories> <pluginRepository>
