Repository: openmeetings Updated Branches: refs/heads/master de5dd6a6a -> aa8e0d58b
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index e451d80..60db5ec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml @@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="save.success"><![CDATA[Saved successfully]]></entry> <entry key="sound.enable"><![CDATA[Enable sound]]></entry> <entry key="sound.mute"><![CDATA[Mute sound]]></entry> - <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted + <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted in {1} days. If you would like to save this recording, please download it before then.]]></entry> <entry key="template.recording.expiring.footer"><![CDATA[ Regards,<br/> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java index f5c1c4b..d2a405c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java @@ -34,7 +34,7 @@ public class ErrorMessagePanel extends Panel { public ErrorMessagePanel(String id, String msg, Throwable err) { super(id); - + log.error(msg, err); add(new Label("msg", msg)); StringBuilderWriter sw = new StringBuilderWriter(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html index 8230f59..d87078e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html index 29229ee..dc2dfa2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:head> @@ -42,7 +41,7 @@ }); </script> <div wicket:id="topControls"> - <div wicket:id="topLinks"><span + <div wicket:id="topLinks"><span id="contactsAndMessages"><a wicket:id="messages"><wicket:message key="1188"/></a></span><span id="profile"><a wicket:id="profile"><wicket:message key="5"/></a></span><span id="logout"><a wicket:id="logout" href="#"><wicket:message key="310"/></a></span><span http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java index 8986922..e3d6b5f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java @@ -30,13 +30,13 @@ public abstract class OmButton extends Button { super(id); add(new AjaxEventBehavior("click") { private static final long serialVersionUID = 1L; - + @Override protected void onEvent(AjaxRequestTarget target) { OmButton.this.onClick(target); } }); } - - public abstract void onClick(AjaxRequestTarget target); + + public abstract void onClick(AjaxRequestTarget target); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.java index 8f5b7cf..635c178 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.java @@ -22,9 +22,8 @@ import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator; import org.apache.wicket.markup.html.navigation.paging.IPageable; public class OmPagingNavigator extends AjaxPagingNavigator { - private static final long serialVersionUID = 1L; - + public OmPagingNavigator(String id, IPageable pageable) { super(id, pageable); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html index fedd65a..fe4a83d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html @@ -20,10 +20,10 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:extend> - <form wicket:id="form"><div - class="fileinput fileinput-new" data-provides="fileinput" style="margin: 0;"><span - class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" - style="width: 120px;"><span class="ui-button-text"><wicket:message key="379"/></span><input + <form wicket:id="form"><div + class="fileinput fileinput-new" data-provides="fileinput" style="margin: 0;"><span + class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" + style="width: 120px;"><span class="ui-button-text"><wicket:message key="379"/></span><input type="file" accept="image/*" wicket:id="image"/></span></div><span wicket:id="progress">[progressbar]</span></form> </wicket:extend> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java index 90cd168..5b6160c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuFunctionsBehavior.java @@ -33,16 +33,16 @@ public class MenuFunctionsBehavior extends Behavior { private final static JavaScriptResourceReference MENU_FUNCTIONS = new JavaScriptResourceReference(MenuFunctionsBehavior.class, "menu-functions.js"); private final String menuContainerId; private final String menuId; - + public MenuFunctionsBehavior(String menuContainerId, String menuId) { this.menuContainerId = menuContainerId; this.menuId = menuId; } - + public String getInitScript() { return String.format("initMenu('%s', '%s');", menuContainerId, menuId); } - + @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java index b884320..b700202 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java @@ -24,12 +24,12 @@ public class RoomMenuItem extends MenuItem { public RoomMenuItem(String name, String desc) { super(name, desc); } - + public RoomMenuItem(String name, String desc, String icon) { super(name, desc); setIcon(icon); } - + public RoomMenuItem(String name, String desc, boolean enabled) { super(name, desc); setEnabled(enabled); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html index c9a490b..7344de6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/AccessDeniedPage.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org"; wicket:id="html"> <wicket:extend> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java index cfdeedc..93fbe87 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java @@ -27,18 +27,18 @@ import org.apache.wicket.request.IRequestParameters; public abstract class BaseNotInitedPage extends BasePage { private static final long serialVersionUID = 1L; - private static final InstallationConfig installCfg = new InstallationConfig(); + private static final InstallationConfig installCfg = new InstallationConfig(); @Override protected String getApplicationName() { return installCfg.appName; } - + @Override protected String getLanguageCode() { return WebSession.get().getLocale().getCountry(); } - + @Override protected boolean isRtl() { boolean rtl = false; @@ -47,7 +47,7 @@ public abstract class BaseNotInitedPage extends BasePage { } return rtl; } - + @Override protected void onParameterArrival(IRequestParameters arg0, AjaxRequestTarget arg1) { } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html index 8737d12..76e6015 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html index a48716e..895423e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html @@ -25,7 +25,7 @@ <b>OpenMeetings - Loading ...</b><br /> The server is not yet completely initialized. Please try again in a couple of seconds.<br/> If this message persists for several minutes contact your Sys-Administration.<br/> - If that message stays forever you should check the logs located in + If that message stays forever you should check the logs located in <pre>openmeetings_install_dir/log</pre> folder, probably your database user/pwd/host is wrong! </div> </wicket:extend> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java index 3cecb0a..a084d15 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java @@ -24,7 +24,7 @@ import org.apache.wicket.RestartResponseException; public class NotInitedPage extends BaseNotInitedPage { private static final long serialVersionUID = 1L; - + public NotInitedPage() { if (InitializationContainer.initComplete) { continueToOriginalDestination(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html index d4a7855..885b3f9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html @@ -39,7 +39,7 @@ </tr> <tr> <td></td> - <td style="white-space: nowrap;"><input wicket:id="rememberMe" + <td style="white-space: nowrap;"><input wicket:id="rememberMe" type="checkbox" /><label wicket:for="rememberMe"><wicket:message key="288" /></label></td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.java index 8ba7c47..f20617e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/CongratulationsPanel.java @@ -29,7 +29,7 @@ public class CongratulationsPanel extends Panel { public CongratulationsPanel(String id) { super(id); - + add(new Link<Void>("url") { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html index 51ad1bd..9766687 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html index 807ccf6..2c1629b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html index f2a0c6b..0cd22a3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html index 16452be..6c094a9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html @@ -22,7 +22,7 @@ <wicket:panel> <div wicket:id="menu"></div> <div class="room menu right"> - <span class="icon shared ui-button ui-corner-all ui-widget" wicket:message="data-user:692, data-text:850, data-view:848" + <span class="icon shared ui-button ui-corner-all ui-widget" wicket:message="data-user:692, data-text:850, data-view:848" role="button" style="display: none;"></span> <span wicket:id="ask" class="icon ask"></span> <span wicket:id="share" class="icon share"></span> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js index 49695f6..94da35b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js @@ -106,7 +106,7 @@ var VideoSettings = (function() { .scrollTop(Math.max(0, s.video.height / 2 - 110)); _updateRec(); } - + function _allowRec(allow) { recAllowed = allow; _updateRec(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html index 26da192..e9b6dcb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html index 44e85e8..c284073 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html index cfbaa03..ad8f2d5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html index aedb559..b72fcdb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html @@ -46,7 +46,7 @@ <a class="dropdown-toggle" data-toggle="dropdown" wicket:message="title:1323"></a> <ul class="dropdown-menu om-left"> <li> - <div wicket:id="clipart" class="ui-widget-header clickable om-icon big clipart" + <div wicket:id="clipart" class="ui-widget-header clickable om-icon big clipart" data-image="./public/cliparts/"></div> </li> </ul> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js index b2420d2..738935e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js @@ -316,7 +316,7 @@ var APointer = function(wb) { left: o.x - 20 , top: o.y - 20 }); - + canvas.add(group); group.uid = o.uid; group.loaded = !!o.loaded; @@ -1628,12 +1628,12 @@ var WbArea = (function() { , li = $('#wb-area-tab').clone().attr('id', '').data('wb-id', obj.wbId) , wb = $('#wb-area').clone().attr('id', tid); li.find('a').text(obj.name).attr('title', obj.name).attr('href', "#" + tid); - + tabs.find(".ui-tabs-nav").append(li); tabs.append(wb); refreshTabs(); _addCloseBtn(li); - + var wbo = Wb(); wbo.init(obj, tid, role); wb.data(wbo); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java index 76616f2..5a98998 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java @@ -37,19 +37,19 @@ import org.apache.wicket.util.collections.MicroMap; public class CalendarFunctionsBehavior extends Behavior { private static final long serialVersionUID = 1L; private final String markupId; - + public CalendarFunctionsBehavior(String markupId) { this.markupId = markupId; } - + private IModel<Map<String, Object>> newResourceModel() { return Model.ofMap(new MicroMap<String, Object>("markupId", this.markupId)); } - + private ResourceReference newResourceReference() { return new TextTemplateResourceReference(CalendarFunctionsBehavior.class, "calendar-functions.js", this.newResourceModel()); } - + @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java index 5f62a2c..6665be1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/OmCalendarEvent.java @@ -26,7 +26,7 @@ import com.googlecode.wicket.jquery.ui.calendar.CalendarEvent; public class OmCalendarEvent extends CalendarEvent { private static final long serialVersionUID = 1L; - + public OmCalendarEvent(Appointment a) { super(a.getId().intValue(), a.getTitle(), null); setStart(getDateTime(a.getStart())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js index e67a030..cc755b8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js @@ -20,7 +20,7 @@ function toggleDatePicker(id) { return false; } function addCalButton(rtl, id) { - var my_button = + var my_button = '<button class="fc-button fc-state-default fc-corner-right fc-corner-left" onclick="return toggleDatePicker(\'' + id + '\');">' + '<input type="text" id="' + id + '" /></button>'; @@ -29,7 +29,7 @@ function addCalButton(rtl, id) { } else { $(".fc .fc-toolbar .fc-left").append(my_button); } - + var dp = $("#" + id); dp.datepicker({ showOn: "button", http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html index 9a25ab0..8f059d0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html index 87cfeae..7732b76 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html index c6151d9..67fd333 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html index 87cfeae..7732b76 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetView.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java index e9c1073..10985e3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java @@ -34,14 +34,14 @@ public class AdminWidget extends AbstractWidget { location = new WidgetLocation(0, 2); init(); } - + @Override public void init() { super.init(); title = Application.getString("dashboard.widget.admin.title"); id = WIDGET_ID_ADMIN; } - + @Override public WidgetView createView(String viewId) { return new AdminWidgetView(viewId, new Model<Widget>(this)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html index 9e07e9d..9ca7d97 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html @@ -52,7 +52,7 @@ <td><textarea wicket:id="userSearchs"></textarea></td> </tr> </table> - </fieldset> + </fieldset> </div> <div> <fieldset class="ui-widget-content"> @@ -80,7 +80,7 @@ </tr> </table> <div wicket:id="addressDenied"></div> - </fieldset> + </fieldset> </div> </div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html index d5a8a86..008ca0c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html @@ -7,16 +7,15 @@ 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. - --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html index 84357c2..b65390f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.html @@ -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. - + --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java index a4dc6ca..240102e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java @@ -28,7 +28,7 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; public class RoomEnterBehavior extends AjaxEventBehavior { private static final long serialVersionUID = 1L; protected final Long roomId; - + public RoomEnterBehavior(Long roomId) { super("click"); this.roomId = roomId; @@ -37,11 +37,11 @@ public class RoomEnterBehavior extends AjaxEventBehavior { public static OmUrlFragment getRoomUrlFragment(Long roomId) { return new OmUrlFragment(AreaKeys.room, "" + roomId); } - + public static void roomEnter(MainPage page, IPartialPageRequestHandler handler, Long roomId) { page.updateContents(getRoomUrlFragment(roomId), handler); } - + @Override protected void onEvent(AjaxRequestTarget target) { roomEnter((MainPage)getComponent().getPage(), target, roomId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java index f016467..ae169d9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java @@ -28,7 +28,7 @@ import org.apache.wicket.model.IModel; public class RoomTypeDropDown extends DropDownChoice<Type> { private static final long serialVersionUID = 1L; - + public RoomTypeDropDown(String id) { super(id); setChoices(Arrays.asList(Type.values())); @@ -39,7 +39,7 @@ public class RoomTypeDropDown extends DropDownChoice<Type> { public String getIdValue(Type rt, int index) { return rt.name(); } - + @Override public Object getDisplayValue(Type rt) { return getString("room.type." + rt.name()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java index c514b37..3d62fd4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java @@ -30,7 +30,7 @@ public class UserDashboard extends DefaultDashboard { private boolean widgetRssDeleted = false; private boolean widgetMyRoomsDeleted = false; private boolean widgetAdminDeleted = false; - + public UserDashboard(String id, String title) { super(id, title); } @@ -58,7 +58,7 @@ public class UserDashboard extends DefaultDashboard { public void setWidgetAdminDeleted(boolean widgetAdminDeleted) { this.widgetAdminDeleted = widgetAdminDeleted; } - + @Override public void deleteWidget(String widgetId) { switch (widgetId) { @@ -76,7 +76,7 @@ public class UserDashboard extends DefaultDashboard { } super.deleteWidget(widgetId); } - + @Override public void addWidget(Widget widget) { switch (widget.getId()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java index 0a77b69..f56f6b4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java @@ -26,7 +26,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.PriorityHeaderItem; import org.apache.wicket.model.IModel; import org.apache.wicket.request.resource.JavaScriptResourceReference; - import org.wicketstuff.select2.Select2MultiChoice; public class UserMultiChoice extends Select2MultiChoice<User> { @@ -38,7 +37,7 @@ public class UserMultiChoice extends Select2MultiChoice<User> { getSettings().setTemplateSelection("formatOmUser"); getSettings().setEscapeMarkup("escapeOmUserMarkup"); } - + @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java index 3e5990f..e029631 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java @@ -33,11 +33,11 @@ public class BootstrapFileUploadBehavior extends Behavior { = new JavaScriptResourceReference(BootstrapFileUploadBehavior.class, "fileinput.js"); private final static ResourceReference BOOTSTRAP_FILEINPUT_CSS_REFERENCE = new CssResourceReference(BootstrapFileUploadBehavior.class, "fileinput.css"); - public final static BootstrapFileUploadBehavior INSTANCE = new BootstrapFileUploadBehavior(); - + public final static BootstrapFileUploadBehavior INSTANCE = new BootstrapFileUploadBehavior(); + private BootstrapFileUploadBehavior() { } - + @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml index ecc54e6..4463d81 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml @@ -24,7 +24,7 @@ xmlns:context="http://www.springframework.org/schema/context"; xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"; > @@ -94,7 +94,7 @@ p:targetObject-ref="mailHandler" p:targetMethod="sendMails" p:concurrent="false" /> <bean id="triggerSendMails" class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean" p:jobDetail-ref="sendMails" p:startDelay="60000" p:repeatInterval="60000" /> - + <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> <property name="triggers"> <list> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/webapp/WEB-INF/classes/cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/cxf-servlet.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/cxf-servlet.xml index 6fcee68..7fcf407 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/cxf-servlet.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/cxf-servlet.xml @@ -24,7 +24,7 @@ xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index fb83a38..209395a 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -93,7 +93,7 @@ <servlet-name>gateway</servlet-name> <servlet-class>org.red5.server.net.servlet.AMFGatewayServlet</servlet-class> </servlet> - + <mime-mapping> <extension>inc</extension> <mime-type>text/plain</mime-type> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/webapp/css/general.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/general.css b/openmeetings-web/src/main/webapp/css/general.css index a08adb5..10bae24 100644 --- a/openmeetings-web/src/main/webapp/css/general.css +++ b/openmeetings-web/src/main/webapp/css/general.css @@ -197,11 +197,11 @@ html, body { .sort-icon a { width: inherit; height: inherit; -} +} .start_step1, .start_step2, .start_step3, .start_step4 { padding-left: 30px; background-position: left top; - margin: 5px 0px 5px 0px; + margin: 5px 0px 5px 0px; background-size: contain; background-repeat: no-repeat; display: inline-block; @@ -300,7 +300,7 @@ html, body { -webkit-border-radius: 8px; border-radius: 8px; } -.ui-progressbar div { +.ui-progressbar div { text-align: center; padding-top: 7px; font-weight: bold; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/webapp/css/tree.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/tree.css b/openmeetings-web/src/main/webapp/css/tree.css index 9d99a20..3277d48 100644 --- a/openmeetings-web/src/main/webapp/css/tree.css +++ b/openmeetings-web/src/main/webapp/css/tree.css @@ -65,7 +65,7 @@ } .ui-state-hover.trash-toolbar-hover .trash.om-icon { background-image: url(images/bin_empty.png); -} +} .folder-create.om-icon { background-image: url(images/folder_add.png); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/webapp/languages/languages.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/languages/languages.xml b/openmeetings-web/src/main/webapp/languages/languages.xml index 9cf7906..5ae0c0f 100644 --- a/openmeetings-web/src/main/webapp/languages/languages.xml +++ b/openmeetings-web/src/main/webapp/languages/languages.xml @@ -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. - + --> <language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <lang id="1" code="en">english</lang> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java index 9963fbb..39e497c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java @@ -30,17 +30,17 @@ import org.springframework.beans.factory.annotation.Autowired; public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class, webAppRootKey); - + @Autowired private AppointmentLogic appointmentLogic; - + @Test public void doIt() { log.debug("- 1 MeetingReminderJob.execute"); log.warn("- 2 MeetingReminderJob.execute"); try { appointmentLogic.doScheduledMeetingReminder(); - + assertTrue(true); } catch (Exception err){ log.error("execute",err); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java index c92ce7f..ac5046c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java @@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class, webAppRootKey); - + @Autowired private AppointmentDao appointmentDao; @@ -43,7 +43,7 @@ public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDef public void test() { log.debug("Test started"); Long userId = 1L; - + Calendar now = Calendar.getInstance(); Calendar rangeStart = Calendar.getInstance(); rangeStart.setTime(now.getTime()); @@ -51,7 +51,7 @@ public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDef Calendar rangeEnd = Calendar.getInstance(); rangeEnd.add(Calendar.DATE, 1); rangeEnd.setTime(now.getTime()); - + Calendar a1End = Calendar.getInstance(); a1End.setTime(now.getTime()); a1End.add(Calendar.HOUR_OF_DAY, 1); @@ -65,7 +65,7 @@ public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDef mm1.setUser(createUserContact(userId)); mm1.setAppointment(a2); a2.getMeetingMembers().add(mm1); - + Appointment a3 = getAppointment(now.getTime(), a1End.getTime()); a3.setTitle("AppointmentByRange_a3"); a3.setMeetingMembers(new ArrayList<MeetingMember>()); @@ -77,11 +77,11 @@ public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDef mm3.setUser(createUserContact(userId)); mm3.setAppointment(a3); a3.getMeetingMembers().add(mm3); - + a1 = appointmentDao.update(a1, userId); a2 = appointmentDao.update(a2, userId); a3 = appointmentDao.update(a3, userId); - + int a1found = 0, a2found = 0, a3found = 0; for (Appointment a : appointmentDao.getInRange(userId, rangeStart.getTime(), rangeEnd.getTime())) { int mmCount = a.getMeetingMembers() == null ? 0 : a.getMeetingMembers().size(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java index 3699990..193aa4b 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java @@ -32,7 +32,7 @@ public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults { @Autowired private UserDao userDao; - + @Test public void testAddingGroup() { try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java index 22133ab..08a0149 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureMeetingMember.java @@ -28,14 +28,14 @@ public class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults { @Test public void testUpdateMeetingMember(){ //FIXME need to be refactored !!!! - - //MeetingMemberDaoImpl.getInstance().addMeetingMember("Adddd", "dir", "1", "2", 1L, 1L, "test"); + + //MeetingMemberDaoImpl.getInstance().addMeetingMember("Adddd", "dir", "1", "2", 1L, 1L, "test"); //MeetingMemberDaoImpl.getInstance().addMeetingMember(firstname, lastname, memberStatus, appointmentStatus, appointmentId, userid, email) - - + + //MeetingMemberDaoImpl.getInstance().getMeetingMemberById(1L); //MeetingMemberDaoImpl.getInstance().deleteMeetingMember(2L); - - //meetingMemberDao.updateMeetingMember(1l,"bbbbbb", "dir", "1", "2", 1L, 1L, "test", ""); + + //meetingMemberDao.updateMeetingMember(1l,"bbbbbb", "dir", "1", "2", 1L, 1L, "test", ""); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java index 82c3281..7bc1bf8 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java @@ -37,24 +37,24 @@ public class TestGetAppointment extends AbstractJUnitDefaults { @Autowired private AppointmentDao appointmentDao; - + @Test public void getAppoinment() { log.debug("getAppoinment enter"); Long userId = 1L; - + Calendar now = Calendar.getInstance(); Calendar a1End = Calendar.getInstance(); a1End.setTime(now.getTime()); a1End.add(Calendar.HOUR_OF_DAY, 1); Appointment a1 = getAppointment(now.getTime(), a1End.getTime()); a1.setTitle("GetAppointment"); - + a1 = appointmentDao.update(a1, userId); - + Appointment a = appointmentDao.get(a1.getId()); assertNotNull("Failed to get Appointment By id", a); assertEquals("Inapropriate MeetingMembers count", 0, a.getMeetingMembers() == null ? 0 : a.getMeetingMembers().size()); } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java index 44f58ef..088949e 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java @@ -23,35 +23,35 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.io.File; import org.apache.openmeetings.cli.ConnectionPropertiesPatcher; -import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.ConnectionProperties.DbType; +import org.apache.openmeetings.util.OmFileHelper; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; /** - * This file is called from command line to patch the derby configuration + * This file is called from command line to patch the derby configuration * during the automated run of Selenium - * + * * @author swagner * */ public class PrepareSystemFiles { private static final Logger log = Red5LoggerFactory.getLogger(PrepareSystemFiles.class, webAppRootKey); - + public static void main(String... args) { try { OmFileHelper.setOmHome(args[0]); - + String databaseHomeDirectory = args[1]; - + String persistanceFileToPatch = args[2]; - + File conf = new File(persistanceFileToPatch); - + if (conf.exists()) { conf.delete(); } - + ConnectionPropertiesPatcher.patch(DbType.derby.name() , "localhost" , "1527" http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java index d47aeda..379145b 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java @@ -49,7 +49,7 @@ public class TestAddGroup extends AbstractJUnitDefaults { User us = userDao.get(1L); assertNotNull("User should exist", us); - + assertNotNull("Group User list should exist", us.getGroupUsers()); us.getGroupUsers().add(new GroupUser(o, us)); us = userDao.update(us, null); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java index a28bd25..87cda14 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java @@ -31,17 +31,17 @@ public class TestFileParser extends AbstractJUnitDefaults { @Test public void testLoadWmlFile(){ - + try { - + LibraryWmlLoader.loadWmlFile("filename1"); - + } catch (Exception err) { - + log.error("TestLoadWmlFile",err); - + } - + } - + } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java index 5764b74..54f9867 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java @@ -49,7 +49,7 @@ public class SeleniumUtils { //clear text before adding input element.clear(); - + // Would make send to check if this element is really an input text element.sendKeys(inputText); } @@ -58,9 +58,9 @@ public class SeleniumUtils { WebElement element = SeleniumUtils.findElement(driver, search, true, true); element.click(); } - + /** - * + * * @param driver * @param search * @param throwException @@ -88,7 +88,7 @@ public class SeleniumUtils { } /** - * + * * @param driver * @param search * @param throwException @@ -102,17 +102,17 @@ public class SeleniumUtils { for (int i = 0; i < numberOfRetries; i++) { List<WebElement> elements = _findElement(driver, search); if (elements != null) { - + if (!onlyReturnVisisbleElement) { return elements.get(0); } - + for (WebElement element : elements) { if (element.isDisplayed()) { return element; } } - + } Thread.sleep(defaultSleepInterval); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java index 3087c29..0774a43 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java @@ -28,18 +28,18 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; public class TestLogin extends AbstractJUnitDefaults { - + @Autowired private UserDao userDao; @Test public void testTestLogin() throws OmException { User us = userDao.login(username, userpass); - + assertNotNull("User is unable to login", us); - + //mService.getLanguageById(1); - + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-webservice/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml index 42e9f98..2aa9371 100644 --- a/openmeetings-webservice/pom.xml +++ b/openmeetings-webservice/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>
