You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/25 06:51:32 UTC
[1/4] openmeetings git commit: no jira: trailing spaces are removed
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>
[4/4] openmeetings git commit: no jira: trailing spaces are removed
Posted by so...@apache.org.
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 <so...@gmail.com>
Authored: Mon Sep 25 13:51:14 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
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));
[2/4] openmeetings git commit: no jira: trailing spaces are removed
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
index 53e0654..875c0c7 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
@@ -18,8 +18,13 @@
*/
package org.apache.openmeetings.service.calendar.caldav.handler;
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.Component;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.httpclient.HttpClient;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.MultiStatusResponse;
@@ -39,12 +44,8 @@ import org.osaf.caldav4j.model.response.CalendarDataProperty;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
/**
* Class used to sync a given list of hrefs and update or add new Appointments, whenever feasible.
@@ -81,7 +82,7 @@ public class MultigetHandler extends AbstractCalendarHandler {
}
}
- public MultigetHandler(List<String> hrefs, String path, OmCalendar calendar, HttpClient client,
+ public MultigetHandler(List<String> hrefs, String path, OmCalendar calendar, HttpClient client,
AppointmentDao appointmentDao, iCalUtils utils)
{
this(hrefs, false, path, calendar, client, appointmentDao, utils);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
index 1e39099..0fc17a8 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
@@ -39,7 +39,7 @@ import org.w3c.dom.Document;
/**
* Class to work with WebDAV-Sync Method defined in RFC 6578.
- *
+ *
* @see SyncReportInfo for Request Report to be given as argument
*/
public class SyncMethod extends DavMethodBase {
@@ -61,7 +61,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Used to add request header for Depth.
- *
+ *
* @param depth
* Depth of the Request
*/
@@ -71,7 +71,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Set the Depth Header of the Sync Report.
- *
+ *
* @param depth
* Depth of the Request
*/
@@ -103,7 +103,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Adapted from DavMethodBase to handle MultiStatus responses.
- *
+ *
* @return MultiStatus response
* @throws IOException
* @throws DavException
@@ -126,7 +126,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Overridden to process the sync-token. Adapted from DavMethodBase. TODO:
* Fix this override.
- *
+ *
* @see DavMethodBase#processResponseBody(HttpState, HttpConnection)
*/
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
index 7318cfb..119a8eb 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.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-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
index 1eb9d8f..d36bc67 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
@@ -34,7 +34,7 @@ public class FeedbackTemplate extends AbstractTemplatePanel {
add(new Label("message", message));
add(new ExternalLink("invitation_link", ""));
}
-
+
public static String getEmail(String username, String email, String message) {
return ComponentRenderer.renderComponent(new FeedbackTemplate(username, email, message)).toString();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
index cd17487..da5b37d 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
index 14b0f29..20ec150 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
index 481c1f6..dbfdea4 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
@@ -7,22 +7,21 @@
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:extend>
<wicket:child/>
- <wicket:fragment wicket:id="subject"><span wicket:id="prefix"></span> <span wicket:id="title"></span> <span
+ <wicket:fragment wicket:id="subject"><span wicket:id="prefix"></span> <span wicket:id="title"></span> <span
wicket:id="start"></span><span wicket:id="dash"></span><span wicket:id="end"></span></wicket:fragment>
</wicket:extend>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
index f893304..4f3b0bf 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
index 8ac9f9d..6c771c3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
index 8ac9f9d..6c771c3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
index d9052c7..ad612e7 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
index 8ac9f9d..6c771c3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.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:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 9de4ffc..5e566e8 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/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-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
index 688bb19..598be67 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
@@ -29,11 +29,11 @@ public class DaoHelper {
public static String getSearchQuery(String table, String alias, String search, boolean distinct, boolean filterDeleted, boolean count, String sort, String... fields) {
return getSearchQuery(table, alias, null, search, distinct, filterDeleted, count, null, sort, fields);
}
-
+
public static String getSearchQuery(String table, String alias, String join, String search, boolean filterDeleted, boolean count, String additionalWhere, String sort, String... fields) {
return getSearchQuery(table, alias, join, search, false, filterDeleted, count, additionalWhere, sort, fields);
}
-
+
public static String getSearchQuery(String table, String alias, String join, String search, boolean distinct, boolean filterDeleted, boolean count, String additionalWhere, String sort, String... fields) {
StringBuilder sb = new StringBuilder("SELECT ");
if (count) {
@@ -66,13 +66,13 @@ public class DaoHelper {
}
return sb.toString();
}
-
+
public static StringBuilder getWhereClause(String search, String alias, String... fields) {
StringBuilder sb = new StringBuilder();
getWhereClause(sb, search, alias, fields);
return sb;
}
-
+
public static void getWhereClause(StringBuilder sb, String search, String alias, String... fields) {
if (search != null) {
boolean notEmpty = false;
@@ -89,7 +89,7 @@ public class DaoHelper {
}
StringBuilder placeholder = new StringBuilder();
placeholder.append("%").append(StringUtils.lowerCase(searchItems[i])).append("%");
-
+
sb.append("(");
for (int j = 0; j < fields.length; ++j) {
if (j != 0) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
index 444b1c2..7b766c0 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
@@ -23,7 +23,7 @@ import javax.servlet.ServletContextEvent;
import org.red5.logging.ContextLoggingListener;
public class OMContextListener extends ContextLoggingListener {
-
+
@Override
public void contextDestroyed(ServletContextEvent event) {
super.contextDestroyed(event);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
index 54b5c14..d468a5b 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
@@ -26,7 +26,7 @@ public class TextRoomMessage extends RoomMessage {
super(roomId, userId, type);
this.text = text;
}
-
+
public String getText() {
return text;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
index f165bb4..e81d34c 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
@@ -21,15 +21,15 @@ package org.apache.openmeetings.util.process;
/**
* Object created by each conversion step, each conversion step that invokes and
* external tool like ImageMagick is one single ConverterProcessMessage
- *
+ *
* if exitValue equals "-1" then there was an issue.
- *
+ *
* @author sebawagner
*
*/
public class ConverterProcessResult {
public static final Integer ZERO = new Integer(0);
-
+
private String process;
private String command;
private String exception;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
index 116bdc8..257f31f 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
@@ -19,12 +19,11 @@
package org.apache.openmeetings.util.process;
public class FileImportError {
-
private int exitValue = 0;
private String error = "";
private String process = "";
private String command = "";
-
+
public int getExitValue() {
return exitValue;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index e48dd22..5a1634f 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/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-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
index 2f100ed..866bfed 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
@@ -25,9 +25,9 @@ import org.apache.wicket.model.IModel;
/**
* provides basic functionality to insert, update, remove, refresh record in
* admin section
- *
+ *
* @author swagner
- *
+ *
* @param <T>
*/
public abstract class AdminBaseForm<T> extends Form<T> {
@@ -36,7 +36,7 @@ public abstract class AdminBaseForm<T> extends Form<T> {
public AdminBaseForm(String id, IModel<T> object) {
super(id, object);
-
+
savePanel = new AdminSavePanel<T>("buttons", this) {
private static final long serialVersionUID = 1L;
@@ -116,66 +116,66 @@ public abstract class AdminBaseForm<T> extends Form<T> {
}
/**
* invoked when user press save button
- *
+ *
* @param target
* @param form
*/
protected abstract void onSaveSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when save has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onSaveError(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when new button is pressed
- *
+ *
* @param target
* @param form
*/
protected abstract void onNewSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked if new has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onNewError(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when refresh button is pressed
- *
+ *
* @param target
* @param form
*/
protected abstract void onRefreshSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when refresh has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onRefreshError(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when delete button is pressed
- *
+ *
* @param target
* @param form
*/
protected abstract void onDeleteSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when delete has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onDeleteError(AjaxRequestTarget target, Form<?> form);
-
+
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
index ee12b8a..1c412e1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
@@ -24,20 +24,20 @@ import org.apache.wicket.markup.repeater.data.DataView;
/**
* Provides {@link SearchableDataProvider}
- *
+ *
* @author swagner
- *
+ *
* @param <T>
*/
public abstract class SearchableDataView<T extends IDataProviderEntity> extends DataView<T> {
private static final long serialVersionUID = 1L;
private SearchableDataProvider<T> dp;
-
+
public SearchableDataView(String id, SearchableDataProvider<T> dp) {
super(id, dp);
this.dp = dp;
}
-
+
@Override
public SearchableDataProvider<T> getDataProvider() {
return dp;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
index 0e1d036..a47e39b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
@@ -44,7 +44,7 @@
<div wicket:id="download" class="btn"><wicket:message key="1066"/></div>
<!-- Perform Upload -->
<div class="fileinput fileinput-new" data-provides="fileinput" style="margin: 0; display: inline-block;">
- <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
+ <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
class="ui-button-text"><wicket:message key="1536"/></span><input class="uploadFileField" wicket:id="fileInput" type="file"/></span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
index 3381830..570b111 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.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/admin/users/UserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index 8c3746b..01c73a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.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/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 676a52b..c7817b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.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/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 62e98bd..51d806c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.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/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 80ab81a..067e2d5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.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/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index c0b38c6..b8577e7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.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/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 02114c5..8d4766d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.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/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index c0a1852..4f95409 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.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/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index d277527..479dd95 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -765,13 +765,13 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.nodriver"><![CDATA[Unable to load proper DB driver, please download appropriate jar file, and restart the OM. Instructions: {0}]]></entry>
<entry key="install.wizard.db.step.note"><![CDATA[
<h4>
- <a id="Recommendation_for_production_environment"></a>Empfehlung
+ <a id="Recommendation_for_production_environment"></a>Empfehlung
für Produktivumgebungen<a target="_blank"
href="#Recommendation_for_production_environment"
class="section_anchor"></a>
</h4>
<blockquote>
- Standardmäßig verwendet {0} die integrierte
+ Standardmäßig verwendet {0} die integrierte
{1} Datenbank. In Produktivumgebungen wird jedoch der Einsatz von {2}, {3}, {4}, {5} or {6} empfohlen.
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -843,16 +843,16 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step4.crypt"><![CDATA[Krypto-Typ]]></entry>
<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Krypto-Klasse]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[
- Sie können den voreingestellten Krypto-Typ (welcher der
- PHP-MD5-Funktion entspricht) benutzen, oder Sie geben
+ Sie können den voreingestellten Krypto-Typ (welcher der
+ PHP-MD5-Funktion entspricht) benutzen, oder Sie geben
<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
- ein, um BSD-artige Verschlüsselung zu benutzen. Für
- weitergehende Informationen, auch zum Schreiben einer eigenen
+ ein, um BSD-artige Verschlüsselung zu benutzen. Für
+ weitergehende Informationen, auch zum Schreiben einer eigenen
Krypto-Klasse, siehe <a
href="http://openmeetings.apache.org/CustomCryptMechanism.html"
- target="_blank">Custom Crypt Mechanism</a>. Sie können diesen
- Wert später verändern, ABER vorher erstellte Nutzer und
- Sitzungen könnten anschließend unbenutzbar sein.
+ target="_blank">Custom Crypt Mechanism</a>. Sie können diesen
+ Wert später verändern, ABER vorher erstellte Nutzer und
+ Sitzungen könnten anschließend unbenutzbar sein.
]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Geben Sie den Klassennamen der Krypto-Klasse an. ÄNDERN SIE DIESEN WERT NICHT, WENN SIE SICH NICHT SICHER SIND!]]></entry>
<entry key="install.wizard.params.step4.sip"><![CDATA[red5SIP Konfiguration]]></entry>
@@ -873,7 +873,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<ul>
<li>Installieren Sie <strong>GhostScript</strong> auf dem Server. Weitere
Informationen (Installationsanleitungen etc.) finden Sie unter <a target="_blank"
- href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
+ href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
In den meisten Linux-Distributionen lässt es sich bequem per Paketmanager
(z.B. apt-get) installieren.
</li>
@@ -882,11 +882,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
</ol>
<br />
- <b> <span style="font-size: 1.2em">Falls Sie weitere Fragen haben oder Support bei Installation und Hosting
+ <b> <span style="font-size: 1.2em">Falls Sie weitere Fragen haben oder Support bei Installation und Hosting
benötigen:</span></b>
<br />
<br />
- <br />
+ <br />
<br />
<b><span style="font-size: 1.2em">Support durch die OpenMeetings-Community:</span></b>
<br />
@@ -898,7 +898,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<b> <span style="font-size: 1.4em">Einige Unternehmen bieten kommerziellen Support
- für Apache OpenMeetings an:</span></b>
+ für Apache OpenMeetings an:</span></b>
<br />
<br />
@@ -961,7 +961,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/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index f6a5ce6..a952ff9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.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/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 2fd860a..b445f1c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -765,7 +765,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.nodriver"><![CDATA[Incapaz cargar driver apropiado de base de datos, por favor descargue el archivo jar apropiado, y reinicie OM. Instrucciones: {0}]]></entry>
<entry key="install.wizard.db.step.note"><![CDATA[
<h4>
- <a id="Recommendation_for_production_environment"></a>Recomendación
+ <a id="Recommendation_for_production_environment"></a>Recomendación
para medios de producción<a target="_blank"
href="#Recommendation_for_production_environment"
class="section_anchor"></a>
@@ -869,7 +869,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<ul>
<li>Instale <strong>GhostScript</strong> en el servidor, puede tener
más información en <a target="_blank" href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
- mire en instalación. Las instrucciones para la instalación se encuentran allí,
+ mire en instalación. Las instrucciones para la instalación se encuentran allí,
de todos modos en la mayoría de los sistemas linux puede conseguirlo
via su paquete favorito de administración (apt-get it)
</li>
@@ -882,7 +882,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<br />
-
<b><span style="font-size: 1.2em">Soporte-Comunidad:</span></b>
<br />
<br />
@@ -890,18 +889,17 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
href="http://openmeetings.apache.org/mail-lists.html"
target="_blank">Listas de correo</a></span>
<br />
-
<b> <span style="font-size: 1.4em">Hay algunas compañias
- que tambien ofrecen soporte comercial para Apache OpenMeetings:</span></b>
- <br />
- <br />
- <br />
- <br />
- <span style="font-size: 1.3em"><a
- href="http://openmeetings.apache.org/commercial-support.html"
- target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
- <br />
- ]]></entry>
+ que tambien ofrecen soporte comercial para Apache OpenMeetings:</span></b>
+ <br />
+ <br />
+ <br />
+ <br />
+ <span style="font-size: 1.3em"><a
+ href="http://openmeetings.apache.org/commercial-support.html"
+ target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
+ <br />
+ ]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
<entry key="lbl.refresh"><![CDATA[actualizar]]></entry>
@@ -956,7 +954,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/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index c289105..e444598 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.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/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 464d7da..48b9a94 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -957,7 +957,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/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index f291945..583a217 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -841,11 +841,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step4.crypt"><![CDATA[Type de chiffrement]]></entry>
<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Classe de chiffrement]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[
- Vous pouvez utiliser ce chiffrement par défaut qui est équivalent à la fonction MD5 de PHP ou le style de chiffrement BDS en utilisant :
+ Vous pouvez utiliser ce chiffrement par défaut qui est équivalent à la fonction MD5 de PHP ou le style de chiffrement BDS en utilisant :
<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
Pour plus d'information ou pour écrire votre propre chiffrement voir : <a
href="http://openmeetings.apache.org/CustomCryptMechanism.html"
- target="_blank">Custom Crypt Mechanism</a>. Vous pouvez éditer cette valeur plus tard MAIS les utilisateurs créés précédemment pourraient ne plus être utilisables.
+ target="_blank">Custom Crypt Mechanism</a>. Vous pouvez éditer cette valeur plus tard MAIS les utilisateurs créés précédemment pourraient ne plus être utilisables.
]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Indiquez le nom de la classe de chiffrement. NE MODIFIEZ PAS CECI SI VOUS N'ETES PAS SUR !]]></entry>
<entry key="install.wizard.params.step4.sip"><![CDATA[Configuration red5SIP]]></entry>
@@ -864,7 +864,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
</h4>
<ul>
<li>Installez <strong>GhostScript</strong> sur le serveur. Vous trouverez plus d'information sur <a target="_blank"
- href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
+ href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
Sur la majorité des systèmes linux vous pouvez le trouver via votre gestionnaire de paquets (apt-get).
</li>
</ul>
@@ -948,7 +948,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/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 84a3c3f..341e912 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.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/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index af6d68d..d467155 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -770,7 +770,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
class="section_anchor"></a>
</h4>
<blockquote>
- Az {0} alapértelmezette a beépített {1} adatbázist használja.
+ Az {0} alapértelmezette a beépített {1} adatbázist használja.
További lehetőségként használható a {2}, {3}, {4}, {5} or {6}
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -841,12 +841,12 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step4.crypt"><![CDATA[Titkosítás típusa]]></entry>
<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Titkosító osztály]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[
- Az alapértelmezetten beállított kódolás megfelel a
+ Az alapértelmezetten beállított kódolás megfelel a
PHP-MD5 kódolónak, vagy BSD-Stílusú kódoláshoz használja a:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
további kódolási/titkosítási eljárásokról itt olvashat bővebben: <a
href="http://openmeetings.apache.org/CustomCryptMechanism.html"
target="_blank">Egyedi titkosítási mechanizmus </a> Ha a későbbiekben módosítja ezt a beállítást,
- az előzőleg létrehozott adatok elérhetetlenné válnak, ami működési hibát okozhat a régebbi munkamenetek elérésében
+ az előzőleg létrehozott adatok elérhetetlenné válnak, ami működési hibát okozhat a régebbi munkamenetek elérésében
(pl. jelszó, hash kezelés).
]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Adja meg a titkosító osztály nevét (class). NE VÁLTOZTASSA, HA NEM BIZTOS BENNE!]]></entry>
@@ -872,7 +872,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
</ul>
</li>
</ol>
-
+
<b><span style="font-size: 1.2em">Közösségi-támogatás:</span></b>
<br />
<br />
@@ -882,10 +882,9 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<br />
<br />
- <b> <span style="font-size: 1.4em">Néhány cég, akik üzleti támogatást nyújthatnak Apache OpenMeetings:</span></b>
+ <b> <span style="font-size: 1.4em">Néhány cég, akik üzleti támogatást nyújthatnak Apache OpenMeetings:</span></b>
<br />
<br />
-
<span style="font-size: 1.3em"><a
href="http://openmeetings.apache.org/commercial-support.html"
target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
@@ -945,7 +944,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/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index fc47921..6981ca8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.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/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index c9009aa..d13507b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -740,7 +740,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.room.public.presentation"><![CDATA[Public Presentation Room]]></entry>
<entry key="install.room.public.video.only"><![CDATA[Stanza Solo Video Pubblica]]></entry>
<entry key="install.room.public.video.wb"><![CDATA[Stanza Video e Lavagna Pubblica]]></entry>
- <entry key="install.wizard.congrats.commercial"><![CDATA[Ci sono alcune aziende
+ <entry key="install.wizard.congrats.commercial"><![CDATA[Ci sono alcune aziende
che offrono anche il supporto commerciale per Apache OpenMeetings:]]></entry>
<entry key="install.wizard.congrats.enter"><![CDATA[Accedi all'applicazione]]></entry>
<entry key="install.wizard.congrats.mail"><![CDATA[Mailing list]]></entry>
@@ -811,7 +811,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step2.mailReferer"><![CDATA[EMail Sistema]]></entry>
<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Nominativo EMail Sistema]]></entry>
<entry key="install.wizard.params.step2.mailUseTls"><![CDATA[Abilita TLS nell'autenticazione SMTP]]></entry>
- <entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Imposta email dell'invitante
+ <entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Imposta email dell'invitante
come ReplyTo negli inviti email]]></entry>
<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Invia Email ai nuovi utenti registrati]]></entry>
<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[I nuovi utenti devono verificre la loro Email]]></entry>
@@ -957,7 +957,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Salvato con successo]]></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/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index f2260d3..2bef2dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.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/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index f995589..c8b3e66 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.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/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 214505f..0c9fd1a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.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/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index b99d38a..7be1af3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.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/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index d1d02da..c68d390 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.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/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index fe6557f..c9a50b0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.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/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index a353efa..becf042 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -771,7 +771,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
class="section_anchor"></a>
</h4>
<blockquote>
- По умолчанию {0} использует интегрированную базу данных {1}. В
+ По умолчанию {0} использует интегрированную базу данных {1}. В
продакшине Вы должны задуматься об использовании таких баз, как {2}, {3}, {4}, {5} or {6}
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -872,7 +872,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
информацию Вы можете посмотреть на сайте <a target="_blank"
href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
Инструкции по установке Вы можете
- найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
+ найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
менеджер пакетов (apt-get it).
</li>
</ul>
@@ -881,7 +881,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<b> <span style="font-size: 1.2em">Если у Вас остались
вопросы или Вам требуется поддержка по установке или хостингу:</span></b>
-
+
<br />
<br />
<b><span style="font-size: 1.2em">Поддержка сообщества:</span></b>
@@ -957,7 +957,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Успешно сохранено]]></entry>
<entry key="sound.enable"><![CDATA[Включить звук]]></entry>
<entry key="sound.mute"><![CDATA[Выключить звук]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Ваша {0} запись(и) будут автоматически удалены
+ <entry key="template.recording.expiring.body"><![CDATA[Ваша {0} запись(и) будут автоматически удалены
в течении {1} дней. Пожалуйста скачайте запись если она Вам нужна.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
С уважением,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 19922c9..2d7832d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.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/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index a72e65f..98c4e7e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.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/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 6de7546..bce4c18 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.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/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index f22a76f..e8bc2f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.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/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 3fef543..23a0eaa 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -771,7 +771,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
class="section_anchor"></a>
</h4>
<blockquote>
- По умолчанию {0} использует интегрированную базу данных {1}. В
+ По умолчанию {0} использует интегрированную базу данных {1}. В
продакшине Вы должны задуматься об использовании таких баз, как {2}, {3}, {4}, {5} or {6}
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -872,7 +872,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
информацию Вы можете посмотреть на сайте <a target="_blank"
href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
Инструкции по установке Вы можете
- найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
+ найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
менеджер пакетов (apt-get it).
</li>
<li>Установите <strong>SWFTools</strong> на Ваш сервер, более подробную информацию
@@ -882,7 +882,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<b> <span style="font-size: 1.2em">Если у Вас остались
вопросы или Вам требуется поддержка по установке или хостингу:</span></b>
-
+
<br />
<br />
<b><span style="font-size: 1.2em">Поддержка сообщества:</span></b>
@@ -957,7 +957,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/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 3552dde..1a1dd11 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -946,7 +946,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/>
[3/4] openmeetings git commit: no jira: trailing spaces are removed
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
index de31d41..51e7ec8 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.backup;
import org.simpleframework.xml.stream.InputNode;
public abstract class InlineConverter<T> extends OmConverter<T> {
-
+
String getNextValue(InputNode parent, String name) throws Exception {
InputNode node = parent.getNext(name);
return node != null ? node.getValue() : null;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
index f4c9349..6c74d75 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java
@@ -28,7 +28,7 @@ import org.simpleframework.xml.stream.OutputNode;
public class OmCalendarConverter extends OmConverter<OmCalendar> {
private OmCalendarDao calendarDao;
private Map<Long, Long> idMap;
-
+
public OmCalendarConverter() {
//default constructor is for export
}
@@ -42,7 +42,7 @@ public class OmCalendarConverter extends OmConverter<OmCalendar> {
public OmCalendar read(InputNode node) throws Exception {
long oldId = getLong(node);
Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
-
+
OmCalendar c = calendarDao.get(newId);
return c == null ? new OmCalendar() : c;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
index 34539e1..6fd9912 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java
@@ -29,7 +29,7 @@ public abstract class OmConverter<T> implements Converter<T> {
static long getLong(String value) {
return getLong(value, 0);
}
-
+
static long getLong(String value, long def) {
long result = def;
try {
@@ -43,7 +43,7 @@ public abstract class OmConverter<T> implements Converter<T> {
static int getInt(InputNode node) throws Exception {
return getInt(node.getValue(), 0);
}
-
+
static int getInt(String value, int def) {
int result = def;
try {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java
index 3f53b78..7518278 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
public class ProgressHolder implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private int progress;
public int getProgress() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java
index 2103db1..5453988 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java
@@ -23,6 +23,6 @@ public class Db2Patcher extends ConnectionPropertiesPatcher {
protected String getUrl(String _url, String host, String _port, String _db) {
String port = (_port == null) ? "50000" : _port;
String db = (_db == null) ? "openmeet" : _db;
- return "jdbc:db2://" + host + ":" + port + "/" + db;
+ return "jdbc:db2://" + host + ":" + port + "/" + db;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
index ea55963..1bc86e4 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
@@ -23,11 +23,11 @@ public class DerbyPatcher extends ConnectionPropertiesPatcher {
protected String getUrl(String _url, String host, String _port, String _db) {
String db = (_db == null) ? "openmeetings" : _db;
String suffix = _url.substring(_url.indexOf(';'));
-
+
if (host != null && _port != null) {
//return "jdbc:derby" + "://" + host + ":" + _port + "/" + db + suffix;
}
-
- return "jdbc:derby" + ":" + db + suffix;
+
+ return "jdbc:derby" + ":" + db + suffix;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
index bb2db07..0284efd 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
@@ -27,6 +27,6 @@ public class OraclePatcher extends ConnectionPropertiesPatcher {
if (db.startsWith("/")) {
delim = "";
}
- return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db);
+ return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java
index 975f6dc..53f1140 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java
@@ -23,6 +23,6 @@ public class PostgresPatcher extends ConnectionPropertiesPatcher {
protected String getUrl(String _url, String host, String _port, String _db) {
String port = (_port == null) ? "5432" : _port;
String db = (_db == null) ? "openmeetings" : _db;
- return "jdbc:postgresql://" + host + ":" + port + "/" + db;
+ return "jdbc:postgresql://" + host + ":" + port + "/" + db;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 03c21a9..70e9714 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/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-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java
index 591ceb4..8cfe2e2 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java
@@ -28,7 +28,7 @@ public class AudioTone {
public static void play() {
byte[] buf = new byte[1];
-
+
AudioFormat af = new AudioFormat(SAMPLE_RATE, 8, 1, true, false);
try (SourceDataLine sdl = AudioSystem.getSourceDataLine(af)) {
sdl.open(af);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java
index b00ea24..e1723aa 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java
@@ -29,7 +29,7 @@ public abstract class BaseScreenEncoder implements IScreenEncoder {
BufferedImage img = _img;
if (img.getWidth() != size.width || img.getHeight() != size.height) {
img = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_RGB);
-
+
Graphics2D graphics2D = img.createGraphics();
graphics2D.setRenderingHint(
RenderingHints.KEY_INTERPOLATION,
@@ -39,5 +39,4 @@ public abstract class BaseScreenEncoder implements IScreenEncoder {
}
return img;
}
-
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java
index 26dcb4b..8ce61cf 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java
@@ -24,10 +24,10 @@ import org.red5.server.net.rtmp.event.VideoData;
public interface IScreenEncoder {
void createUnalteredFrame() throws IOException;
-
+
VideoData getUnalteredFrame();
VideoData encode(int[][] img) throws IOException;
-
+
void reset();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java
index 7e44ba3..dbec35f 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java
@@ -35,11 +35,11 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I
private final CaptureScreen publishScreen;
private String id;
private Core core;
-
+
public void setCore(Core core) {
this.core = core;
}
-
+
RTMPClientPublish(Core core, String host, String app, String id) {
this.id = id;
this.core = core;
@@ -49,7 +49,7 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I
public void connect() {
super.connect(publishScreen.getHost(), 1935, publishScreen.getApp(), this);
}
-
+
@Override
public void handleException(Throwable throwable) {
logger.error("ERROR", throwable);
@@ -60,24 +60,24 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I
super.connectionOpened(conn);
createStream(this);
}
-
+
@Override
public void connectionClosed(RTMPConnection conn) {
super.connectionClosed(conn);
connectionClosed();
}
-
+
private void connectionClosed() {
publishScreen.setStartPublish(false);
publishScreen.release();
core.publishingStop();
}
-
+
@Override
protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
super.onCommand(conn, channel, source, command);
}
-
+
@Override
public void resultReceived(IPendingServiceCall call) {
String method = call == null ? null : call.getServiceMethodName();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java
index 0b62a7e..899e628 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java
@@ -49,15 +49,15 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
private Deflater d = new Deflater(Deflater.DEFAULT_COMPRESSION);
private byte[] zipBuf = null;
private VideoData unalteredFrame = null;
-
+
public ScreenV1Encoder() {
this(KEY_FRAME_INDEX, DEFAULT_BLOCK_SIZE);
}
-
+
public ScreenV1Encoder(int keyFrameIndex) {
this(keyFrameIndex, DEFAULT_BLOCK_SIZE);
}
-
+
//will create square blocks
public ScreenV1Encoder(int keyFrameIndex, int blockSize) {
this.keyFrameIndex = keyFrameIndex;
@@ -77,7 +77,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
buf.flip();
return new VideoData(buf);
}
-
+
@Override
public void createUnalteredFrame() throws IOException {
if (last == null) {
@@ -85,7 +85,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
}
if (unalteredFrame == null) {
ByteArrayOutputStream ba = new ByteArrayOutputStream(200);
-
+
Rectangle _area = new Rectangle(resizeX, resizeY);
//header
ba.write(getTag(FLAG_FRAMETYPE_INTERFRAME, FLAG_CODEC_SCREEN));
@@ -99,7 +99,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
unalteredFrame = getData(ba.toByteArray());
}
}
-
+
@Override
public VideoData getUnalteredFrame() {
if (unalteredFrame != null && (frameCount % keyFrameIndex) != 0) {
@@ -107,19 +107,19 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
}
return unalteredFrame;
}
-
+
@Override
public synchronized VideoData encode(int[][] img) throws IOException {
ba.reset();
Rectangle imgArea = new Rectangle(img.length, img[0].length);
Rectangle area = getNextBlock(imgArea, null);
boolean isKeyFrame = (frameCount++ % keyFrameIndex) == 0 || last == null;
-
+
//header
ba.write(getTag(isKeyFrame ? FLAG_FRAMETYPE_KEYFRAME : FLAG_FRAMETYPE_INTERFRAME, FLAG_CODEC_SCREEN));
writeShort(ba, imgArea.width + ((blockSize / 16 - 1) << 12));
writeShort(ba, imgArea.height + ((blockSize / 16 - 1) << 12));
-
+
while (area.width > 0 && area.height > 0) {
writeBytesIfChanged(ba, isKeyFrame, img, area);
area = getNextBlock(imgArea, area);
@@ -127,13 +127,13 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
last = img;
return getData(ba.toByteArray());
}
-
+
@Override
public void reset() {
last = null;
unalteredFrame = null;
}
-
+
private Rectangle getNextBlock(Rectangle img, Rectangle _prev) {
Rectangle prev;
if (_prev == null) {
@@ -151,7 +151,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
prev.x += blockSize;
}
}
- return img.intersection(prev);
+ return img.intersection(prev);
}
private void writeBytesIfChanged(ByteArrayOutputStream ba, boolean isKeyFrame, int[][] img, Rectangle area) throws IOException {
@@ -183,12 +183,12 @@ public class ScreenV1Encoder extends BaseScreenEncoder {
public int getTag(final int frame, final int codec) {
return ((frame & 0x0F) << 4) + ((codec & 0x0F) << 0);
}
-
+
private static void writeShort(OutputStream os, final int n) throws IOException {
os.write((n >> 8) & 0xFF);
os.write((n >> 0) & 0xFF);
}
-
+
public static int[][] getImage(Rectangle screen, Robot robot) {
int[][] buffer = new int[resizeX][resizeY];
BufferedImage image = resize(robot.createScreenCapture(screen), new Rectangle(resizeX, resizeY));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java
index d349e16..e261d38 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java
@@ -27,7 +27,7 @@ public class NumberSpinner extends JSpinner {
public NumberSpinner(int value, int min, int max, int step) {
super(new SpinnerNumberModel(value, min, max, step));
}
-
+
@Override
public Integer getValue() {
return (Integer)super.getValue();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java
index 7ea1111..c23e5ef 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java
@@ -45,13 +45,13 @@ public class ScreenDimensions {
public static int spinnerHeight = 0;
public static int spinnerX = 0;
public static int spinnerY = 0;
-
+
public static ScreenQuality quality = ScreenQuality.Medium;
public static int FPS = 10;
-
+
public static int resizeX = 640;
public static int resizeY = 480;
-
+
static {
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
ratio = screenSize.getHeight() / screenSize.getWidth();
@@ -65,7 +65,7 @@ public class ScreenDimensions {
resizeX = 640;
resizeY = 400;
}
-
+
public enum ScreenQuality {
VeryHigh
, High
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java
index 18e21b3..ca7a61b 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java
@@ -31,7 +31,7 @@ public class ScreenHeightMouseListener extends MouseInputAdapter {
public ScreenHeightMouseListener(ScreenSharerFrame frame) {
this.frame = frame;
}
-
+
@Override
public void mouseEntered(MouseEvent e) {
frame.setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java
index 781dca2..213e4e4 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java
@@ -28,9 +28,9 @@ import org.quartz.JobExecutionException;
@DisallowConcurrentExecution
public class CursorJob implements Job {
public static final String CAPTURE_KEY = "capture";
-
+
public CursorJob() {}
-
+
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap data = context.getJobDetail().getJobDataMap();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java
index 552c715..f211457 100644
--- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java
+++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java
@@ -45,7 +45,7 @@ public class EncodeJob implements Job {
Robot robot;
Rectangle screen = new Rectangle(spinnerX, spinnerY, spinnerWidth, spinnerHeight);
int[][] image = null;
-
+
public EncodeJob() {
try {
robot = new Robot();
@@ -53,12 +53,12 @@ public class EncodeJob implements Job {
log.error("encode: Unexpected Error while creating robot", e);
}
}
-
+
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap data = context.getJobDetail().getJobDataMap();
CaptureScreen capture = (CaptureScreen)data.get(CAPTURE_KEY);
-
+
long start = 0;
if (log.isTraceEnabled()) {
start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/src/main/resources/logback.xml b/openmeetings-screenshare/src/main/resources/logback.xml
index ead06e1..8b6c297 100644
--- a/openmeetings-screenshare/src/main/resources/logback.xml
+++ b/openmeetings-screenshare/src/main/resources/logback.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.
-
+
-->
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 55d4e45..eb2d5ee 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/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-server/src/site/resources/js/site.js
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/js/site.js b/openmeetings-server/src/site/resources/js/site.js
index 2a4be8c..88fcece 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -6,16 +6,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.
-
+
*/
$(document).ready(function() {
// "New" markers
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/stylesheets/errorvalues.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/stylesheets/errorvalues.xml b/openmeetings-server/src/site/stylesheets/errorvalues.xml
index 237a9a0..e8c18f9 100644
--- a/openmeetings-server/src/site/stylesheets/errorvalues.xml
+++ b/openmeetings-server/src/site/stylesheets/errorvalues.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="errorvalues.xsd">
<row>
<field name="starttime">2007-12-06 19:01:07</field>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/BitrixPlugin.xml b/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
index f7b7f90..6307428 100644
--- a/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
+++ b/openmeetings-server/src/site/xdoc/BitrixPlugin.xml
@@ -11,10 +11,10 @@
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.
- -->
+-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Bitrix Plugin</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -22,9 +22,9 @@
<body>
<section name="OpenMeetings Plugin for Bitrix">
<p>
- Plugin for Bitrix currently is not open source.
- Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it.
- </p>
+ Plugin for Bitrix currently is not open source.
+ Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it.
+ </p>
</section>
<section name="Features">
<p>The plugin contains the following features: </p>
@@ -32,7 +32,7 @@
<li>Enter videoconference rooms from Bitrix (http://www.1c-bitrix.ru/): </li>
</ul>
</section>
- <section name="Configuration">
+ <section name="Configuration">
<div>
<b>OpenMeetings Bitrix Plugin Installation</b><br/>
<ol>
@@ -40,9 +40,8 @@
<li>Unpack it into bitrix/modules</li>
<li>Install via Admin</li>
<li>Add OPenmeetings component to any page.</li>
- </ol>
+ </ol>
</div>
</section>
</body>
-
</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml b/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
index ac74b31..aff2312 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
@@ -32,7 +32,7 @@
</section>
<section name="These instructions are for 3.0.x version only"/>
-
+
<section name="How to Build a Distribution">
<div>
<p>To build a binary release of OpenMeetings you need: </p>
@@ -302,4 +302,4 @@ ant -Ddb=<name of DB> # will copy <name of DB>_persistense.xml to pers
</body>
-</document>
\ No newline at end of file
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
index c0fa323..b11fe15 100644
--- a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
+++ b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
@@ -40,7 +40,7 @@
--email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --email-auth-pass 123qweasd
</source>
</section>
- <section name="Command reference">
+ <section name="Command reference">
<source><![CDATA[
-v,--verbose verbose error messages
--------------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml b/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml
index 3697315..3eb204c 100644
--- a/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml
+++ b/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml
@@ -65,7 +65,7 @@
<li>continue styling :)))</li>
</ul>
</p>
- <p>Thats it. You can add/edit/delete your room with the new room type in the Administration > Rooms interface of
+ <p>Thats it. You can add/edit/delete your room with the new room type in the Administration > Rooms interface of
OpenMeetings like any other room.</p>
</section>
</body>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/DrupalPlugin.xml b/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
index 6b6e0ac..40fde09 100644
--- a/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
+++ b/openmeetings-server/src/site/xdoc/DrupalPlugin.xml
@@ -13,28 +13,24 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Drupal Plugin</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
-
<section name="Drupal Plugin for OpenMeetings">
<p>
- Plugin for Drupal currently is not open source.
- Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it.
+ Plugin for Drupal currently is not open source.
+ Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it.
</p>
</section>
-
<section name="Installation of the Drupal Plugin for Apache OpenMeetings">
<p>
You simply download the ZIP or TAR package and unzip it to Drupal "mod" directory.
<br/>
- For a detailed description on how to install plugins in Drupal please review their
+ For a detailed description on how to install plugins in Drupal please review their
<a href="http://drupal.org/documentation/install/modules-themes" target="_blank" rel="nofollow">handbook</a>.
<br />
Then you visit the module interface of Drupal, where you will find the new module.
@@ -52,12 +48,10 @@
height="340" />
</a>
</section>
-
<section name="Adding a new conference room to Drupal">
-
<p>
- After installation of the plugin you can go to the front page in Drupal and add a new content item
- "OpenMeetings Rooms" => "Add New Room". You may find following configuration values for each
+ After installation of the plugin you can go to the front page in Drupal and add a new content item
+ "OpenMeetings Rooms" => "Add New Room". You may find following configuration values for each
conference room:
</p>
<a class="fancybox-buttons" href="images/drupal_room_configuration.png">
@@ -65,12 +59,10 @@
height="400" />
</a>
</section>
-
<section name="Demo video">
<p>The demo video of Drupal plugin show you the plugin in action </p>
<iframe width="640" height="390" src="http://www.youtube.com/embed/LmMIKFCLRV4" frameborder="0" allowfullscreen=""></iframe>
<iframe width="640" height="390" src="http://www.youtube.com/embed/k5PF3vdVUn0" frameborder="0" allowfullscreen=""></iframe>
</section>
</body>
-
-</document>
\ No newline at end of file
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/EditTemplates.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/EditTemplates.xml b/openmeetings-server/src/site/xdoc/EditTemplates.xml
index 0846c24..b86c2fc 100644
--- a/openmeetings-server/src/site/xdoc/EditTemplates.xml
+++ b/openmeetings-server/src/site/xdoc/EditTemplates.xml
@@ -13,14 +13,12 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Edit Templates</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
<section name="Changing Labels and text strings">
<p>
@@ -34,7 +32,7 @@
To lookup the labelids in the GUI you can simply run OpenMeetings
client with the debug enabled. That way every text-string has the
labelid in brackets additionally in the textfield. To start the
- client in debug mode please check "Tips and Tricks" section of
+ client in debug mode please check "Tips and Tricks" section of
<a href="installation.html" rel="nofollow">Installation guide</a>
</p>
</section>
@@ -47,12 +45,12 @@
<ul>
<li>Stop the Red5/OpenMeetings service</li>
<li>Goto: <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/</tt></li>
- <li>Change HTML file(s) according to your needs, BUT do not remove
- elements with <tt>wicket:id</tt> attributes! You can hide those
+ <li>Change HTML file(s) according to your needs, BUT do not remove
+ elements with <tt>wicket:id</tt> attributes! You can hide those
elements by adding <tt>wicket:visible="false"</tt> attribute
</li>
<li>Starting OM 3.1.4 you can change Appointment reminder subject by
- modifying "subject" fragment in file
+ modifying "subject" fragment in file
<tt>$RED5_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.html</tt>
as described in previous bullet.
</li>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml b/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml
index 1baf855..6397510 100644
--- a/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml
+++ b/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml
@@ -11,10 +11,10 @@
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.
- -->
+-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Joomla Plugin</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -22,9 +22,9 @@
<body>
<section name="OpenMeetings Plugin for Joomla">
<p>
- Plugin for Joomla currently is not open source.
- Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it.
- </p>
+ Plugin for Joomla currently is not open source.
+ Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it.
+ </p>
</section>
<section name="Features">
<p>The plugin contains the following features: </p>
@@ -32,29 +32,28 @@
<li>Create videoconference rooms from Joomla: </li>
<li>
<ol>
- <li>Create rooms</li>
+ <li>Create rooms</li>
<li>Enter the room</li>
</ol>
</li>
<li>Access recordings from Joomla: </li>
<li>
<ol>
- <li>Download recordings</li>
+ <li>Download recordings</li>
</ol>
</li>
</ul>
</section>
- <section name="Demo video">
+ <section name="Demo video">
<div>
- <b>OpenMeetings Joomla Plugin Installation</b><br/>
+ <b>OpenMeetings Joomla Plugin Installation</b><br/>
<iframe width="640" height="360" src="https://www.youtube.com/embed/jt8ejgtHavc?feature=player_embedded" frameborder="0" allowfullscreen=""></iframe>
</div>
<br/>
<div>
- <b>OpenMeetings Integration with Joomla</b><br/>
+ <b>OpenMeetings Integration with Joomla</b><br/>
<iframe width="640" height="360" src="https://www.youtube.com/embed/H61N0pfLusA?feature=player_embedded" frameborder="0" allowfullscreen=""></iframe>
</div>
</section>
</body>
-
-</document>
\ No newline at end of file
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/LdapAndADS.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/LdapAndADS.xml b/openmeetings-server/src/site/xdoc/LdapAndADS.xml
index c43e3ee..87c17dd 100644
--- a/openmeetings-server/src/site/xdoc/LdapAndADS.xml
+++ b/openmeetings-server/src/site/xdoc/LdapAndADS.xml
@@ -85,7 +85,7 @@ TLS_CACERT /etc/ssl/certs/ca-certificates.crt
Successful integration is also reported with Novell eDirectory
</p>
<p>
- You can configure multiple domains or different user-paths in the Administration of OpenMeetings.
+ You can configure multiple domains or different user-paths in the Administration of OpenMeetings.
</p>
<p>
<b>NOTE: </b>You should specify file name <i>RELATIVE</i> to <tt>$RED5_HOME/webapps/openmeetings/conf</tt>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
index 26e2a78..0f454bb 100644
--- a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
+++ b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
@@ -30,7 +30,7 @@
before you start the installation process of OpenMeetings!
</li>
<li>
- make sure MSSQL is listening on TCP/IP connections! and username/password
+ make sure MSSQL is listening on TCP/IP connections! and username/password
authentication is enabled for it
<br />
To verify if MSSQL connection is working: OpenMeetings will
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/ManualTesting.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ManualTesting.xml b/openmeetings-server/src/site/xdoc/ManualTesting.xml
index d3e5876..f11db0a 100644
--- a/openmeetings-server/src/site/xdoc/ManualTesting.xml
+++ b/openmeetings-server/src/site/xdoc/ManualTesting.xml
@@ -36,7 +36,7 @@
<b>User GUI tests</b>
<ol>
<li>
- Login/logout
+ Login/logout
<ol>
<li>Password recovering </li>
<li>Self-registering </li>
@@ -53,10 +53,10 @@
<li>Links in the "Help and support" section </li>
<li>It should be possible to enter user’s room from the dashboard </li>
<li>Room details should be shown correctly in the "Rooms in this section…" part of the screen </li>
- </ol>
+ </ol>
</li>
<li>
- Global chat
+ Global chat
<ol>
<li>Send/receive message where at least 3 users in the system </li>
<li>Adding a contact to the contact list </li>
@@ -68,7 +68,7 @@
<li>Changing font style in the massage </li>
<li>Adding emotions to the message </li>
</ol>
- Attention! Correct RTL support does not work in the current implementation
+ Attention! Correct RTL support does not work in the current implementation
</li>
<li>
Calendar view
@@ -94,12 +94,12 @@
</ol>
</li>
<li>
- My Profile: User profile should contain correct user info and allow to edit this
+ My Profile: User profile should contain correct user info and allow to edit this
</li>
<li>
Contacts and Messages
<ol>
- <li>Add/remove a message </li>
+ <li>Add/remove a message </li>
<li>Creating a new folder </li>
<li>Moving between the folders </li>
<li>Marking messages as read/unread </li>
@@ -113,7 +113,7 @@
<li>Possibility to change the user info </li>
<li>Changing time zone and language (should start to work after user re-login </li>
<li>Community settings or different users </li>
- <li>Display settings</li>
+ <li>Display settings</li>
</ol>
</li>
<li>
@@ -125,7 +125,7 @@
</ol>
</li>
<li>
- Room lists
+ Room lists
<ol>
<li>Public rooms, private rooms and my rooms should contain correct room lists </li>
<li>User list for the selected room </li>
@@ -134,7 +134,7 @@
</li>
<li>
Recordings
- <ol>
+ <ol>
<li>The list should contain available recordings in public and private folders </li>
<li>Info panel should contain actual info about the recording </li>
<li>Downloading a recording is different formats (AVI/FLV) </li>
@@ -285,7 +285,7 @@
</ol>
</li>
<li>
- Groups
+ Groups
<ol>
<li>Add/remove/edit/search an group </li>
<li>Add/remove a user from the user list of selected group </li>
@@ -325,7 +325,7 @@
</ol>
</li>
<li>
- Language editor
+ Language editor
<ol>
<li>Add/remove/edit/search a key </li>
<li>Import/export of localization files </li>
@@ -340,7 +340,7 @@
<li>System import </li>
<li>System backup </li>
<li>TBD – need to add tests for command line admin here </li>
- </ol>
+ </ol>
</li>
<li>
Servers: Add/remove/edit/search a server
@@ -426,7 +426,7 @@
</li>
<li>
<b>Conference room testing</b>
- <ol>
+ <ol>
<li>
Screen sharing
<ol>
@@ -442,7 +442,7 @@
<li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Medium quality" on the step 2.1.5</li>
<li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Low quality" on the step 2.1.5</li>
<li>Repeat steps 2.1.1-2.1.7 one more time, but choose some random height and width on the step 2.1.5</li>
- <li>Repeat steps 2.1.1-2.1.7 one more time, but turn the "Notify on disconnect" switch on the step 2.1.5</li>
+ <li>Repeat steps 2.1.1-2.1.7 one more time, but turn the "Notify on disconnect" switch on the step 2.1.5</li>
</ol>
</li>
<li>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/MoodlePlugin.xml b/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
index 8bb9935..7eea909 100644
--- a/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
+++ b/openmeetings-server/src/site/xdoc/MoodlePlugin.xml
@@ -13,15 +13,13 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Moodle Plugin</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
-
<section name="Moodle Plugin for OpenMeetings">
<p>
You can get the latest Version of the Plugin for Moodle from the
@@ -30,7 +28,6 @@
.
</p>
</section>
-
<section name="Installation of the Moodle Plugin for Apache OpenMeetings">
<p>
You simply download the ZIP or TAR package and unzip it to Moodle's "mod" directory.<br/>
@@ -53,12 +50,10 @@
height="300" />
</a>
</section>
-
<section name="Adding a new conference room to a Moodle course">
-
<p>
After installation of the plugin you can go to the course pages in Moodle and turn editing on.
- Then you choose the activity "OpenMeetings", Moodle will then show you the conference room
+ Then you choose the activity "OpenMeetings", Moodle will then show you the conference room
configuration with all the options:
</p>
<a class="fancybox-buttons" href="images/moodle_add_activity_plugin.png">
@@ -66,11 +61,9 @@
height="360" />
</a>
</section>
-
<section name="Demo video">
<p>The demo video of SugarCRM plugin show you the plugin in action </p>
<iframe width="640" height="390" src="http://www.youtube.com/embed/pPgv7zkPXAk" frameborder="0" allowfullscreen=""></iframe>
</section>
</body>
-
</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/NewsArchive.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/NewsArchive.xml b/openmeetings-server/src/site/xdoc/NewsArchive.xml
index dde8c67..e41ca4c 100644
--- a/openmeetings-server/src/site/xdoc/NewsArchive.xml
+++ b/openmeetings-server/src/site/xdoc/NewsArchive.xml
@@ -293,7 +293,7 @@
Other fixes in admin, localization, installer, invitations, room etc.<br/>
</div>
<span>
- 77 issues are fixed please check
+ 77 issues are fixed please check
<a href="http://archive.apache.org/dist/openmeetings/3.1.0/CHANGELOG">CHANGELOG</a> and
<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12333397">Detailed list</a>
</span>
@@ -318,7 +318,7 @@
Other fixes<br/>
</div>
<span>
- 20 issues are fixed please check
+ 20 issues are fixed please check
<a href="http://archive.apache.org/dist/openmeetings/3.0.7/CHANGELOG">CHANGELOG</a> and
<a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12332443">Detailed list</a>
</span>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/PostgresConfig.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/PostgresConfig.xml b/openmeetings-server/src/site/xdoc/PostgresConfig.xml
index 9f6b33d..6021c24 100644
--- a/openmeetings-server/src/site/xdoc/PostgresConfig.xml
+++ b/openmeetings-server/src/site/xdoc/PostgresConfig.xml
@@ -25,7 +25,7 @@
<subsection name="Before you start">
<ul>
- <li>Make sure that you have set utf8 as default/server-character-set
+ <li>Make sure that you have set utf8 as default/server-character-set
</li>
<li>
make sure PostgreSQL is listening on TCP/IP connections!
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
index d31aaad..66ce74e 100644
--- a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
+++ b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
@@ -76,7 +76,7 @@ Enter key password for <red5>
</li>
<li>Import your chosen CA's root certificate into the keystore (may
need to download it from their site - make sure to get the root CA and
- not the intermediate one):
+ not the intermediate one):
<source><![CDATA[keytool -import -alias root -keystore red5/conf/keystore.jks -trustcacerts -file root.crt]]></source>
(note: you may receive a warning that the certificate already exists in the system wide keystore - import
anyway)
@@ -121,7 +121,7 @@ keytool -importkeystore -srcstorepass password -srckeystore red5.p12 -srcstorety
</li>
<li>Import your chosen CA's root certificate into the keystore (may
need to download it from their site - make sure to get the root CA and
- not the intermediate one):
+ not the intermediate one):
<source><![CDATA[keytool -import -alias root -keystore red5/conf/keystore.jks -trustcacerts -file root.crt]]></source>
(note: you may receive a warning that the certificate already exists in the system wide keystore - import
anyway)
@@ -143,7 +143,7 @@ keytool -importkeystore -srcstorepass password -srckeystore red5.p12 -srcstorety
<h3>Prerequisites</h3>
<ul>
<li>Create CA's root certificate: ca.crt</li>
- <li>Create self-signed server certificate: red5.crt <tt>Common Name (CN) while creating certificate
+ <li>Create self-signed server certificate: red5.crt <tt>Common Name (CN) while creating certificate
should be assign to FQDN of your site, for example - vkc.company.com</tt></li>
<li>Rename the existing keystore file <tt>red5/conf/keystore.jmx</tt> to <tt>red5/conf/keystore.bak</tt></li>
<li>Rename the existing truststore file <tt>red5/conf/truststore.jmx</tt> to <tt>red5/conf/truststore.bak</tt></li>
@@ -231,7 +231,7 @@ jmx.keystorepass=changeit
]]></source>
</li>
<li>Restart red5 and try to connect - your connection should now be made via RTMPS (close port 1935 to be sure)
- </li>
+ </li>
</ol>
<h3>Native RTMPS</h3>
<ol>
@@ -252,7 +252,7 @@ jmx.keystorepass=changeit
]]></source>
</li>
<li>Restart red5 and try to connect - your connection should now be made via RTMPS (close port 1935 to be sure)
- </li>
+ </li>
</ol>
</section>
<section name="Credits">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RedminePlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RedminePlugin.xml b/openmeetings-server/src/site/xdoc/RedminePlugin.xml
index c302720..3d71131 100644
--- a/openmeetings-server/src/site/xdoc/RedminePlugin.xml
+++ b/openmeetings-server/src/site/xdoc/RedminePlugin.xml
@@ -25,7 +25,7 @@
Current Development Snapshots for testing can be created from the sources:
<a href="https://github.com/openmeetings/openmeetings-redmine-plugin">here</a>.<br/>
The page at redmine site is <a href="http://www.redmine.org/plugins/redmine-openmeetings">here</a>
- </p>
+ </p>
</section>
<section name="Features">
<p>TBD</p>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
index 11364fe..56680b3 100644
--- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
+++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
@@ -88,7 +88,6 @@
Set up development environment as described here: <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env">Setup development environment</a><br/>
Don't forget to secure passwords as described here: <a href="http://maven.apache.org/guides/mini/guide-encryption.html#How_to_create_a_master_password">Password Encryption</a>
</li>
-
</ul>
</li>
</ul>
@@ -194,11 +193,11 @@ mvn deploy -Pdeploy,rc
<a
href="http://mail-archives.apache.org/mod_mbox/openmeetings-dev/201701.mbox/%3CCAJmbs8gyvHuarzdVma%2BF6ap7RHBhhVciZp5Oi5JogQdLR6o0NA%40mail.gmail.com%3E">example Result email</a>
<br />
- Votes on whether a package is ready to be released use majority approval -- i.e., at
- least three PMC members must vote affirmatively for release, and there must be more
+ Votes on whether a package is ready to be released use majority approval -- i.e., at
+ least three PMC members must vote affirmatively for release, and there must be more
positive than negative votes. Releases may not be vetoed. Before voting +1 PMC members
- are required to download the signed source code package, compile it as provided, and
- test the resulting executable on their own platform, along with also verifying that
+ are required to download the signed source code package, compile it as provided, and
+ test the resulting executable on their own platform, along with also verifying that
the package meets the requirements of the ASF policy on releases.
</p>
</subsection>
@@ -261,13 +260,11 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done
</li>
</ul>
<p>NOTE: "Type of signing" can be selected as "Test" to check everything works as expected</p>
-
</subsection>
-
<subsection name="Step4 - Distribute and announce">
<p>If VOTEs positive: Upload the release </p>
<ul>
- <li>Upload Artifacts with signatures created on the previous steps to
+ <li>Upload Artifacts with signatures created on the previous steps to
https://dist.apache.org/repos/dist/release/openmeetings/CURRENT_VERSION
</li>
<li>Close staging repo:
@@ -297,7 +294,7 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done
Add a section to <a href="downloads.html">downloads</a> website.<br />
Make sure that the binary packages are linked using the mirror URL as base path (
<b>not</b> http://www.apache.org/dist):<br />
- Mirror URL:
+ Mirror URL:
<a href="http://www.apache.org/dyn/closer.lua/openmeetings/">http://www.apache.org/dyn/closer.lua/openmeetings/</a>
</li>
<li>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RestAPISample.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RestAPISample.xml b/openmeetings-server/src/site/xdoc/RestAPISample.xml
index 30de9db..998741a 100644
--- a/openmeetings-server/src/site/xdoc/RestAPISample.xml
+++ b/openmeetings-server/src/site/xdoc/RestAPISample.xml
@@ -13,8 +13,8 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>REST API sample</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -22,11 +22,10 @@
<body>
<section name="Introduction">
<p> For a detailed instruction which services, methods and params are available see the list in the <a href="/openmeetings-webservice/apidocs/index.html" target="_blank">SOAP/REST API</a> .
- ALL methods that are implemented for the SOAP API are also available via REST.
+ ALL methods that are implemented for the SOAP API are also available via REST.
</p>
<div>
you can query methods of each service using following suffixes
-
<ul>
<li>SOAP: <tt>?wsdl</tt> suffix, for example <tt>http://localhost:5080/openmeetings/services/UserService?wsdl</tt></li>
<li>REST: as xml <tt>?_wadl</tt> for example <tt>http://localhost:5080/openmeetings/services/user?_wadl</tt></li>
@@ -35,7 +34,7 @@
<div class="bs-callout bs-callout-info">
The full list of services with All WSDLs/WADLs is available at following URL: <tt>http://localhost:5080/openmeetings/services/services</tt>
</div>
- </div>
+ </div>
</section>
<section name="How to get room hash via REST">
<ul>
@@ -83,7 +82,7 @@ $.ajax({
</table>
</li>
<li>
- In case of error you can get detailed error message in your language as result of following query
+ In case of error you can get detailed error message in your language as result of following query
<tt>http://localhost:5080/openmeetings/services/error/<b>ERROR_ID</b>/<b>LANGUAGE_ID</b></tt>
(for ex. http://localhost:5080/openmeetings/services/error/<b>-11</b>/<b>9</b>)
</li>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
index 82e53bc..9cb47dc 100644
--- a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
+++ b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
@@ -21,9 +21,7 @@
</properties>
<body>
-
<section name="Server Side">
-
<p>You can protect your OpenMeetings instance from beeing accessed
from 3th party by using the file:
</p>
@@ -36,9 +34,7 @@
rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD
</a>
</section>
-
<section name="Client Side">
-
<p>And you can restrict the access also for the client side: Every
Flash Plugin will check a file called "crossdomain.xml" before it
tries to access the server using rtmp/RPC. This file is located: </p>
@@ -54,7 +50,6 @@
</cross-domain-policy>
]]>
</source>
-
<p>
If you accessing your application behind an Apache Webservre (using
mod_proxy or mod_jk2) be careful to make the crossdomain.xml
@@ -64,9 +59,6 @@
</a>
for example to lookup requests.
</p>
-
</section>
-
</body>
-
</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/SakaiPlugin.xml b/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
index 64b9d0a..68d29cd 100644
--- a/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
+++ b/openmeetings-server/src/site/xdoc/SakaiPlugin.xml
@@ -33,7 +33,7 @@
<p>
The plugin was developed for some Spanish Universities that use
Sakai and belongs to
- <a rel="nofollow" target="_blank"
+ <a rel="nofollow" target="_blank"
href="https://confluence.sakaiproject.org/display/SPANISH/S2G+-+Spanish+Sakai+Group">"Spanish Sakai Universities"</a>
group:
</p>
@@ -86,7 +86,7 @@
<section name="Source">
<p>
You can download and build the source code
- <a rel="nofollow" target="_blank"
+ <a rel="nofollow" target="_blank"
href="https://source.sakaiproject.org/contrib/samoo/adobeconnectpro-openmeetings-integration/trunk/">here</a>
</p>
</section>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/Upgrade.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Upgrade.xml b/openmeetings-server/src/site/xdoc/Upgrade.xml
index b224c75..67dc208 100644
--- a/openmeetings-server/src/site/xdoc/Upgrade.xml
+++ b/openmeetings-server/src/site/xdoc/Upgrade.xml
@@ -13,8 +13,8 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Upgrade</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -32,7 +32,7 @@
appointments (Invitations and Reminders are NOT included in the
Backup and Reminders will not be send again!). The Backup contains
also all uploaded Files and Documents and will re-import them again.
-
+
Max Upload Size is 1000 MB.
</p>
</li>
@@ -55,7 +55,7 @@
<section name="Upgrading OpenMeetings from command line">
<p>
- <i>You need OpenMeetings 2.x or later to have the command line interface (CLI)
+ <i>You need OpenMeetings 2.x or later to have the command line interface (CLI)
feature available
</i>
</p>
@@ -70,7 +70,7 @@
A typical import would be:<br />
<tt>./admin.sh -r -file backup_yesterday.zip</tt><br />
<br />
- You can also combine the installation with a backup, that way you will create exactly the user table
+ You can also combine the installation with a backup, that way you will create exactly the user table
that existed in the backup.<br />
A typical install from backup would be:<br />
<tt>./admin.sh -i -file backup_yesterday.zip</tt><br/>
@@ -91,7 +91,5 @@
</ol>
<p>(*) Optional step</p>
</section>
-
</body>
-
-</document>
\ No newline at end of file
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/WebappNamePath.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebappNamePath.xml b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
index 0014828..bf6776e 100644
--- a/openmeetings-server/src/site/xdoc/WebappNamePath.xml
+++ b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
@@ -113,13 +113,13 @@
</section>
<section name="Running multiple Openmeetings instances on the same server">
<p>
- If you want to run multiple Openmeetings instances on the same server i.e. to have<br/>
- <tt>http://yourcorp.com:5080/openmeetings1</tt><br/>
+ If you want to run multiple Openmeetings instances on the same server i.e. to have<br/>
+ <tt>http://yourcorp.com:5080/openmeetings1</tt><br/>
<tt>http://yourcorp.com:5080/openmeetings2</tt><br/> etc.<br/> you need to do the following:
</p>
<ol>
- <li>edit <tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for <strong>every</strong> Openmeetings
- instance and add the following line <tt>webapp.contextPath=/openmeetings1</tt> to it (context of
+ <li>edit <tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for <strong>every</strong> Openmeetings
+ instance and add the following line <tt>webapp.contextPath=/openmeetings1</tt> to it (context of
<strong>every</strong> instance <strong>should</strong> match the folder name in webapps dir)
</li>
<li>in case of java memory problems modify <tt>red5.sh</tt> add following line:<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
index 6d50a36..fb6605f 100644
--- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
+++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml
@@ -32,8 +32,8 @@
<subsection name="Introduction">
<div>
<p>
- The Apache OpenMeetings HTML websites are generated from XML files.
- You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source> that generates the HTML files
+ The Apache OpenMeetings HTML websites are generated from XML files.
+ You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source> that generates the HTML files
and then you copy generated HTML files into appropriate place and commit to Git both: XML and HTML files.
</p>
<p>
@@ -70,7 +70,7 @@ git checkout asf-site
</subsection>
<subsection name="Adding a new menu entry">
<div>
- To add a new menu entry in the left side panel you need to modify the file:
+ To add a new menu entry in the left side panel you need to modify the file:
<br/>
<tt>openmeetings-server/src/site/site.xml</tt>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/commercial-support.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/commercial-support.xml b/openmeetings-server/src/site/xdoc/commercial-support.xml
index fe8a191..3752ff0 100644
--- a/openmeetings-server/src/site/xdoc/commercial-support.xml
+++ b/openmeetings-server/src/site/xdoc/commercial-support.xml
@@ -13,9 +13,8 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Commercial Support</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -34,23 +33,20 @@
run by Maxim Solodovnik, Timur Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev
</li>
<li>
- <a href="http://www.samoo.es" target="_blank" rel="nofollow">samoo.es</a>
- provides support for the Sakai Plugin
- </li>
+ <a href="http://www.samoo.es" target="_blank" rel="nofollow">samoo.es</a>
+ provides support for the Sakai Plugin
+ </li>
</ul>
<p>
Please write to <a href="mailto:om.unipro@gmail.com">om.unipro@gmail.com</a> to get UniPro support
</p>
<p>
- There are more companies offering installation, customization, hosting, conferencing and support services. You can add
+ There are more companies offering installation, customization, hosting, conferencing and support services. You can add
yourself to the <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Commercial+Support">wiki page</a>.
</p>
-
<p>
Want to get listed here? Become a <a href="http://www.apache.org/dev/committers.html">committer</a>.
</p>
</section>
-
</body>
-
</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/downloads.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/downloads.xml b/openmeetings-server/src/site/xdoc/downloads.xml
index 4939715..46c02fb 100644
--- a/openmeetings-server/src/site/xdoc/downloads.xml
+++ b/openmeetings-server/src/site/xdoc/downloads.xml
@@ -107,8 +107,8 @@ http://localhost:15080/openmeetings
</subsection>
<subsection name="Plugins / Non ASF downloads">
<p>
- If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out
- <a href="https://github.com/openmeetings/" target="_blank" rel="nofollow">github.com</a> or
+ If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out
+ <a href="https://github.com/openmeetings/" target="_blank" rel="nofollow">github.com</a> or
ask <a href="commercial-support.html">commercial support</a>.
</p>
<p>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/installation.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/installation.xml b/openmeetings-server/src/site/xdoc/installation.xml
index 173df11..7261acd 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -13,17 +13,14 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Installation</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
-
<section name="OpenMeetings Installation">
-
<p>
To update from past versions or migrate see <a href="Upgrade.html">Upgrade</a>.<br/>
If you are looking for commercial help have a look at
@@ -36,7 +33,7 @@
<p>
<i>Note: Openmeetings requires JRE 7/8, JRE 6 is NOT compatible!</i><br />
<i>
- Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked
+ Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked
archive and type ./admin.sh or admin.bat, please see
<a href="CommandLineAdmin.html" target="_blank" rel="nofollow">Command Line Admin</a>
for more options
@@ -208,7 +205,7 @@
</li>
<li>
<a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools">
- OpenMeetings Installation tutorials by Alvaro Bustos for: Ubuntu, Debian, Mint, MacOS X, CentOS, Fedora,
+ OpenMeetings Installation tutorials by Alvaro Bustos for: Ubuntu, Debian, Mint, MacOS X, CentOS, Fedora,
PCLinuxOS, openSUSE and Arch Linux.</a>
</li>
<li>
@@ -243,7 +240,7 @@
<param-name>configuration</param-name>
<param-value>DEVELOPMENT</param-value>
</init-param>
- ]]></source>
+ ]]></source>
then access your OM installation
</li>
<li>If you have Problems with conversion-jobs check your openmeetings log
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
index e3b0660..a874f77 100644
--- a/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
+++ b/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml
@@ -31,18 +31,18 @@
</p>
</section>
- <section name="Setup Asterisk">
+ <section name="Setup Asterisk">
<div>
- Run the commands
+ Run the commands
<source>
<![CDATA[
sudo apt-get update
sudo apt-get install asterisk asterisk-mysql
]]>
</source>
- </div>
- <div>
- Ubuntu 10.04 has broken asterisk-mysql version. For other distribution next commands not needed:
+ </div>
+ <div>
+ Ubuntu 10.04 has broken asterisk-mysql version. For other distribution next commands not needed:
<source>
<![CDATA[
aptitude purge asterisk-mysql
@@ -52,21 +52,21 @@ apt-get -b source asterisk-mysql
dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb
]]>
</source>
- </div>
- <div>
- Enable asterisk mysql realtime module:<br/><br/>
- Add string
+ </div>
+ <div>
+ Enable asterisk mysql realtime module:<br/><br/>
+ Add string
<source>
<![CDATA[
load => res_config_mysql.so
]]>
</source>
- to the /etc/asterisk/modules.conf into the "modules" section.
- </div>
- <div>
- Configure mysql realtime module:<br/><br/>
+ to the /etc/asterisk/modules.conf into the "modules" section.
+ </div>
+ <div>
+ Configure mysql realtime module:<br/><br/>
- Create file /etc/asterisk/res_mysql.conf and add lines:
+ Create file /etc/asterisk/res_mysql.conf and add lines:
<source>
<![CDATA[
[general]
@@ -77,9 +77,9 @@ dbpass=
dbport=3306
]]>
</source>
- </div>
- <div>
- Add next lines into the /etc/asterisk/extconfig.conf:
+ </div>
+ <div>
+ Add next lines into the /etc/asterisk/extconfig.conf:
<source>
<![CDATA[
[settings]
@@ -89,50 +89,50 @@ extensions => mysql,general,extensions
meetme => mysql,general,meetme
]]>
</source>
- </div>
- <div>
- Add next lines into the /etc/asterisk/extensions.conf:
+ </div>
+ <div>
+ Add next lines into the /etc/asterisk/extensions.conf:
<source>
<![CDATA[
[rooms]
switch => Realtime/@
]]>
</source>
- </div>
+ </div>
- <div>
- Restart asterisk:
+ <div>
+ Restart asterisk:
<source>
<![CDATA[
service asterisk restart
]]>
</source>
- Insert, for example, SIP user with name 'test':
+ Insert, for example, SIP user with name 'test':
<source>
<![CDATA[
INSERT INTO sipusers (allow, context, disallow, host, name, secret) VALUES ('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345');
]]>
</source>
- </div>
+ </div>
</section>
- <section name="Setup red5sip transport">
- <div>
- Download red5sip from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt>
- </div>
- <p>
- Build with Apache Ant
- </p>
- <div>
- Install jsvc:
+ <section name="Setup red5sip transport">
+ <div>
+ Download red5sip from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt>
+ </div>
+ <p>
+ Build with Apache Ant
+ </p>
+ <div>
+ Install jsvc:
<source>
<![CDATA[
apt-get install jsvc
]]>
</source>
- </div>
- <div>
- Insert proper values to the /opt/red5sip/settings.properties
+ </div>
+ <div>
+ Insert proper values to the /opt/red5sip/settings.properties
<source>
<![CDATA[
@@ -146,9 +146,9 @@ sip.proxy -
rooms - ids of openmeetings rooms, can be, for example, 2,3,5,6
]]>
</source>
- </div>
- <div>
- Add red5sip to autostart:
+ </div>
+ <div>
+ Add red5sip to autostart:
<source>
<![CDATA[
ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip
@@ -156,24 +156,23 @@ chmod a+x /etc/init.d/red5sip
update-rc.d /etc/init.d/red5sip defaults
]]>
</source>
- </div>
- <div>
- Start openmeetings
+ </div>
+ <div>
+ Start openmeetings
<source>
<![CDATA[
service red5 start
]]>
</source>
- </div>
- <div>
- Start red5sip
+ </div>
+ <div>
+ Start red5sip
<source>
<![CDATA[
service red5sip start
]]>
</source>
- </div>
- </section>
+ </div>
+ </section>
</body>
-
-</document>
\ No newline at end of file
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
index c76add3..2693adf 100644
--- a/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
+++ b/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml
@@ -218,7 +218,7 @@ denoise=true
[default_bridge]
type=bridge
-video_mode=follow_talker
+video_mode=follow_talker
]]>
</source>
</div><br />
@@ -243,14 +243,14 @@ write = all
</source>
</div><br />
<div>
- Update Openmeetings with creadentials for Asterisk manager.
+ Update Openmeetings with creadentials for Asterisk manager.
Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt><br />
find <strong><bean id="sipDao" class="org.apache.openmeetings.data.conference.dao.SipDao"></strong>
uncomment its parameters and set it to your custom values.
<p style="font-size: larger; color: blue;">
IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
otherwise all SIP related room information will be lost
- </p>
+ </p>
</div><br />
<div>
Restart asterisk:
@@ -280,7 +280,7 @@ ant
<source>
<![CDATA[
red5.host=127.0.0.1 # red5 server address
-om.context=openmeetings # Openmeetings context
+om.context=openmeetings # Openmeetings context
red5.codec=asao
red5.codec.rate=22 # should correlate with mic settings in public/config.xml
sip.obproxy=127.0.0.1 # asterisk adderss
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
index e54fb2f..9581c2d 100644
--- a/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
+++ b/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml
@@ -195,7 +195,7 @@ denoise=true
[default_bridge]
type=bridge
-video_mode=follow_talker
+video_mode=follow_talker
]]>
</source>
</div><br />
@@ -220,14 +220,14 @@ write = all
</source>
</div><br />
<div>
- Update Openmeetings with creadentials for Asterisk manager.
+ Update Openmeetings with creadentials for Asterisk manager.
Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br />
find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></strong>
uncomment its parameters and set it to your custom values.
<p style="font-size: larger; color: blue;">
IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
otherwise all SIP related room information will be lost
- </p>
+ </p>
</div><br />
<div>
Restart asterisk:
@@ -266,7 +266,7 @@ ant
<source>
<![CDATA[
red5.host=127.0.0.1 # red5 server address
-om.context=openmeetings # Openmeetings context
+om.context=openmeetings # Openmeetings context
red5.codec=asao
red5.codec.rate=22 # should correlate with mic settings in public/config.xml
sip.obproxy=127.0.0.1 # asterisk adderss
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
index ed92b3b..33c6d80 100644
--- a/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
+++ b/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml
@@ -195,7 +195,7 @@ denoise=true
[default_bridge]
type=bridge
-video_mode=follow_talker
+video_mode=follow_talker
]]>
</source>
</div><br />
@@ -220,14 +220,14 @@ write = all
</source>
</div><br />
<div>
- Update OpenMeetings with credentials for Asterisk manager.
+ Update OpenMeetings with credentials for Asterisk manager.
Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br />
find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></strong>
uncomment its parameters and set it to your custom values.
<p style="font-size: larger; color: blue;">
IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore
otherwise all SIP related room information will be lost
- </p>
+ </p>
</div><br />
<div>
Restart asterisk:
@@ -262,7 +262,7 @@ mvn clean package
<source>
<![CDATA[
red5.host=127.0.0.1 # red5 server address
-om.context=openmeetings # Openmeetings context
+om.context=openmeetings # Openmeetings context
red5.codec=asao
red5.codec.rate=22 # should correlate with mic settings in public/config.xml
sip.obproxy=127.0.0.1 # asterisk adderss
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/security.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/security.xml b/openmeetings-server/src/site/xdoc/security.xml
index ce71047..be1d7f3 100644
--- a/openmeetings-server/src/site/xdoc/security.xml
+++ b/openmeetings-server/src/site/xdoc/security.xml
@@ -22,11 +22,11 @@
<body>
<section name="Security Vulnerabilities">
- <p>Please note that binary patches are not produced for individual vulnerabilities. To obtain the
- binary fix for a particular vulnerability you should upgrade to an Apache OpenMeetings version
+ <p>Please note that binary patches are not produced for individual vulnerabilities. To obtain the
+ binary fix for a particular vulnerability you should upgrade to an Apache OpenMeetings version
where that vulnerability has been fixed.<br/>
<br/>
- For more information about reporting vulnerabilities, see the
+ For more information about reporting vulnerabilities, see the
<a href="https://www.apache.org/security/">Apache Security Team</a> page.<br/>
<br/>
<a href="https://www.apache.org/security/committers.html#vulnerability-handling">Vulnerability handling guide</a>
@@ -65,7 +65,7 @@
<p>Severity: High</p>
<p>Vendor: The Apache Software Foundation</p>
<p>Versions Affected: Apache OpenMeetings 1.0.0</p>
- <p>Description: Apache Openmeetings is vulnerable to Cross-Site Request Forgery (CSRF)
+ <p>Description: Apache Openmeetings is vulnerable to Cross-Site Request Forgery (CSRF)
attacks, XSS attacks, click-jacking, and MIME based attacks<br/>
<a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7666">CVE-2017-7666</a>
</p>
@@ -188,7 +188,7 @@
<p>Severity: Moderate</p>
<p>Vendor: The Apache Software Foundation</p>
<p>Versions Affected: Apache OpenMeetings 3.1.0</p>
- <p>Description: The value of the URL's "swf" query parameter is interpolated into the JavaScript tag without
+ <p>Description: The value of the URL's "swf" query parameter is interpolated into the JavaScript tag without
being escaped, leading to the reflected XSS.<br/>
<a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-3089">CVE-2016-3089</a>
</p>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index 2c47fd6..d2a4963 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/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>