no jira: trailing spaces are removed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/aa8e0d58 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/aa8e0d58 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/aa8e0d58 Branch: refs/heads/master Commit: aa8e0d58b87cea7a3678dddecac956d2c7614d6e Parents: de5dd6a Author: Maxim Solodovnik <[email protected]> Authored: Mon Sep 25 13:51:14 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Sep 25 13:51:14 2017 +0700 ---------------------------------------------------------------------- openmeetings-core/pom.xml | 6 +- .../core/data/beans/rooms/RoomsList.java | 3 +- .../listener/async/StreamAudioWriter.java | 2 +- .../core/documents/LibraryDocuments.java | 1 - .../core/documents/LibraryWmlLoader.java | 10 +- .../openmeetings/core/ldap/LdapOptions.java | 6 +- .../test/EditorPaneLinkDetector.java | 26 ++--- .../openmeetings/test/TestConnection.java | 2 +- .../apache/openmeetings/test/gui/TestGui.java | 2 +- .../test/jai/TestInterpolation.java | 20 ++-- .../openmeetings/test/userdata/TestMD5.java | 4 +- openmeetings-db/pom.xml | 2 +- .../openmeetings/db/dao/IDataProviderDao.java | 20 ++-- .../db/dao/IGroupAdminDataProviderDao.java | 4 +- .../db/dto/file/FileExplorerObject.java | 2 +- .../db/dto/file/LibraryPresenationThumbs.java | 5 +- .../db/dto/file/LibraryPresentationFile.java | 5 +- .../db/dto/file/LibraryPresentationThumb.java | 7 +- .../db/dto/file/PresentationObject.java | 7 +- .../db/dto/record/RecordingContainerData.java | 7 +- .../openmeetings/db/dto/room/BrowserStatus.java | 6 +- .../openmeetings/db/dto/room/Cliparts.java | 2 +- .../openmeetings/db/dto/room/InvitationDTO.java | 18 ++-- .../openmeetings/db/dto/room/RoomReturn.java | 2 +- .../openmeetings/db/dto/room/RoomStatus.java | 4 +- .../openmeetings/db/dto/room/RoomUser.java | 7 +- .../db/entity/IDataProviderEntity.java | 2 +- .../db/entity/basic/ChatMessage.java | 8 +- .../db/entity/basic/MailMessage.java | 6 +- .../db/entity/label/StringLabel.java | 4 +- .../db/entity/record/RecordingMetaData.java | 6 +- .../db/entity/record/RecordingMetaDelta.java | 74 +++++++-------- .../db/entity/room/RoomModerator.java | 34 +++---- .../db/entity/room/RoomPollAnswer.java | 12 +-- .../db/entity/server/OAuthServer.java | 30 +++--- .../db/entity/server/RemoteSessionObject.java | 15 ++- .../db/entity/server/SOAPLogin.java | 54 +++++------ .../db/entity/server/Sessiondata.java | 2 +- .../openmeetings/db/entity/user/GroupUser.java | 12 +-- .../db/entity/user/PrivateMessageFolder.java | 18 ++-- .../db/entity/user/UserContact.java | 28 +++--- openmeetings-flash/pom.xml | 1 - .../swf10/networkTesting/networktesting.lzx | 12 +-- .../src/main/swf10/networkTesting/restCall.lzx | 45 +++++---- .../swf10/networkTesting/tests/NetworkTest.lzx | 2 +- .../tests/PortAvailabilityTest.lzx | 2 +- .../main/swf10/networkTesting/tests/library.lzx | 32 +++---- .../src/test/flex/org/test/TestApp.as | 6 +- openmeetings-install/pom.xml | 2 +- .../AppointmentReminderTypeConverter.java | 2 +- .../openmeetings/backup/InlineConverter.java | 2 +- .../backup/OmCalendarConverter.java | 4 +- .../apache/openmeetings/backup/OmConverter.java | 4 +- .../openmeetings/backup/ProgressHolder.java | 2 +- .../org/apache/openmeetings/cli/Db2Patcher.java | 2 +- .../apache/openmeetings/cli/DerbyPatcher.java | 6 +- .../apache/openmeetings/cli/OraclePatcher.java | 2 +- .../openmeetings/cli/PostgresPatcher.java | 2 +- openmeetings-screenshare/pom.xml | 2 +- .../openmeetings/screenshare/AudioTone.java | 2 +- .../screenshare/BaseScreenEncoder.java | 3 +- .../screenshare/IScreenEncoder.java | 4 +- .../screenshare/RTMPClientPublish.java | 14 +-- .../screenshare/ScreenV1Encoder.java | 28 +++--- .../screenshare/gui/NumberSpinner.java | 2 +- .../screenshare/gui/ScreenDimensions.java | 8 +- .../gui/ScreenHeightMouseListener.java | 2 +- .../openmeetings/screenshare/job/CursorJob.java | 4 +- .../openmeetings/screenshare/job/EncodeJob.java | 6 +- .../src/main/resources/logback.xml | 6 +- openmeetings-server/pom.xml | 2 +- .../src/site/resources/js/site.js | 6 +- .../src/site/stylesheets/errorvalues.xml | 2 +- .../src/site/xdoc/BitrixPlugin.xml | 17 ++-- .../src/site/xdoc/BuildInstructions_3.0.x.xml | 4 +- .../src/site/xdoc/CommandLineAdmin.xml | 2 +- .../src/site/xdoc/CustomRoomTypeHowTo.xml | 2 +- .../src/site/xdoc/DrupalPlugin.xml | 24 ++--- .../src/site/xdoc/EditTemplates.xml | 14 ++- .../src/site/xdoc/JoomlaPlugin.xml | 25 +++-- .../src/site/xdoc/LdapAndADS.xml | 2 +- .../src/site/xdoc/MSSQLConfig.xml | 2 +- .../src/site/xdoc/ManualTesting.xml | 28 +++--- .../src/site/xdoc/MoodlePlugin.xml | 13 +-- .../src/site/xdoc/NewsArchive.xml | 4 +- .../src/site/xdoc/PostgresConfig.xml | 2 +- .../src/site/xdoc/RTMPSAndHTTPS.xml | 10 +- .../src/site/xdoc/RedminePlugin.xml | 2 +- .../src/site/xdoc/ReleaseGuide.xml | 15 ++- .../src/site/xdoc/RestAPISample.xml | 11 +-- .../src/site/xdoc/RestrictedAccess.xml | 8 -- .../src/site/xdoc/SakaiPlugin.xml | 4 +- openmeetings-server/src/site/xdoc/Upgrade.xml | 14 ++- .../src/site/xdoc/WebappNamePath.xml | 8 +- .../src/site/xdoc/WebsiteGuide.xml | 6 +- .../src/site/xdoc/commercial-support.xml | 16 ++-- openmeetings-server/src/site/xdoc/downloads.xml | 4 +- .../src/site/xdoc/installation.xml | 13 +-- .../src/site/xdoc/red5sip-integration_2.0.xml | 99 ++++++++++---------- .../src/site/xdoc/red5sip-integration_2.1.xml | 8 +- .../src/site/xdoc/red5sip-integration_3.0.xml | 8 +- .../src/site/xdoc/red5sip-integration_3.1.xml | 8 +- openmeetings-server/src/site/xdoc/security.xml | 10 +- openmeetings-service/pom.xml | 2 +- .../caldav/handler/MultigetHandler.java | 19 ++-- .../calendar/caldav/methods/SyncMethod.java | 10 +- .../mail/template/AbstractTemplatePanel.html | 5 +- .../service/mail/template/FeedbackTemplate.java | 2 +- .../mail/template/RegisterUserTemplate.html | 5 +- .../mail/template/ResetPasswordTemplate.html | 5 +- .../subject/AbstractAppointmentTemplate.html | 7 +- .../subject/AppointmentReminderTemplate.html | 5 +- .../subject/CanceledAppointmentTemplate.html | 5 +- .../subject/CreatedAppointmentTemplate.html | 5 +- .../subject/RecordingExpiringTemplate.html | 5 +- .../subject/UpdatedAppointmentTemplate.html | 5 +- openmeetings-util/pom.xml | 2 +- .../org/apache/openmeetings/util/DaoHelper.java | 10 +- .../openmeetings/util/OMContextListener.java | 2 +- .../util/message/TextRoomMessage.java | 2 +- .../util/process/ConverterProcessResult.java | 6 +- .../util/process/FileImportError.java | 3 +- openmeetings-web/pom.xml | 2 +- .../openmeetings/web/admin/AdminBaseForm.java | 38 ++++---- .../web/admin/SearchableDataView.java | 8 +- .../web/admin/backup/BackupPanel.html | 2 +- .../web/admin/groups/GroupUsersPanel.html | 5 +- .../openmeetings/web/admin/users/UserForm.html | 5 +- .../web/app/Application.properties.xml | 2 +- .../web/app/Application_ar.properties.xml | 2 +- .../web/app/Application_bg.properties.xml | 2 +- .../web/app/Application_ca.properties.xml | 2 +- .../web/app/Application_cs.properties.xml | 2 +- .../web/app/Application_da.properties.xml | 2 +- .../web/app/Application_de.properties.xml | 28 +++--- .../web/app/Application_el.properties.xml | 2 +- .../web/app/Application_es.properties.xml | 28 +++--- .../web/app/Application_fa.properties.xml | 2 +- .../web/app/Application_fi.properties.xml | 2 +- .../web/app/Application_fr.properties.xml | 8 +- .../web/app/Application_gl.properties.xml | 2 +- .../web/app/Application_hu.properties.xml | 13 ++- .../web/app/Application_id.properties.xml | 2 +- .../web/app/Application_it.properties.xml | 6 +- .../web/app/Application_ja.properties.xml | 2 +- .../web/app/Application_ko.properties.xml | 2 +- .../web/app/Application_nl.properties.xml | 2 +- .../web/app/Application_pl.properties.xml | 2 +- .../web/app/Application_pt.properties.xml | 2 +- .../web/app/Application_pt_BR.properties.xml | 2 +- .../web/app/Application_ru.properties.xml | 8 +- .../web/app/Application_sk.properties.xml | 2 +- .../web/app/Application_sv.properties.xml | 2 +- .../web/app/Application_th.properties.xml | 2 +- .../web/app/Application_tr.properties.xml | 2 +- .../web/app/Application_uk.properties.xml | 8 +- .../web/app/Application_zh_CN.properties.xml | 2 +- .../web/app/Application_zh_TW.properties.xml | 2 +- .../web/common/ErrorMessagePanel.java | 2 +- .../openmeetings/web/common/ImagePanel.html | 5 +- .../openmeetings/web/common/MainPanel.html | 7 +- .../openmeetings/web/common/OmButton.java | 6 +- .../web/common/OmPagingNavigator.java | 3 +- .../web/common/UploadableImagePanel.html | 8 +- .../web/common/menu/MenuFunctionsBehavior.java | 6 +- .../web/common/menu/RoomMenuItem.java | 4 +- .../web/pages/AccessDeniedPage.html | 5 +- .../web/pages/BaseNotInitedPage.java | 8 +- .../web/pages/InvitationPasswordDialog.html | 5 +- .../openmeetings/web/pages/NotInitedPage.html | 2 +- .../openmeetings/web/pages/NotInitedPage.java | 2 +- .../web/pages/auth/SignInDialog.html | 2 +- .../web/pages/install/CongratulationsPanel.java | 2 +- .../openmeetings/web/room/NicknameDialog.html | 5 +- .../apache/openmeetings/web/room/RoomPanel.html | 5 +- .../openmeetings/web/room/VideoSettings.html | 5 +- .../web/room/menu/RoomMenuPanel.html | 2 +- .../apache/openmeetings/web/room/settings.js | 2 +- .../web/room/sidebar/ClientIconsPanel.html | 5 +- .../web/room/sidebar/RoomSidebar.html | 5 +- .../web/room/sidebar/SelfIconsPanel.html | 5 +- .../openmeetings/web/room/wb/WbPanel.html | 2 +- .../org/apache/openmeetings/web/room/wb/wb.js | 6 +- .../calendar/CalendarFunctionsBehavior.java | 8 +- .../web/user/calendar/OmCalendarEvent.java | 2 +- .../web/user/calendar/calendar-functions.js | 4 +- .../apache/openmeetings/web/user/chat/Chat.html | 5 +- .../web/user/dashboard/MyRoomsWidgetView.html | 5 +- .../web/user/dashboard/OmDashboardPanel.html | 5 +- .../user/dashboard/RecentRoomsWidgetView.html | 5 +- .../web/user/dashboard/admin/AdminWidget.java | 4 +- .../web/user/profile/UserProfilePanel.html | 4 +- .../web/user/record/RecordingsPanel.html | 5 +- .../openmeetings/web/user/record/VideoInfo.html | 6 +- .../web/user/rooms/RoomEnterBehavior.java | 6 +- .../openmeetings/web/util/RoomTypeDropDown.java | 4 +- .../openmeetings/web/util/UserDashboard.java | 6 +- .../openmeetings/web/util/UserMultiChoice.java | 3 +- .../upload/BootstrapFileUploadBehavior.java | 6 +- .../WEB-INF/classes/applicationContext.xml | 4 +- .../main/webapp/WEB-INF/classes/cxf-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/css/general.css | 6 +- openmeetings-web/src/main/webapp/css/tree.css | 2 +- .../src/main/webapp/languages/languages.xml | 6 +- .../calendar/TestAppointmentSchedulerTask.java | 6 +- ...tDatabaseStructureGetAppointmentByRange.java | 12 +-- .../TestDatabaseStructureGetUserStart.java | 2 +- .../TestDatabaseStructureMeetingMember.java | 12 +-- .../test/calendar/TestGetAppointment.java | 10 +- .../test/derby/PrepareSystemFiles.java | 18 ++-- .../openmeetings/test/domain/TestAddGroup.java | 2 +- .../test/library/TestFileParser.java | 14 +-- .../test/selenium/SeleniumUtils.java | 14 +-- .../openmeetings/test/userdata/TestLogin.java | 8 +- openmeetings-webservice/pom.xml | 2 +- 216 files changed, 808 insertions(+), 898 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index fac5053..3fdaafd 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -15,9 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java index 8923ff1..7e96418 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java @@ -21,7 +21,7 @@ package org.apache.openmeetings.core.data.beans.rooms; import org.apache.openmeetings.db.entity.room.Room; public class RoomsList { - + Room[] roomList = null; public Room[] getRoomList() { @@ -30,5 +30,4 @@ public class RoomsList { public void setRoomList(Room[] roomList) { this.roomList = roomList; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java index 736fea6..275ce23 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java @@ -121,7 +121,7 @@ public class StreamAudioWriter extends BaseStreamWriter { // That will be not bigger then long value startTimeStamp = streampacket.getTimestamp(); - + RecordingMetaData metaData = metaDataDao.get(metaDataId); metaData.setRecordStart(virtualTime); metaDataDao.update(metaData); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java index cad6c34..2663e5c 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java @@ -23,7 +23,6 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class LibraryDocuments { - private static final Logger log = Red5LoggerFactory.getLogger(LibraryDocuments.class, OpenmeetingsVariables.webAppRootKey); private static LibraryDocuments instance; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java index f37c79a..da8a837 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java @@ -39,7 +39,7 @@ import com.thoughtworks.xstream.io.xml.XppDriver; public class LibraryWmlLoader { private static final Logger log = Red5LoggerFactory.getLogger(LibraryWmlLoader.class, webAppRootKey); - + public static List<?> loadWmlFile(String fileName){ try { String name = fileName; @@ -48,21 +48,21 @@ public class LibraryWmlLoader { } File file = new File(OmFileHelper.getUploadWmlDir(), name); log.debug("filepathComplete: " + file); - + XStream xStream = new XStream(new XppDriver()); xStream.setMode(XStream.NO_REFERENCES); - + try (InputStream is = new FileInputStream(file); BufferedReader reader = new BufferedReader(new InputStreamReader(is, UTF_8))) { List<?> lMapList = (List<?>) xStream.fromXML(reader); - + return lMapList; } } catch (Exception err){ log.error("loadWmlFile",err); } - + return new ArrayList<>(); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java index 8d51c43..26b468c 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java @@ -85,21 +85,21 @@ public class LdapOptions { } catch (Exception e) { log.error(String.format("ConfigKey in Ldap Config contains invalid auth type : '%s' -> Defaulting to %s", ldap_auth_type, type)); } - + String ldap_prov_type = config.getProperty(CONFIGKEY_LDAP_PROV_TYPE, ""); try { prov = Provisionning.valueOf(ldap_prov_type); } catch (Exception e) { log.error(String.format("ConfigKey in Ldap Config contains invalid provisionning type : '%s' -> Defaulting to %s", ldap_prov_type, prov)); } - + String ldap_deref_mode = config.getProperty(CONFIGKEY_LDAP_DEREF_MODE, ""); try { derefMode = AliasDerefMode.getDerefMode(ldap_deref_mode); } catch (Exception e) { log.error(String.format("ConfigKey in Ldap Config contains invalid deref mode : '%s' -> Defaulting to %s", ldap_deref_mode, derefMode)); } - + if (AuthType.NONE == type && Provisionning.NONE == prov) { throw new RuntimeException("Both AuthType and Provisionning are NONE!"); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java index 2a3884e..e7a5c5b 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java @@ -51,9 +51,9 @@ import org.slf4j.Logger; * A "HTML" JEditorPane embedded with a special HTMLDocument that detects urls * and displays them as hyperlinks. When CTRL is pressed, the urls are * clickable. - * + * * @author David Bismut - * + * */ public class EditorPaneLinkDetector extends JEditorPane { private static final long serialVersionUID = 1L; @@ -111,7 +111,7 @@ public class EditorPaneLinkDetector extends JEditorPane { addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { - + if (e.getKeyCode() == KeyEvent.VK_CONTROL) { if (isEditable()) { setEditable(false); @@ -126,7 +126,7 @@ public class EditorPaneLinkDetector extends JEditorPane { @Override public void keyReleased(KeyEvent e) { - + if (e.getKeyCode() == KeyEvent.VK_CONTROL) { setEditable(true); } @@ -140,7 +140,7 @@ public class EditorPaneLinkDetector extends JEditorPane { public HTMLDocLinkDetector(StyleSheet ss) { super(ss); - + setAsynchronousLoadPriority(4); setTokenThreshold(100); setParser(new ParserDelegator()); @@ -149,13 +149,13 @@ public class EditorPaneLinkDetector extends JEditorPane { /** * Returns true if the Element contains a HTML.Tag.A attribute, false * otherwise. - * + * * @param e * the Element to be checkd * @return */ protected boolean isLink(Element e) { - + return (e.getAttributes().getAttribute(HTML.Tag.A) != null); } @@ -163,13 +163,13 @@ public class EditorPaneLinkDetector extends JEditorPane { /** * This method corrects or creates a url contained in an Element as an * hyperlink. - * + * * @param e * the Element to be computed * @throws BadLocationException */ protected void computeLinks(Element e) throws BadLocationException { - + int caretPos = getCaretPosition(); try { if (isLink(e)) @@ -188,7 +188,7 @@ public class EditorPaneLinkDetector extends JEditorPane { * when the url is beeing edited. What the function does is to remove * the html tags, so the url is actually edited in plain text and not as * an hyperlink. - * + * * @param e * the Element that contains the url * @throws BadLocationException @@ -196,7 +196,7 @@ public class EditorPaneLinkDetector extends JEditorPane { */ protected void correctLink(Element e) throws BadLocationException, IOException { - + int length = e.getEndOffset() - e.getStartOffset(); boolean endOfDoc = e.getEndOffset() == getLength() + 1; @@ -223,7 +223,7 @@ public class EditorPaneLinkDetector extends JEditorPane { * The method check if the element contains a url in plain text, and if * so, it creates the html tag HTML.Tag.A to have the url displayed as * an hyperlink. - * + * * @param e * element that contains the url * @throws BadLocationException @@ -231,7 +231,7 @@ public class EditorPaneLinkDetector extends JEditorPane { */ protected void createLink(Element e) throws BadLocationException, IOException { - + int caretPos = getCaretPosition(); int startOffset = e.getStartOffset(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/test/java/org/apache/openmeetings/test/TestConnection.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/TestConnection.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/TestConnection.java index 4bf09be..fd43134 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/TestConnection.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/TestConnection.java @@ -24,6 +24,6 @@ public class TestConnection { @Test public void testNoop() { - + //no-op } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java index e30a44f..b8a1295 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/TestGui.java @@ -25,6 +25,6 @@ public class TestGui { @Test public void testNoop() { - + // no-op } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java index 17a8112..bd63cf7 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java @@ -26,36 +26,36 @@ import org.slf4j.Logger; public class TestInterpolation { private static final Logger log = Red5LoggerFactory.getLogger(TestInterpolation.class, webAppRootKey); - + @Test public void testInterpolate() { try { - + // GeomPoint p1 = new Point(-60,-100); // GeomPoint p2 = new Point(20, 50); // // //double[] samples = {-100,-50}; -// +// // GeomPoint gPoint = GeomPoint.interpolate(p1, p2, new Float(0.5)); -// +// // log.debug("Interpolated: "+gPoint); -// -// +// +// // GeomPoint p3 = new GeomPoint(); // p3.setLocation(-2,4); // //p3.setLocation(3,4); // p3.normalize(10); // //GeomPoint -// -// +// +// // p3.setLocation(2,-4); // //p3.setLocation(3,4); // p3.normalize(10); -// +// } catch (Exception er) { log.error("ERROR ", er); } } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java index ee9d96a..4f3efb1 100644 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java +++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestMD5.java @@ -21,10 +21,10 @@ package org.apache.openmeetings.test.userdata; import org.junit.Test; public class TestMD5 { - + @Test public void testTestMD5() { - + // no-op } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml index 4875faf..7593da2 100644 --- a/openmeetings-db/pom.xml +++ b/openmeetings-db/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java index e55e270..e9ca246 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java @@ -24,26 +24,26 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity; /** * General interface to perform CRUD operations on entities - * + * * @author solomax, swagner - * + * * @param <T> */ public interface IDataProviderDao<T extends IDataProviderEntity> { /** * Get an instance of an {@link T} - * + * * @param id - id of instance to retrieve * @return instance with the id gived */ T get(Long id); T get(long id); - + /** * Get a list of instances of {@link T} - * + * * @param start - the start to range to retrieve * @param count - maximum instance count to retrieve * @return list of instances in the range specified @@ -52,7 +52,7 @@ public interface IDataProviderDao<T extends IDataProviderEntity> { /** * Get a list of instances of {@link T} - * + * * @param search - string search criteria to filter entities * @param start - the start to range to retrieve * @param count - maximum instance count to retrieve @@ -63,14 +63,14 @@ public interface IDataProviderDao<T extends IDataProviderEntity> { /** * Count the number of instances of {@link T} - * + * * @return count of instances */ long count(); /** * Count the number of instances of {@link T} - * + * * @param search - string search criteria to filter entities * @return count of instances satisfying given search criteria */ @@ -78,7 +78,7 @@ public interface IDataProviderDao<T extends IDataProviderEntity> { /** * Update an instance of {@link T} - * + * * @param entity - entity to be updated * @param userId - user performed update */ @@ -86,7 +86,7 @@ public interface IDataProviderDao<T extends IDataProviderEntity> { /** * Delete an instance of {@link T} - * + * * @param entity - entity to be deleted * @param userId - user performed delete */ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java index 4a943e9..6946af4 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IGroupAdminDataProviderDao.java @@ -25,7 +25,7 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity; public interface IGroupAdminDataProviderDao<T extends IDataProviderEntity> extends IDataProviderDao<T> { /** * Get a list of instances of {@link T} - * + * * @param search - string search criteria to filter entities * @param adminId - id of group admin user * @param start - the start to range to retrieve @@ -37,7 +37,7 @@ public interface IGroupAdminDataProviderDao<T extends IDataProviderEntity> exten /** * Count the number of instances of {@link T} - * + * * @param search - string search criteria to filter entities * @param adminId - id of group admin user * @return count of instances satisfying given search criteria http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java index 3501183..8196e46 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerObject.java @@ -35,7 +35,7 @@ import org.apache.openmeetings.db.entity.file.FileItem; @XmlAccessorType(XmlAccessType.FIELD) public class FileExplorerObject implements Serializable { private static final long serialVersionUID = 1L; - + private List<FileItemDTO> userHome; private List<FileItemDTO> roomHome; private Long userHomeSize; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java index 059ad53..e7dff13 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresenationThumbs.java @@ -22,9 +22,9 @@ public class LibraryPresenationThumbs { private String name = ""; private LibraryPresentationThumb[] thumbs = null; - + public LibraryPresenationThumbs() {} - + public String getName() { return name; } @@ -37,5 +37,4 @@ public class LibraryPresenationThumbs { public void setThumbs(LibraryPresentationThumb[] thumbs) { this.thumbs = thumbs; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java index ed4b8a6..c36c2f4 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationFile.java @@ -24,9 +24,9 @@ public class LibraryPresentationFile { private String filename = null; private String lastmod = null; private Long size = null; - + public LibraryPresentationFile() {} - + public String getName() { return name; } @@ -51,5 +51,4 @@ public class LibraryPresentationFile { public void setSize(Long size) { this.size = size; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java index cef6fb6..c33c716 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/LibraryPresentationThumb.java @@ -19,14 +19,14 @@ package org.apache.openmeetings.db.dto.file; public class LibraryPresentationThumb { - + private String name = null; private String filename = null; private String lastmod = null; private Long size = null; - + public LibraryPresentationThumb() {} - + public String getName() { return name; } @@ -51,5 +51,4 @@ public class LibraryPresentationThumb { public void setSize(Long size) { this.size = size; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java index 23285d5..3ebf14c 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/PresentationObject.java @@ -25,14 +25,14 @@ import java.util.LinkedList; * */ public class PresentationObject { - + private FileItemDTO originalDocument; private FileItemDTO pdfDocument; private FileItemDTO swfDocument; LinkedList<FileItemDTO> thumbs; public PresentationObject() {} - + public FileItemDTO getOriginalDocument() { return originalDocument; } @@ -57,7 +57,4 @@ public class PresentationObject { public void setThumbs(LinkedList<FileItemDTO> thumbs) { this.thumbs = thumbs; } - - - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java index 84080fd..9cfda04 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/record/RecordingContainerData.java @@ -22,12 +22,12 @@ import java.io.Serializable; public class RecordingContainerData implements Serializable { private static final long serialVersionUID = 1L; - + private long userHomeSize; private long publicFileSize; - + public RecordingContainerData() {} - + public long getUserHomeSize() { return userHomeSize; } @@ -40,5 +40,4 @@ public class RecordingContainerData implements Serializable { public void setPublicFileSize(long publicFileSize) { this.publicFileSize = publicFileSize; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java index 19c6112..be86e9b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/BrowserStatus.java @@ -19,12 +19,11 @@ package org.apache.openmeetings.db.dto.room; public class BrowserStatus { - private boolean browserInited = false; private String currentURL = ""; - + public BrowserStatus() {} - + public boolean isBrowserInited() { return browserInited; } @@ -37,5 +36,4 @@ public class BrowserStatus { public void setCurrentURL(String currentURL) { this.currentURL = currentURL; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java index 950ae1f..457b6fd 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Cliparts.java @@ -27,7 +27,7 @@ public class Cliparts { private List<Cliparts> subCategories; public Cliparts() {} - + public String[] getGeneralList() { return generalList; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java index 2f9636a..18c1693 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java @@ -50,7 +50,7 @@ public class InvitationDTO implements Serializable { return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); }; }; - + private String email; private String firstname; private String lastname; @@ -63,9 +63,9 @@ public class InvitationDTO implements Serializable { private String validFrom; private String validTo; private long languageId; - + public InvitationDTO() {} - + public String getEmail() { return email; } @@ -122,7 +122,7 @@ public class InvitationDTO implements Serializable { } /** * Method to get valid from date-time in format YYYY-MM-dd HH:mm:ss - * + * * @return date-time in format YYYY-MM-dd HH:mm:ss */ public String getValidFrom() { @@ -130,7 +130,7 @@ public class InvitationDTO implements Serializable { } /** * Method to set valid from date-time in format YYYY-MM-dd HH:mm:ss - * + * * @param validFrom date-time in format YYYY-MM-dd HH:mm:ss */ public void setValidFrom(String validFrom) { @@ -138,7 +138,7 @@ public class InvitationDTO implements Serializable { } /** * Method to get valid to date-time in format YYYY-MM-dd HH:mm:ss - * + * * @return date-time in format YYYY-MM-dd HH:mm:ss */ public String getValidTo() { @@ -146,7 +146,7 @@ public class InvitationDTO implements Serializable { } /** * Method to set valid to date-time in format YYYY-MM-dd HH:mm:ss - * + * * @param validFrom date-time in format YYYY-MM-dd HH:mm:ss */ public void setValidTo(String validTo) { @@ -158,7 +158,7 @@ public class InvitationDTO implements Serializable { public void setLanguageId(long languageId) { this.languageId = languageId; } - + public Invitation get(Long userId, UserDao userDao, RoomDao roomDao) { Invitation i = new Invitation(); i.setHash(UUID.randomUUID().toString()); @@ -169,7 +169,7 @@ public class InvitationDTO implements Serializable { i.setUsed(false); i.setValid(valid); - + try { // valid period of Invitation switch (valid) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java index 54a1203..8d6d3c8 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomReturn.java @@ -29,7 +29,7 @@ public class RoomReturn { private RoomUser[] roomUser; public RoomReturn() {} - + public Long getRoomId() { return roomId; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java index 1c5bc51..0f0dbef 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java @@ -25,9 +25,9 @@ import org.apache.openmeetings.db.entity.room.StreamClient; public class RoomStatus { List<StreamClient> clientList; BrowserStatus browserStatus; - + public RoomStatus() {} - + public List<StreamClient> getClientList() { return clientList; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java index 18ecea1..4c59544 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomUser.java @@ -19,16 +19,16 @@ package org.apache.openmeetings.db.dto.room; public class RoomUser { - + private String firstname; private String lastname; private String publicSID; private long broadcastId; private Boolean isBroadCasting; private String avsettings; - + public RoomUser() {} - + public String getFirstname() { return firstname; } @@ -65,5 +65,4 @@ public class RoomUser { public void setBroadcastId(long broadcastId) { this.broadcastId = broadcastId; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java index 4c3f3d0..d51e81e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java @@ -22,6 +22,6 @@ import java.io.Serializable; public interface IDataProviderEntity extends Serializable { Long getId(); - + void setId(Long id); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java index b4b6449..8ad7870 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java @@ -70,13 +70,13 @@ public class ChatMessage implements IDataProviderEntity { @Element(name = "fromUserId", data = true, required = false) @ForeignKey(enabled = true) private User fromUser; - + @ManyToOne @JoinColumn(name = "to_room_id") @Element(name = "toRoomId", data = true, required = false) @ForeignKey(enabled = true) private Room toRoom; - + @ManyToOne @JoinColumn(name = "to_user_id") @Element(name = "toUserId", data = true, required = false) @@ -87,7 +87,7 @@ public class ChatMessage implements IDataProviderEntity { @Lob @Element(name = "message", data = true, required = false) private String message; - + @Column(name = "sent") @Element(name = "sent", data = true, required = false) private Date sent; @@ -95,7 +95,7 @@ public class ChatMessage implements IDataProviderEntity { @Column(name = "need_moderation", nullable = false) @Element(name = "needModeration", data = true, required = false) private boolean needModeration; - + @Override public Long getId() { return id; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java index dc14f03..e77cd66 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java @@ -94,11 +94,11 @@ public class MailMessage implements IDataProviderEntity { public MailMessage() { this(null, null, null, null, null); } - + public MailMessage(String recipients, String replyTo, String subject, String body) { this(recipients, replyTo, subject, body, null); } - + public MailMessage(String recipients, String replyTo, String subject, String body, byte[] ics) { this.recipients = recipients; this.replyTo = replyTo; @@ -106,7 +106,7 @@ public class MailMessage implements IDataProviderEntity { this.body = body; this.ics = ics; } - + @Override public Long getId() { return id; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java index fbc28f1..62c4eb8 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java @@ -33,12 +33,12 @@ public class StringLabel extends SimpleEntry<String, String> implements IDataPro public StringLabel(StringLabel l) { super(l.getKey(), l.getValue()); } - + @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()); } - + @Override public boolean equals(Object o) { if (!(o instanceof Map.Entry)) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java index 71dcb8a..6865cd2 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java @@ -46,11 +46,11 @@ import org.simpleframework.xml.Root; * {@link #streamStatus}, as long as this variable is not set * to {@link Status.STOPPED}, the recording process will not proceed and start to convert all * input sources to a single recording file. - * + * * @author sebawagner */ @Entity -@NamedQueries({ +@NamedQueries({ @NamedQuery(name = "getMetaById", query = "SELECT c FROM RecordingMetaData c WHERE c.id = :id") , @NamedQuery(name = "getMetaByRecording", query = "SELECT c FROM RecordingMetaData c WHERE c.recording.id = :recordingId AND c.deleted = false") , @NamedQuery(name = "getAudioMetaByRecording", query = "SELECT c FROM RecordingMetaData c WHERE c.recording.id = :recordingId " @@ -69,7 +69,7 @@ public class RecordingMetaData implements IDataProviderEntity { , STOPPING , STOPPED } - + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java index eaf76c3..e38a205 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java @@ -31,7 +31,7 @@ import javax.persistence.Table; import org.apache.openmeetings.db.entity.IDataProviderEntity; -@NamedQueries({ +@NamedQueries({ @NamedQuery(name = "getRecordingMetaDeltaByMetaDataId", query = "SELECT c FROM RecordingMetaDelta c WHERE c.metaDataId = :metaDataId") }) @Entity @@ -42,58 +42,58 @@ public class RecordingMetaDelta implements IDataProviderEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") private Long id; - + @Column(name="metadata_id") private Long metaDataId; - + @Column(name="time_stamp") private Integer timeStamp; - + @Column(name="delta_time") private Long deltaTime; - + @Column(name="last_time_stamp") private Long lastTimeStamp; - + @Column(name="start_time") private Date startTime; - + @Column(name="current_event_time") private Date currentTime; - + @Column(name="delta_time_stamp") private Long deltaTimeStamp; - + @Column(name="missing_time") private Long missingTime; - + @Column(name="duration") private Integer duration; - + @Column(name="start_time_stamp") private Integer startTimeStamp; - + @Column(name="packet_time_stamp") private Integer packetTimeStamp; - + @Column(name="wave_out_put_name") private String waveOutPutName; - + @Column(name="data_length_packet") private Integer dataLengthPacket; - + @Column(name="received_audio_data_length") private Long receivedAudioDataLength; - + @Column(name="is_end_padding", nullable = false) private boolean endPadding; - + @Column(name="is_start_padding", nullable = false) private boolean startPadding; - + @Column(name="debug_status") private String debugStatus; - + @Override public Long getId() { return id; @@ -102,124 +102,124 @@ public class RecordingMetaDelta implements IDataProviderEntity { public void setId(Long id) { this.id = id; } - + public Long getMetaDataId() { return metaDataId; } public void setMetaDataId(Long metaDataId) { this.metaDataId = metaDataId; } - + public Integer getTimeStamp() { return timeStamp; } public void setTimeStamp(Integer timeStamp) { this.timeStamp = timeStamp; } - + public Long getDeltaTime() { return deltaTime; } public void setDeltaTime(Long deltaTime) { this.deltaTime = deltaTime; } - + public Long getLastTimeStamp() { return lastTimeStamp; } public void setLastTimeStamp(Long lastTimeStamp) { this.lastTimeStamp = lastTimeStamp; } - + public Long getDeltaTimeStamp() { return deltaTimeStamp; } public void setDeltaTimeStamp(Long deltaTimeStamp) { this.deltaTimeStamp = deltaTimeStamp; } - + public Integer getPacketTimeStamp() { return packetTimeStamp; } public void setPacketTimeStamp(Integer packetTimeStamp) { this.packetTimeStamp = packetTimeStamp; } - + public Integer getStartTimeStamp() { return startTimeStamp; } public void setStartTimeStamp(Integer startTimeStamp) { this.startTimeStamp = startTimeStamp; } - + public Long getMissingTime() { return missingTime; } public void setMissingTime(Long missingTime) { this.missingTime = missingTime; } - + public Integer getDuration() { return duration; } public void setDuration(Integer duration) { this.duration = duration; } - + public Date getStartTime() { return startTime; } public void setStartTime(Date startTime) { this.startTime = startTime; } - + public Date getCurrentTime() { return currentTime; } public void setCurrentTime(Date currentTime) { this.currentTime = currentTime; } - + public boolean isEndPadding() { return endPadding; } public void setEndPadding(boolean endPadding) { this.endPadding = endPadding; } - + public boolean isStartPadding() { return startPadding; } public void setStartPadding(boolean startPadding) { this.startPadding = startPadding; } - + public String getDebugStatus() { return debugStatus; } public void setDebugStatus(String debugStatus) { this.debugStatus = debugStatus; } - + public String getWaveOutPutName() { return waveOutPutName; } public void setWaveOutPutName(String waveOutPutName) { this.waveOutPutName = waveOutPutName; } - + public Integer getDataLengthPacket() { return dataLengthPacket; } public void setDataLengthPacket(Integer dataLengthPacket) { this.dataLengthPacket = dataLengthPacket; } - + public Long getReceivedAudioDataLength() { return receivedAudioDataLength; } public void setReceivedAudioDataLength(Long receivedAudioDataLength) { this.receivedAudioDataLength = receivedAudioDataLength; } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java index 9c45c29..8dcc0c4 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java @@ -50,82 +50,82 @@ import org.simpleframework.xml.Root; @Root(name = "room_moderator") public class RoomModerator implements Serializable { private static final long serialVersionUID = 1L; - + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") private Long id; - + @Column(name = "roomId") private Long roomId; - + @Column(name="is_supermoderator", nullable = false) @Element(name="is_supermoderator", data = true) private boolean superModerator; - - @ManyToOne(fetch = FetchType.EAGER) + + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn (name="user_id") @ForeignKey(enabled = true) @Element(name="user_id", data = true, required=false) private User user; - + @Column(name = "inserted") private Date inserted; - + @Column(name = "updated") private Date updated; - + @Column(name = "deleted", nullable = false) private boolean deleted; - + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - + public boolean isSuperModerator() { return superModerator; } public void setSuperModerator(boolean superModerator) { this.superModerator = superModerator; } - - + + public User getUser() { return user; } public void setUser(User user) { this.user = user; } - + public Date getInserted() { return inserted; } public void setInserted(Date inserted) { this.inserted = inserted; } - + public Date getUpdated() { return updated; } public void setUpdated(Date updated) { this.updated = updated; } - + public boolean isDeleted() { return deleted; } public void setDeleted(boolean deleted) { this.deleted = deleted; } - + public Long getRoomId() { return roomId; } public void setRoomId(Long roomId) { this.roomId = roomId; } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java index 60a45ee..242440f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java @@ -52,29 +52,29 @@ public class RoomPollAnswer implements IDataProviderEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Long id; - + @OneToOne(fetch = FetchType.EAGER) @JoinColumn(name = "user_id") @ForeignKey(enabled = true) @Element(name="voteduserid", data=false, required=false) private User votedUser; - + @Column(name = "answer") @Element(data=false, required=false) private Boolean answer; - + @Column(name = "pointList") @Element(name="pointlist", data=false, required=false) private Integer pointList; - + @Column(name = "voteDate") @Element(name="votedate", data=false) private Date voteDate; - + @OneToOne(fetch = FetchType.EAGER) @JoinColumn(name = "poll_id") private RoomPoll roomPoll; - + @Override public Long getId() { return id; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java index b70b2f9..67f1ab5 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java @@ -49,64 +49,64 @@ public class OAuthServer implements IDataProviderEntity { @Column(name = "id") @Element(data = true) private Long id; - + @Column(name = "name") @Element(data = true) private String name; - + @Column(name = "icon_url") @Element(data = true) private String iconUrl; - + @Column(name = "enabled", nullable = false) @Element(data = true) private boolean enabled; - + @Column(name = "client_id") @Element(data = true) private String clientId; - + @Column(name = "client_secret") @Element(data = true) private String clientSecret; - + @Column(name = "request_key_url") @Element(data = true) private String requestKeyUrl; - + @Column(name = "request_token_url") @Element(data = true) private String requestTokenUrl; - + @Column(name = "request_token_attributes") @Element(data = true) private String requestTokenAttributes; - + @Column(name = "request_method") @Element(data = true) @Enumerated(EnumType.STRING) private RequestMethod requestTokenMethod = RequestMethod.POST; - + @Column(name = "request_info_url") @Element(data = true) private String requestInfoUrl; - + @Column(name = "login_param_name") @Element(data = true) private String loginParamName; - + @Column(name = "email_param_name") @Element(data = true, required = false) private String emailParamName; - + @Column(name = "firstname_param_name") @Element(data = true, required = false) private String firstnameParamName; - + @Column(name = "lastname_param_name") @Element(data = true, required = false) private String lastnameParamName; - + @Column(name = "deleted", nullable = false) @Element(data = true) private boolean deleted; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java index 1ab500c..fbea62c 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java @@ -33,7 +33,7 @@ import org.slf4j.Logger; /** * This Class is marshaled as an XML-Object and stored as a String in the DB to make * it more easy to extend it - * + * * @author sebastianwagner * */ @@ -54,16 +54,15 @@ public class RemoteSessionObject { private String externalUserId; @Element private String externalUserType; - + public RemoteSessionObject() { } - + public RemoteSessionObject(String username, String firstname, String lastname, String pictureUrl, String email) { this(username, firstname, lastname, pictureUrl, email, "0", ""); } - - + /** * @param username * @param firstname @@ -75,8 +74,8 @@ public class RemoteSessionObject { * * 06.09.2009 17:05:48 * sebastianwagner - * - * + * + * */ public RemoteSessionObject(String username, String firstname, String lastname, String pictureUrl, String email, @@ -152,7 +151,7 @@ public class RemoteSessionObject { } return null; } - + @Override public String toString() { return "RemoteSessionObject [username=" + username + ", firstname=" + firstname + ", lastname=" + lastname http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java index bad28b4..ebc3063 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java @@ -42,109 +42,109 @@ public class SOAPLogin implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name="id") private Long id; - + @Column(name="hash") private String hash; - + @Column(name="room_id") private Long roomId; - + @Column(name="session_hash") private String sessionHash; - + @Column(name="created") private Date created; - + @Column(name="used", nullable = false) private boolean used; - + @Column(name="use_date") private Date useDate; - + @Column(name="moderator", nullable = false) private boolean moderator; - + @Column(name="showaudiovideotest", nullable = false) private boolean showAudioVideoTest; - + @Column(name="allow_same_url_multiple_times", nullable = false) private boolean allowSameURLMultipleTimes; - + @Column(name="client_url") private String clientURL; - + @Column(name="recording_id") private Long recordingId; - + @Column(name="landing_zone") private String landingZone; - + @Column(name="allow_recording", nullable = false) private boolean allowRecording; - + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - + public String getHash() { return hash; } public void setHash(String hash) { this.hash = hash; } - + public Long getRoomId() { return roomId; } public void setRoomId(Long roomId) { this.roomId = roomId; } - + public String getSessionHash() { return sessionHash; } public void setSessionHash(String sessionHash) { this.sessionHash = sessionHash; } - + public Date getCreated() { return created; } public void setCreated(Date created) { this.created = created; } - + public boolean isUsed() { return used; } public void setUsed(boolean used) { this.used = used; } - + public Date getUseDate() { return useDate; } public void setUseDate(Date useDate) { this.useDate = useDate; } - + public boolean isModerator() { return moderator; } public void setModerator(boolean moderator) { this.moderator = moderator; } - + public boolean getShowAudioVideoTest() { return showAudioVideoTest; } public void setShowAudioVideoTest(boolean showAudioVideoTest) { this.showAudioVideoTest = showAudioVideoTest; } - + public boolean getAllowSameURLMultipleTimes() { return allowSameURLMultipleTimes; } @@ -158,26 +158,26 @@ public class SOAPLogin implements Serializable { public void setClientURL(String clientURL) { this.clientURL = clientURL; } - + public Long getRecordingId() { return recordingId; } public void setRecordingId(Long recordingId) { this.recordingId = recordingId; } - + public String getLandingZone() { return landingZone; } public void setLandingZone(String landingZone) { this.landingZone = landingZone; } - + public boolean isAllowRecording() { return allowRecording; } public void setAllowRecording(boolean allowRecording) { this.allowRecording = allowRecording; } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java index e8b2576..9041b40 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java @@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlRootElement; @Entity @NamedQueries({ @NamedQuery(name = "getSessionById", query = "SELECT s FROM Sessiondata s WHERE s.sessionId LIKE :sessionId"), - @NamedQuery(name = "getSessionToDelete", query = "SELECT s FROM Sessiondata s WHERE s.refreshed < :refreshed AND s.permanent = false") + @NamedQuery(name = "getSessionToDelete", query = "SELECT s FROM Sessiondata s WHERE s.refreshed < :refreshed AND s.permanent = false") }) @Table(name = "sessiondata") @XmlRootElement http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java index f9240fb..941713d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java @@ -64,24 +64,24 @@ public class GroupUser implements IDataProviderEntity { @JoinColumn(name = "user_id", insertable = true, updatable = true) @ForeignKey(enabled = true) private User user; - + @Column(name = "inserted") private Date inserted; - + @Column(name = "updated") private Date updated; - + @Column(name = "is_moderator", nullable = false) @Element(data = true, required = false) private boolean moderator; - + public GroupUser() {} - + public GroupUser(Group group, User u) { this.group = group; this.user = u; } - + public Group getGroup() { return group; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java index 475ca96..55e3010 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessageFolder.java @@ -41,21 +41,21 @@ public class PrivateMessageFolder implements IDataProviderEntity { @Column(name = "id") @Element(data = true, name = "privateMessageFolderId") private Long id; - + @Column(name="folder_name") @Element(data=true) private String folderName; - + @Column(name="user_id") @Element(data=true) private Long userId; - + @Column(name="inserted") private Date inserted; - + @Column(name="updated") private Date updated; - + @Override public Long getId() { return id; @@ -64,28 +64,28 @@ public class PrivateMessageFolder implements IDataProviderEntity { public void setId(Long id) { this.id = id; } - + public String getFolderName() { return folderName; } public void setFolderName(String folderName) { this.folderName = folderName; } - + public Long getUserId() { return userId; } public void setUserId(Long userId) { this.userId = userId; } - + public Date getInserted() { return inserted; } public void setInserted(Date inserted) { this.inserted = inserted; } - + public Date getUpdated() { return updated; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java index d12571d..da9d05b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java @@ -77,79 +77,79 @@ public class UserContact implements Serializable { @Column(name="id") @Element(data = true, name = "userContactId") private Long id; - + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name="user_id") @Element(data=true, required=false) private User contact; - + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name="owner_id") @ForeignKey(enabled = true) @Element(data=true, required=false) private User owner; - + @Column(name="pending", nullable = false) @Element(data=true) private boolean pending; - + @Column(name="inserted") private Date inserted; - + @Column(name="updated") private Date updated; - + @Column(name="share_calendar", nullable = false) @Element(data=true, required=false) private boolean shareCalendar; - + public Long getId() { return id; } public void setId(Long id) { this.id = id; } - + public User getContact() { return contact; } public void setContact(User contact) { this.contact = contact; } - + public User getOwner() { return owner; } public void setOwner(User owner) { this.owner = owner; } - + public boolean isPending() { return pending; } public void setPending(boolean pending) { this.pending = pending; } - + public Date getInserted() { return inserted; } public void setInserted(Date inserted) { this.inserted = inserted; } - + public Date getUpdated() { return updated; } public void setUpdated(Date updated) { this.updated = updated; } - + public boolean getShareCalendar() { return shareCalendar; } public void setShareCalendar(boolean shareCalendar) { this.shareCalendar = shareCalendar; } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-flash/pom.xml b/openmeetings-flash/pom.xml index 5bc3ea3..7d62f05 100644 --- a/openmeetings-flash/pom.xml +++ b/openmeetings-flash/pom.xml @@ -37,7 +37,6 @@ </properties> <build> <!-- sourceDirectory>src/main/flex</sourceDirectory--> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx b/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx index da55d60..0b0619a 100644 --- a/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx +++ b/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx @@ -7,16 +7,16 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <canvas width="100%" height="100%" title="NetworkTesting"> <switch> @@ -38,10 +38,10 @@ </method> </otherwise> </switch> - + <include href="testsView.lzx" /> <include href="restCall.lzx" /> - + <handler name="oninit"><![CDATA[ flash.external.ExternalInterface.call("loadingComplete"); var lbls = ExternalInterface.call("getStringLabels"); @@ -67,7 +67,7 @@ canvas.setAttribute("proxyType", config.proxy); canvas.setAttribute("rtmpHost", config.host); canvas.setAttribute("rtmpPort", config.flashPort); - + canvas.setAttribute("httpProtocol", config.httpProtocol); canvas.setAttribute("httpHost", config.host); canvas.setAttribute("httpPort", config.httpPort); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/src/main/swf10/networkTesting/restCall.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf10/networkTesting/restCall.lzx b/openmeetings-flash/src/main/swf10/networkTesting/restCall.lzx index a0b9f43..b02c1c4 100644 --- a/openmeetings-flash/src/main/swf10/networkTesting/restCall.lzx +++ b/openmeetings-flash/src/main/swf10/networkTesting/restCall.lzx @@ -7,23 +7,22 @@ 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. - + --> <library> <switch> <when runtime="swf11"> <script when="immediate"> <![CDATA[ - /** * Take a fileName, byteArray, and parameters object as input and return ByteArray post data suitable for a UrlRequest as output * @@ -47,12 +46,12 @@ import flash.utils.ByteArray; import flash.utils.Endian; }# - + /** * Boundary used to break up different parts of the http POST body */ private static var _boundary:String = ""; - + /** * Get the boundary for the post. * Must be passed as part of the contentType of the UrlRequest @@ -65,7 +64,7 @@ } return _boundary; } - + private static function addContentType(postData:ByteArray, type:String):void { var bytes:String = 'Content-Type: ' + type; for (var i:int = 0; i < bytes.length; ++i) { @@ -74,7 +73,7 @@ postData = LINEBREAK(postData); postData = LINEBREAK(postData); } - + /** * Create post data to send in a UrlRequest */ @@ -84,12 +83,12 @@ var postData:ByteArray = new ByteArray(); postData.endian = Endian.BIG_ENDIAN; - + //add Filename to parameters if(parameters == null) { parameters = []; } - + //add parameters to postData for (var j:int = 0; j < parameters.length; ++j) { postData = BOUNDARY(postData); @@ -107,7 +106,7 @@ postData.writeUTFBytes(parameters[j].value); postData = LINEBREAK(postData); } - + if (fileName && byteArray) { //add Filedata to postData postData = BOUNDARY(postData); @@ -122,27 +121,27 @@ addContentType(postData, "application/octet-stream"); postData.writeBytes(byteArray, 0, byteArray.length); postData = LINEBREAK(postData); - + //closing boundary postData = BOUNDARY(postData); postData = DOUBLEDASH(postData); } return postData; } - + /** * Add a boundary to the PostData with leading doubledash */ private static function BOUNDARY(p:ByteArray):ByteArray { var l:int = UploadPostHelper.getBoundary().length; - + p = DOUBLEDASH(p); for (var i:int = 0; i < l; i++ ) { p.writeByte( _boundary.charCodeAt( i ) ); } return p; } - + /** * Add one linebreak */ @@ -150,7 +149,7 @@ p.writeShort(0x0d0a); return p; } - + /** * Add quotation mark */ @@ -158,7 +157,7 @@ p.writeByte(0x22); return p; } - + /** * Add Double Dash */ @@ -166,9 +165,9 @@ p.writeShort(0x2d2d); return p; } - + } - + public class RestCall { #passthrough (toplevel:true) { import flash.events.*; @@ -182,7 +181,7 @@ private var successCallback:Function; private var hdrs:Array = []; private var requestor:URLLoader = null; - + public function RestCall(options:Object) { if (options["url"]) { this.url = options.url; @@ -207,7 +206,7 @@ } requestor = new URLLoader(); requestor.dataFormat = dataFormat; - + //Initiate the transaction if (!!this.successCallback) { requestor.addEventListener(Event.COMPLETE, successCallback); @@ -217,7 +216,7 @@ requestor.addEventListener(SecurityErrorEvent.SECURITY_ERROR, errorCallback); } } - + public function load(vars):URLRequest { var request:URLRequest = new URLRequest(url + '?sid=' + canvas.sessionId); //FIXME TODO request.method = method; @@ -230,7 +229,7 @@ } //Add the URL vars request.data = vars; - + try { requestor.load(request); } catch (e:Error) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/src/main/swf10/networkTesting/tests/NetworkTest.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf10/networkTesting/tests/NetworkTest.lzx b/openmeetings-flash/src/main/swf10/networkTesting/tests/NetworkTest.lzx index e837748..274d48e 100644 --- a/openmeetings-flash/src/main/swf10/networkTesting/tests/NetworkTest.lzx +++ b/openmeetings-flash/src/main/swf10/networkTesting/tests/NetworkTest.lzx @@ -60,7 +60,7 @@ canvas.testsView.testAll(); } </method> - + <method name="setPassed"> if (running) { running=false; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/src/main/swf10/networkTesting/tests/PortAvailabilityTest.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf10/networkTesting/tests/PortAvailabilityTest.lzx b/openmeetings-flash/src/main/swf10/networkTesting/tests/PortAvailabilityTest.lzx index 61605b9..9bf7e3d 100644 --- a/openmeetings-flash/src/main/swf10/networkTesting/tests/PortAvailabilityTest.lzx +++ b/openmeetings-flash/src/main/swf10/networkTesting/tests/PortAvailabilityTest.lzx @@ -57,7 +57,7 @@ rtmp.setAttribute('status', 'disconnected'); rtmp.setAttribute('stage', 0); </method> - + <handler name="onconnect" reference="rtmp"> if (running) { this.log(lbl('port.avail') + "\n"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/src/main/swf10/networkTesting/tests/library.lzx ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/swf10/networkTesting/tests/library.lzx b/openmeetings-flash/src/main/swf10/networkTesting/tests/library.lzx index 5021b9c..060594d 100644 --- a/openmeetings-flash/src/main/swf10/networkTesting/tests/library.lzx +++ b/openmeetings-flash/src/main/swf10/networkTesting/tests/library.lzx @@ -7,31 +7,29 @@ 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. - + --> <library> + <resource name="failed" src="resources/failed.png" /> + <resource name="notrun" src="resources/notrun.png" /> + <resource name="passed" src="resources/passed.png" /> + <resource name="passed_result" src="resources/passed_result.png" /> + <resource name="running" src="resources/running.swf" /> - <resource name="failed" src="resources/failed.png" /> - <resource name="notrun" src="resources/notrun.png" /> - <resource name="passed" src="resources/passed.png" /> - <resource name="passed_result" src="resources/passed_result.png" /> - <resource name="running" src="resources/running.swf" /> - - <include href="BaseURLLoadTest.lzx" /> - <include href="DownloadSpeedTest.lzx" /> - <include href="JitterTest.lzx" /> - <include href="NetworkTest.lzx" /> - <include href="PingTest.lzx" /> - <include href="PortAvailabilityTest.lzx" /> - <include href="UploadSpeedTest.lzx" /> - + <include href="BaseURLLoadTest.lzx" /> + <include href="DownloadSpeedTest.lzx" /> + <include href="JitterTest.lzx" /> + <include href="NetworkTest.lzx" /> + <include href="PingTest.lzx" /> + <include href="PortAvailabilityTest.lzx" /> + <include href="UploadSpeedTest.lzx" /> </library> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-flash/src/test/flex/org/test/TestApp.as ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/test/flex/org/test/TestApp.as b/openmeetings-flash/src/test/flex/org/test/TestApp.as index d9c81d4..9e23e4a 100644 --- a/openmeetings-flash/src/test/flex/org/test/TestApp.as +++ b/openmeetings-flash/src/test/flex/org/test/TestApp.as @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package org.test +package org.test { public class TestApp { - [Test] + [Test] public function testNothing():void { //TODO un implemented - trace("Hello test"); + trace("Hello test"); } } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml index 5d00bf5..3a49d1f 100644 --- a/openmeetings-install/pom.xml +++ b/openmeetings-install/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java index aec044e..0dbb940 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java @@ -25,7 +25,7 @@ import org.simpleframework.xml.stream.OutputNode; public class AppointmentReminderTypeConverter extends OmConverter<Reminder> { public AppointmentReminderTypeConverter() { } - + @Override public Reminder read(InputNode node) throws Exception { return Reminder.get(getInt(node));
