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 2019/04/03 13:37:16 UTC

[openmeetings] branch master updated: no jira: links are corrected

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 69c9570  no jira: links are corrected
69c9570 is described below

commit 69c957020c1628a181ce8ddd5e879ded21638eda
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 3 20:37:03 2019 +0700

    no jira: links are corrected
---
 KEYS                                               |  2 +-
 README.md                                          | 28 ++++++++++++----------
 .../installation/InstallationConfig.java           |  4 ++--
 openmeetings-server/src/site/xdoc/ReleaseGuide.xml |  6 ++---
 .../web/app/Application_ja.properties.xml          |  2 +-
 pom.xml                                            | 18 +++++++-------
 6 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/KEYS b/KEYS
index 2629662..af6c431 100644
--- a/KEYS
+++ b/KEYS
@@ -1,7 +1,7 @@
 Edit this file in Git at:
 https://github.com/apache/openmeetings.git
 then include in the release as described here:
-http://openmeetings.apache.org/ReleaseGuide.html
+https://openmeetings.apache.org/ReleaseGuide.html
 
 pub   2048R/93A30395 2011-12-20
       Key fingerprint = BF13 CF11 F9C9 0CBE 4413  09AB 0055 16BF 93A3 0395
diff --git a/README.md b/README.md
index f004ac0..6700f5e 100644
--- a/README.md
+++ b/README.md
@@ -5,19 +5,21 @@
  - [x] **instant messaging**
  - [x] **white board**
  - [x] **collaborative document editing**
