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 2018/10/03 04:35:35 UTC

[openmeetings] branch master updated: [OPENMEETINGS-1649] packaging is improved

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 fb64333  [OPENMEETINGS-1649] packaging is improved
fb64333 is described below

commit fb64333941388849952ac46dd99afc54d7ca9cff
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Oct 3 11:35:22 2018 +0700

    [OPENMEETINGS-1649] packaging is improved
---
 openmeetings-server/src/site/xdoc/installation.xml                  | 4 ++++
 .../main/java/org/apache/openmeetings/util/OMContextListener.java   | 6 ++++--
 openmeetings-web/pom.xml                                            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/installation.xml b/openmeetings-server/src/site/xdoc/installation.xml
index ddbf0de..a6b27ba 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -30,6 +30,10 @@
 				<div>
 					<h3><b>3 <i>steps</i> to install OpenMeetings</b></h3>
 					<ol class="install-steps">
+						<li class="step">
+							<div><a href="https://doc-kurento.readthedocs.io/en/stable/user/installation.html">Install Kurento Media server</a></div>
+							<div class="small"></div>
+						</li>
 						<li class="step download os">
 							<div><a href="downloads.html" rel="nofollow">Download latest .zip (.tar.gz)</a></div>
 							<div class="small">Java 8 required</div>
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 80f00ff..4f09782 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,6 +23,7 @@ import java.io.InputStream;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
+import org.apache.wicket.util.string.Strings;
 import org.slf4j.LoggerFactory;
 
 import ch.qos.logback.classic.LoggerContext;
@@ -31,12 +32,13 @@ import ch.qos.logback.core.util.StatusPrinter;
 
 public class OMContextListener implements ServletContextListener {
 	private static final String LOG_DIR_PROP = "current_openmeetings_log_dir";
+	private static final String CTX_NAME_PROP = "current_openmeetings_context_name";
 
 	@Override
 	public void contextInitialized(ServletContextEvent event) {
 		String ctx = pathToName(event);
-		System.setProperty("current_openmeetings_context_name", ctx);
-		if (System.getProperty(LOG_DIR_PROP) == null) {
+		System.setProperty(CTX_NAME_PROP, ctx);
+		if (Strings.isEmpty(System.getProperty(LOG_DIR_PROP))) {
 			System.setProperty(LOG_DIR_PROP, "logs");
 		}
 		System.setProperty("webapp.contextPath", String.format("/%s", ctx));
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index db90eeb..1033e00 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -210,7 +210,6 @@
 							<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
 							<jsSourceFiles>
 								<jsSourceFile>jquery.dialogextend.js</jsSourceFile>
-								<jsSourceFile>raw-video-util.js</jsSourceFile>
 								<jsSourceFile>raw-video.js</jsSourceFile>
 								<jsSourceFile>raw-video-manager.js</jsSourceFile>
 								<jsSourceFile>raw-room.js</jsSourceFile>
@@ -229,6 +228,7 @@
 							<charset>UTF-8</charset>
 							<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
 							<jsSourceFiles>
+								<jsSourceFile>raw-video-util.js</jsSourceFile>
 								<jsSourceFile>raw-settings.js</jsSourceFile>
 								<jsSourceFile>kurento-utils.js</jsSourceFile>
 							</jsSourceFiles>