- - [x] **other groupware tools** using API functions of the [Red5 Streaming Server](http://red5.org/) for Remoting and Streaming. 
+ - [x] **other groupware tools**
+
+It uses API functions of Media Server for Remoting and Streaming ([Red5](http://red5.org/) or [Kurento](https://www.kurento.org)).
 
 Getting Started
 ===============
 Please visit the project website for the latest information:
-  - http://openmeetings.apache.org/
+  - https://openmeetings.apache.org/
     
 Documentation for Installation and Upgrade:
-  - http://openmeetings.apache.org/installation.html
-  - http://openmeetings.apache.org/Upgrade.html
+  - https://openmeetings.apache.org/installation.html
+  - https://openmeetings.apache.org/Upgrade.html
 
 Along with the developer mailing list archive:
-  - http://openmeetings.apache.org/mail-lists.html
+  - https://openmeetings.apache.org/mail-lists.html
     
     
 System Requirements
@@ -38,9 +40,9 @@ To build from source code:
     - go to `openmeetings-server/target` directory
     - extract `apache-openmeetings-x.x.x.tar.gz` (or `apache-openmeetings-x.x.x.zip` for windows) to **new** directory
     - enter to this new directory and execute `red5.sh` (`red5.bat` for windows)
-    
+
 For a detailed documentation on how to build from source and options see:
-    http://openmeetings.apache.org/BuildInstructions.html
+    https://openmeetings.apache.org/BuildInstructions.html
 
 Release Notes 
 =============
@@ -61,7 +63,7 @@ Some other fixes and improvements, 30 issues were addressed
 
 4.0.8
 -----
-[Release 4.0.8](https://www.apache.org/dyn/closer.lua/openmeetings/4.0.8), provides following improvements:
+[Release 4.0.8](https://archive.apache.org/dist/openmeetings/4.0.8), provides following improvements:
 
 Mobile client:
 * Mobile clients are displayed in user list
@@ -90,7 +92,7 @@ Other fixes and improvements, 30 issues were addressed
 
 4.0.7
 -----
-[Release 4.0.7](https://www.apache.org/dyn/closer.lua/openmeetings/4.0.7), provides following improvements:
+[Release 4.0.7](https://archive.apache.org/dist/openmeetings/4.0.7), provides following improvements:
 
 * kick function in RoomWebService is fixed
 * Reply button is added to Private Message
@@ -110,7 +112,7 @@ Other fixes and improvements, 18 issues were addressed
 
 4.0.6
 -----
-[Release 4.0.6](https://www.apache.org/dyn/closer.lua/openmeetings/4.0.6), provides following improvements:
+[Release 4.0.6](https://archive.apache.org/dist/openmeetings/4.0.6), provides following improvements:
 
 * Multiple issues with device list retrieval in Settings dialog
 * Web services were improved
@@ -122,7 +124,7 @@ Other fixes and improvements, 16 issues were addressed
 
 4.0.5
 -----
-[Release 4.0.5](https://www.apache.org/dyn/closer.lua/openmeetings/4.0.5), provides following improvements:
+[Release 4.0.5](https://archive.apache.org/dist/openmeetings/4.0.5), provides following improvements:
 
 Room:
 * Interview room is improved: re-designed, multiple video windows are supported
@@ -134,7 +136,7 @@ Other fixes and improvements, 24 issues were addressed
 
 4.0.4
 -----
-[Release 4.0.4](https://www.apache.org/dyn/closer.lua/openmeetings/4.0.4), provides following improvements:
+[Release 4.0.4](https://archive.apache.org/dist/openmeetings/4.0.4), provides following improvements:
 
 The purpose of this release is to provide GDPR compatible version of OpenMeetings
 
@@ -147,7 +149,7 @@ Other fixes and improvements, 9 issues were fixed
 
 4.0.3
 -----
-[Release 4.0.3](https://www.apache.org/dyn/closer.lua/openmeetings/4.0.3), provides following improvements:
+[Release 4.0.3](https://archive.apache.org/dist/openmeetings/4.0.3), provides following improvements:
 
 Security fix in Calendar
 
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
index a8d41aa..8c3f491 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
@@ -56,8 +56,8 @@ public class InstallationConfig implements Serializable {
 
 	private int defaultLangId = 1;
 	private boolean sendEmailAtRegister = false;
-	private String urlFeed = "http://mail-archives.apache.org/mod_mbox/openmeetings-user/?format=atom";
-	private String urlFeed2 = "http://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";
+	private String urlFeed = "https://mail-archives.apache.org/mod_mbox/openmeetings-user/?format=atom";
+	private String urlFeed2 = "https://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";
 	private boolean sendEmailWithVerficationCode = false;
 	private boolean sipEnable = false;
 	private String sipRoomPrefix = "400";
diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
index 370589b..01da710 100644
--- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
+++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
@@ -186,14 +186,14 @@ git push origin 4.0.0
 					Send an email to the developer mailing list with the subject line:<br />
 					[VOTE] Apache OpenMeetings x.xx release<br />
 					An example for such an email:
-					<a href="http://mail-archives.apache.org/mod_mbox/openmeetings-dev/201701.mbox/%3CCAJmbs8jZ7EiXoeBbG4ynvg30FPx2nAOJMypE2Qp-v-c63ayO9A%40mail.gmail.com%3E">example Vote email</a>
-					<a href="http://s.apache.org/vote-2.0.0RC4">example Vote email (Incubator)</a>
+					<a href="https://mail-archives.apache.org/mod_mbox/openmeetings-dev/201701.mbox/%3CCAJmbs8jZ7EiXoeBbG4ynvg30FPx2nAOJMypE2Qp-v-c63ayO9A%40mail.gmail.com%3E">example Vote email</a>
+					<a href="https://s.apache.org/vote-2.0.0RC4">example Vote email (Incubator)</a>
 					<br />
 					After the vote is over, send a "RESULT" email to the list with the subject line:<br />
 					[RESULT][VOTE] Apache OpenMeetings x.xx release<br />
 					An example for such an email:
 					<a
-						href="http://mail-archives.apache.org/mod_mbox/openmeetings-dev/201701.mbox/%3CCAJmbs8gyvHuarzdVma%2BF6ap7RHBhhVciZp5Oi5JogQdLR6o0NA%40mail.gmail.com%3E">example Result email</a>
+						href="https://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
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 a87150f..e473851 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
@@ -141,7 +141,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="277"><![CDATA[ニュース]]></entry>
 	<entry key="281"><![CDATA[ヘルプ・サポート]]></entry>
 	<entry key="282"><![CDATA[https://openmeetings.apache.org/]]></entry>
-	<entry key="283"><![CDATA[http://mail-archives.apache.org/mod_mbox/openmeetings-user/]]></entry>
+	<entry key="283"><![CDATA[https://openmeetings.apache.org/mailing-lists.html]]></entry>
 	<entry key="284"><![CDATA[バグ報告]]></entry>
 	<entry key="286"><![CDATA[プロジェクトWebサイト]]></entry>
 	<entry key="287"><![CDATA[ユーザーメーリングリスト]]></entry>
diff --git a/pom.xml b/pom.xml
index 246c204..7026478 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,9 +324,9 @@
 			<post>mailto:user@openmeetings.apache.org</post>
 			<subscribe>mailto:user-subscribe@openmeetings.apache.org</subscribe>
 			<unsubscribe>mailto:user-unsubscribe@openmeetings.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/openmeetings-user</archive>
+			<archive>https://mail-archives.apache.org/mod_mbox/openmeetings-user</archive>
 			<otherArchives>
-				<otherArchive>http://openmeetings.markmail.org</otherArchive>
+				<otherArchive>https://openmeetings.markmail.org</otherArchive>
 			</otherArchives>
 		</mailingList>
 		<mailingList>
@@ -334,9 +334,9 @@
 			<post>mailto:user-espanol@openmeetings.apache.org</post>
 			<subscribe>mailto:user-espanol-subscribe@openmeetings.apache.org</subscribe>
 			<unsubscribe>mailto:user-espanol-unsubscribe@openmeetings.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/openmeetings-user-espanol</archive>
+			<archive>https://mail-archives.apache.org/mod_mbox/openmeetings-user-espanol</archive>
 			<otherArchives>
-				<otherArchive>http://openmeetings.markmail.org</otherArchive>
+				<otherArchive>https://openmeetings.markmail.org</otherArchive>
 			</otherArchives>
 		</mailingList>
 		<mailingList>
@@ -344,9 +344,9 @@
 			<post>mailto:user-russian@openmeetings.apache.org</post>
 			<subscribe>mailto:user-russian-subscribe@openmeetings.apache.org</subscribe>
 			<unsubscribe>mailto:user-russian-unsubscribe@openmeetings.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/openmeetings-user-russian</archive>
+			<archive>https://mail-archives.apache.org/mod_mbox/openmeetings-user-russian</archive>
 			<otherArchives>
-				<otherArchive>http://openmeetings.markmail.org</otherArchive>
+				<otherArchive>https://openmeetings.markmail.org</otherArchive>
 			</otherArchives>
 		</mailingList>
 		<mailingList>
@@ -354,16 +354,16 @@
 			<post>mailto:dev@openmeetings.apache.org</post>
 			<subscribe>mailto:dev-subscribe@openmeetings.apache.org</subscribe>
 			<unsubscribe>mailto:dev-unsubscribe@openmeetings.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/openmeetings-dev</archive>
+			<archive>https://mail-archives.apache.org/mod_mbox/openmeetings-dev</archive>
 			<otherArchives>
-				<otherArchive>http://openmeetings.markmail.org</otherArchive>
+				<otherArchive>https://openmeetings.markmail.org</otherArchive>
 			</otherArchives>
 		</mailingList>
 		<mailingList>
 			<name>Commits List</name>
 			<subscribe>mailto:commits-subscribe@openmeetings.apache.org</subscribe>
 			<unsubscribe>mailto:commits-unsubscribe@openmeetings.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/openmeetings-commits/</archive>
+			<archive>https://mail-archives.apache.org/mod_mbox/openmeetings-commits/</archive>
 		</mailingList>
 		<mailingList>
 			<name>Security List</name>