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 1f02d02 [OPENMEETINGS-1850] packaging seems to be fixed
1f02d02 is described below
commit 1f02d02b696824b08cf22a8c36952554977b169b
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Mar 19 12:51:39 2018 +0700
[OPENMEETINGS-1850] packaging seems to be fixed
---
openmeetings-server/pom.xml | 4 +-
.../src/main/assembly/{root => ROOT}/index.html | 0
.../src/main/assembly/components/all.xml | 226 +++------------------
.../src/main/assembly/conf/server.xml | 137 +++++++++++++
.../src/main/assembly/root/crossdomain.xml | 20 --
.../src/main/assembly/scripts/admin.bat | 4 +-
.../src/main/assembly/scripts/admin.sh | 4 +-
openmeetings-server/src/main/assembly/site.xml | 9 -
openmeetings-server/src/main/assembly/src.xml | 3 +-
.../src/site/xdoc/GetVersionInfo.xml | 2 +-
.../src/site/xdoc/JVMPerformanceTuning.xml | 2 +-
openmeetings-server/src/site/xdoc/installation.xml | 2 +-
.../openmeetings/util/OMContextListener.java | 2 +-
pom.xml | 6 -
14 files changed, 175 insertions(+), 246 deletions(-)
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 49b05fb..08c6fac 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -30,7 +30,7 @@
<name>Openmeetings Server</name>
<description>Module for OpenMeetings server assembly</description>
<properties>
- <server.dir>${project.build.directory}/web-server</server.dir>
+
<server.dir>${project.build.directory}/apache-tomcat-${tomcat.version}</server.dir>
<languages.dir>../openmeetings-web/src/main/java/org/apache/openmeetings/web/app</languages.dir>
<assembly.finalName>apache-openmeetings-${project.version}</assembly.finalName>
<assembly.descriptor>server</assembly.descriptor>
@@ -38,7 +38,7 @@
<dist.webapps>${dist.dir}/webapps</dist.webapps>
<dist.om.dir>${dist.webapps}/openmeetings</dist.om.dir>
<om.webapp>webapps/openmeetings</om.webapp>
- <root.webapp>webapps/root</root.webapp>
+ <root.webapp>webapps/ROOT</root.webapp>
<server-file.dir>web-server</server-file.dir>
</properties>
<url>http://openmeetings.apache.org</url>
diff --git a/openmeetings-server/src/main/assembly/root/index.html
b/openmeetings-server/src/main/assembly/ROOT/index.html
similarity index 100%
rename from openmeetings-server/src/main/assembly/root/index.html
rename to openmeetings-server/src/main/assembly/ROOT/index.html
diff --git a/openmeetings-server/src/main/assembly/components/all.xml
b/openmeetings-server/src/main/assembly/components/all.xml
index a4f6ca0..9b90ace 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -24,35 +24,14 @@
<directory>${server.dir}</directory>
<outputDirectory></outputDirectory>
<excludes>
- <exclude>webapps/installer/**</exclude>
- <exclude>webapps/live/**</exclude>
- <exclude>webapps/vod/**</exclude>
- <exclude>webapps/oflaDemo/**</exclude>
- <exclude>webapps/chat/**</exclude>
- <exclude>webapps/root/demos/**</exclude>
- <exclude>webapps/root/crossdomain.xml</exclude>
- <exclude>webapps/root/favicon.ico</exclude>
- <exclude>webapps/root/index.html</exclude>
- <exclude>lib/commons-io*.jar</exclude>
- <exclude>lib/commons-lang3*</exclude>
- <exclude>lib/spring*.jar</exclude>
- <!-- Tika related jars are in lib folder-->
- <exclude>lib/apache-mime4j*</exclude>
- <exclude>lib/boilerpipe*</exclude>
- <exclude>lib/jempbox*</exclude>
- <exclude>lib/juniversalchardet*</exclude>
- <exclude>lib/mchange-commons*</exclude>
- <exclude>lib/metadata-extractor*</exclude>
- <exclude>lib/pdfbox*</exclude>
- <exclude>lib/rome*</exclude>
- <exclude>lib/tagsoup*</exclude>
- <exclude>lib/tika*</exclude>
- <!-- end of Tika libs -->
- <exclude>plugins/websocket*.jar</exclude>
- <exclude>plugins/tomcat-embed*.jar</exclude>
<!-- added for Red5 lib substitution -->
- <exclude>plugins/ecj*.jar</exclude> <!-- added
for Red5 lib substitution -->
- <exclude>*.sh</exclude>
- <exclude>conf/jee-container.xml</exclude>
+ <exclude>bin/*.sh</exclude>
+ <exclude>conf/server.xml</exclude>
+ <exclude>conf/tomcat-users*</exclude>
+ <exclude>webapps/docs/**</exclude>
+ <exclude>webapps/examples/**</exclude>
+ <exclude>webapps/host-manager/**</exclude>
+ <exclude>webapps/manager/**</exclude>
+ <exclude>webapps/ROOT/**</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -64,19 +43,27 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/assembly/scripts</directory>
- <outputDirectory></outputDirectory>
+ <directory>${server.dir}/bin</directory>
+ <outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
+ <includes>
+ <include>*.sh</include>
+ </includes>
</fileSet>
<fileSet>
- <directory>src/main/assembly/root</directory>
- <outputDirectory>${root.webapp}</outputDirectory>
+ <directory>src/main/assembly/scripts</directory>
+ <outputDirectory></outputDirectory>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>src/main/assembly/conf</directory>
<outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
+ <directory>src/main/assembly/ROOT</directory>
+ <outputDirectory>${root.webapp}</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>${project.parent.basedir}/openmeetings-screenshare/target/jnlp</directory>
<outputDirectory>${om.webapp}/screenshare</outputDirectory>
<excludes>
@@ -92,16 +79,6 @@
</includes>
</fileSet>
<fileSet>
-
<directory>${project.parent.basedir}/openmeetings-flash/target</directory>
- <outputDirectory>${om.webapp}/public</outputDirectory>
- <includes>
- <include>*.swf</include>
- </includes>
- <excludes>
- <exclude>openmeetings-flash-*.swf</exclude>
- </excludes>
- </fileSet>
- <fileSet>
<directory>${project.parent.basedir}</directory>
<outputDirectory></outputDirectory>
<includes>
@@ -112,6 +89,13 @@
</includes>
</fileSet>
<fileSet>
+
<directory>${project.parent.basedir}/openmeetings-web/src/test/resources</directory>
+ <outputDirectory>conf</outputDirectory>
+ <includes>
+ <include>keystore</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/public</directory>
<outputDirectory>${root.webapp}</outputDirectory>
<includes>
@@ -123,87 +107,6 @@
<outputDirectory>${om.webapp}</outputDirectory>
<excludes>
<exclude>META-INF/**</exclude>
- <exclude>WEB-INF/classes/META-INF/**</exclude>
- <exclude>WEB-INF/lib/asm*</exclude>
- <exclude>WEB-INF/lib/aopalliance*</exclude>
- <exclude>WEB-INF/lib/bcprov-*</exclude>
- <exclude>WEB-INF/lib/cglib-nodep*</exclude>
- <exclude>WEB-INF/lib/jcl-over-slf4j*</exclude>
- <exclude>WEB-INF/lib/jul-to-slf4j*</exclude>
- <exclude>WEB-INF/lib/slf4j-*</exclude>
- <exclude>WEB-INF/lib/ecj-*</exclude> <!-- added
for Red5 lib substitution -->
- <exclude>WEB-INF/lib/tomcat-*</exclude>
- <exclude>WEB-INF/lib/spring-*</exclude>
- <exclude>WEB-INF/lib/mina-core-*</exclude>
- <exclude>WEB-INF/lib/geronimo-jpa*</exclude>
-
<exclude>WEB-INF/lib/commons-fileupload*</exclude>
- <exclude>WEB-INF/lib/commons-io*</exclude>
- <exclude>WEB-INF/lib/commons-codec*</exclude>
-
<exclude>WEB-INF/lib/commons-collections-*</exclude>
- <exclude>WEB-INF/lib/commons-lang3*</exclude>
- <exclude>WEB-INF/lib/commons-compress*</exclude>
- <exclude>WEB-INF/lib/httpclient*</exclude>
- <exclude>WEB-INF/lib/httpcore*</exclude>
- <exclude>WEB-INF/lib/xmpcore*</exclude>
- <exclude>WEB-INF/lib/quartz*</exclude>
- <!-- Tika related jars are in lib folder -->
- <exclude>WEB-INF/lib/apache-mime4j*</exclude>
- <exclude>WEB-INF/lib/boilerpipe*</exclude>
- <exclude>WEB-INF/lib/ehcache-core*</exclude>
- <exclude>WEB-INF/lib/jempbox*</exclude>
-
<exclude>WEB-INF/lib/juniversalchardet*</exclude>
- <exclude>WEB-INF/lib/mchange-commons*</exclude>
-
<exclude>WEB-INF/lib/metadata-extractor*</exclude>
- <exclude>WEB-INF/lib/pdfbox*</exclude>
- <exclude>WEB-INF/lib/rome*</exclude>
- <exclude>WEB-INF/lib/tagsoup*</exclude>
- <exclude>WEB-INF/lib/tika*</exclude>
-
<exclude>WEB-INF/lib/animal-sniffer-annotations*</exclude>
- <exclude>WEB-INF/lib/bcmail-*</exclude>
- <exclude>WEB-INF/lib/bcpkix-*</exclude>
- <exclude>WEB-INF/lib/bzip2-*</exclude>
- <exclude>WEB-INF/lib/cdm-*</exclude>
- <exclude>WEB-INF/lib/commons-csv-*</exclude>
- <exclude>WEB-INF/lib/commons-exec-*</exclude>
- <exclude>WEB-INF/lib/commons-vfs2-*</exclude>
- <exclude>WEB-INF/lib/curvesapi-*</exclude>
-
<exclude>WEB-INF/lib/error_prone_annotations-*</exclude>
- <exclude>WEB-INF/lib/geoapi-*</exclude>
- <exclude>WEB-INF/lib/grib-*</exclude>
- <exclude>WEB-INF/lib/guava-*</exclude>
- <exclude>WEB-INF/lib/httpmime-*</exclude>
- <exclude>WEB-INF/lib/httpservices-*</exclude>
- <exclude>WEB-INF/lib/isoparser-*</exclude>
-
<exclude>WEB-INF/lib/j2objc-annotations-*</exclude>
- <exclude>WEB-INF/lib/jackcess-*</exclude>
- <exclude>WEB-INF/lib/jackson-core-*</exclude>
- <exclude>WEB-INF/lib/java-libpst-*</exclude>
-
<exclude>WEB-INF/lib/jcip-annotations-*</exclude>
- <exclude>WEB-INF/lib/jcommander-*</exclude>
- <exclude>WEB-INF/lib/jdom2-*</exclude>
- <exclude>WEB-INF/lib/jhighlight-*</exclude>
- <exclude>WEB-INF/lib/jmatio-*</exclude>
- <exclude>WEB-INF/lib/jna-*</exclude>
- <exclude>WEB-INF/lib/joda-time-*</exclude>
- <exclude>WEB-INF/lib/json-*</exclude>
- <exclude>WEB-INF/lib/json-simple-*</exclude>
- <exclude>WEB-INF/lib/jsoup-*</exclude>
- <exclude>WEB-INF/lib/jsr-275-*</exclude>
- <exclude>WEB-INF/lib/jsr305-*</exclude>
- <exclude>WEB-INF/lib/junrar-*</exclude>
- <exclude>WEB-INF/lib/maven-scm-*</exclude>
- <exclude>WEB-INF/lib/netcdf4-*</exclude>
- <exclude>WEB-INF/lib/opennlp-tools-*</exclude>
- <exclude>WEB-INF/lib/plexus-utils-*</exclude>
- <exclude>WEB-INF/lib/poi-*</exclude>
- <exclude>WEB-INF/lib/protobuf-java-*</exclude>
- <exclude>WEB-INF/lib/regexp-*</exclude>
-
<exclude>WEB-INF/lib/sentiment-analysis-parser-*</exclude>
- <exclude>WEB-INF/lib/sis-*</exclude>
- <exclude>WEB-INF/lib/udunits-*</exclude>
- <exclude>WEB-INF/lib/vorbis-java-*</exclude>
- <exclude>WEB-INF/lib/xmlbeans-*</exclude>
- <exclude>WEB-INF/lib/xz-*</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -215,81 +118,6 @@
</includes>
</fileSet>
<fileSet>
-
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>spring-*</include>
- <include>geronimo-jpa*</include>
- <include>commons-fileupload*</include>
- <include>commons-io*</include>
- <include>commons-lang3*</include>
- <!-- Tika related jars are in lib folder -->
- <include>apache-mime4j*</include>
- <include>boilerpipe*</include>
- <include>jempbox*</include>
- <include>juniversalchardet*</include>
- <include>mchange-commons*</include>
- <include>metadata-extractor*</include>
- <include>pdfbox*</include>
- <include>rome*</include>
- <include>tagsoup*</include>
- <include>tika*</include>
- <include>bcmail-*</include>
- <include>bcpkix-*</include>
- <include>bzip2-*</include>
- <include>cdm-*</include>
- <include>commons-csv-*</include>
- <include>commons-exec-*</include>
- <include>commons-vfs2-*</include>
- <include>curvesapi-*</include>
- <include>error_prone_annotations-*</include>
- <include>geoapi-*</include>
- <include>grib-*</include>
- <include>guava-*</include>
- <include>httpmime-*</include>
- <include>httpservices-*</include>
- <include>isoparser-*</include>
- <include>j2objc-annotations-*</include>
- <include>jackcess-*</include>
- <include>jackson-core-*</include>
- <include>java-libpst-*</include>
- <include>jcip-annotations-*</include>
- <include>jcommander-*</include>
- <include>jdom2-*</include>
- <include>jhighlight-*</include>
- <include>jmatio-*</include>
- <include>jna-*</include>
- <include>joda-time-*</include>
- <include>json-*</include>
- <include>json-simple-*</include>
- <include>jsoup-*</include>
- <include>jsr-275-*</include>
- <include>jsr305-*</include>
- <include>junrar-*</include>
- <include>maven-scm-*</include>
- <include>netcdf4-*</include>
- <include>opennlp-tools-*</include>
- <include>plexus-utils-*</include>
- <include>poi-*</include>
- <include>protobuf-java-*</include>
- <include>regexp-*</include>
- <include>sentiment-analysis-parser-*</include>
- <include>sis-*</include>
- <include>udunits-*</include>
- <include>vorbis-java-*</include>
- <include>xmlbeans-*</include>
- <include>xz-*</include>
- </includes>
- </fileSet>
- <fileSet>
-
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/lib</directory>
- <outputDirectory>plugins</outputDirectory>
- <includes>
- <include>ecj-*</include> <!-- added for Red5
lib substitution -->
- <include>tomcat-*</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>target/site</directory>
<outputDirectory>${om.webapp}/docs</outputDirectory>
</fileSet>
diff --git a/openmeetings-server/src/main/assembly/conf/server.xml
b/openmeetings-server/src/main/assembly/conf/server.xml
new file mode 100644
index 0000000..f5a1f2a
--- /dev/null
+++ b/openmeetings-server/src/main/assembly/conf/server.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+ <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+ <!-- Security listener. Documentation at /docs/config/listeners.html
+ <Listener className="org.apache.catalina.security.SecurityListener" />
+ -->
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener
className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina">
+
+ <!--The connectors can use a shared executor, you can define one or more
named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="5080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="5443" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="5080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="5443" />
+ -->
+ <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+ This connector uses the NIO implementation. The default
+ SSLImplementation will depend on the presence of the APR/native
+ library and the useOpenSSL attribute of the
+ AprLifecycleListener.
+ Either JSSE or OpenSSL style configuration may be used regardless of
+ the SSLImplementation selected. JSSE style configuration is used
below.
+ -->
+ <Connector port="5443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
+ maxThreads="150" SSLEnabled="true"
+ keystoreFile="conf/keystore" keystorePass="openmeetings"
+ clientAuth="false" sslProtocol="TLS"/>
+ <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+ This connector uses the APR/native implementation which always uses
+ OpenSSL for TLS.
+ Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+ configuration is used below.
+ -->
+ <!--
+ <Connector port="5443"
protocol="org.apache.coyote.http11.Http11AprProtocol"
+ maxThreads="150" SSLEnabled="true" >
+ <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+ <SSLHostConfig>
+ <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+ certificateFile="conf/localhost-rsa-cert.pem"
+ certificateChainFile="conf/localhost-rsa-chain.pem"
+ type="RSA" />
+ </SSLHostConfig>
+ </Connector>
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="5443" />
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="false" autoDeploy="true">
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
directory="logs"
+ prefix="localhost_access_log" suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b" />
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
diff --git a/openmeetings-server/src/main/assembly/root/crossdomain.xml
b/openmeetings-server/src/main/assembly/root/crossdomain.xml
deleted file mode 100644
index 2129c67..0000000
--- a/openmeetings-server/src/main/assembly/root/crossdomain.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file 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.
--->
-<!DOCTYPE cross-domain-policy SYSTEM
"http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd";>
-<cross-domain-policy>
-</cross-domain-policy>
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.bat
b/openmeetings-server/src/main/assembly/scripts/admin.bat
index 340b2f9..b5ee98c 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.bat
+++ b/openmeetings-server/src/main/assembly/scripts/admin.bat
@@ -15,7 +15,7 @@ REM #############################################
set RED5_HOME=%~dp0
set OM_CONTEXT=openmeetings
-set
CLASSPATH=%RED5_HOME%\*;%RED5_HOME%\conf;%RED5_HOME%\plugins\*;%RED5_HOME%\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\classes
+set
CLASSPATH=%RED5_HOME%\*;%RED5_HOME%\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\classes
-java -cp "%CLASSPATH%" -Dred5_home=%RED5_HOME% -Dcontext=%OM_CONTEXT%
-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector
org.apache.openmeetings.cli.Admin %*
+java -cp "%CLASSPATH%" -Dred5_home=%RED5_HOME% -Dcontext=%OM_CONTEXT%
org.apache.openmeetings.cli.Admin %*
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.sh
b/openmeetings-server/src/main/assembly/scripts/admin.sh
index 6868099..593aad1 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.sh
+++ b/openmeetings-server/src/main/assembly/scripts/admin.sh
@@ -15,7 +15,7 @@
export RED5_HOME=$(cd $(dirname "$0"); pwd)
export OM_CONTEXT=openmeetings
-export
CLASSPATH=$RED5_HOME/*:$RED5_HOME/conf:$RED5_HOME/plugins/*:$RED5_HOME/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/classes
+export
CLASSPATH=$RED5_HOME/*:$RED5_HOME/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/classes
-java -cp "$CLASSPATH" -Dred5_home=${RED5_HOME} -Dcontext=${OM_CONTEXT}
-Dlogback.ContextSelector=org.red5.logging.LoggingContextSelector
org.apache.openmeetings.cli.Admin $*
+java -cp "$CLASSPATH" -Dred5_home=${RED5_HOME} -Dcontext=${OM_CONTEXT}
org.apache.openmeetings.cli.Admin $*
diff --git a/openmeetings-server/src/main/assembly/site.xml
b/openmeetings-server/src/main/assembly/site.xml
index 6454a33..036d8bd 100644
--- a/openmeetings-server/src/main/assembly/site.xml
+++ b/openmeetings-server/src/main/assembly/site.xml
@@ -44,15 +44,6 @@
</excludes>
</fileSet>
<fileSet>
-
<directory>${project.parent.basedir}/openmeetings-flash/target/site</directory>
- <outputDirectory>openmeetings-flash</outputDirectory>
- <excludes>
- <exclude>javadoc.sh</exclude>
- <exclude>options</exclude>
- <exclude>packages</exclude>
- </excludes>
- </fileSet>
- <fileSet>
<directory>${project.parent.basedir}/openmeetings-install/target/site</directory>
<outputDirectory>openmeetings-install</outputDirectory>
<excludes>
diff --git a/openmeetings-server/src/main/assembly/src.xml
b/openmeetings-server/src/main/assembly/src.xml
index 210746a..af45104 100644
--- a/openmeetings-server/src/main/assembly/src.xml
+++ b/openmeetings-server/src/main/assembly/src.xml
@@ -40,8 +40,7 @@
</includes>
<excludes>
<exclude>**/openmeetings-*/target/**</exclude>
-
<exclude>openmeetings-flash/openlaszlo/**</exclude>
-
<exclude>openmeetings-server/red5-server/**</exclude>
+
<exclude>openmeetings-server/web-server/**</exclude>
<exclude>openmeetings-web/test-data/**</exclude>
<exclude>**/.classpath/**</exclude>
<exclude>**/.project/**</exclude>
diff --git a/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
b/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
index 20db886..9d047e5 100644
--- a/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
+++ b/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
@@ -29,7 +29,7 @@
<p>The version is printed into openmeetings.log file</p>
<p>
Run openmeetings<br/>
- Open OM_HOME/log/openmeetings.log
+ Open OM_HOME/logs/openmeetings.log
</p>
<p>You get something like this: </p>
<source>
diff --git a/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
b/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
index 2e36b81..82c819b 100644
--- a/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
+++ b/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
@@ -42,7 +42,7 @@ export JAVA_OPTS="-Xrs -Xms512M -Xmx1024M -Xss128K
-XX:NewSize=256m \
# start Red5
echo "Setting Hi Performance Options"
-exec $RED5_HOME/red5.sh >> $RED5_HOME/log/jvm.stdout 2>&1 &
+exec $RED5_HOME/red5.sh >> $RED5_HOME/logs/jvm.stdout 2>&1 &
]]>
</source>
diff --git a/openmeetings-server/src/site/xdoc/installation.xml
b/openmeetings-server/src/site/xdoc/installation.xml
index a637ce9..b05a18b 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -259,7 +259,7 @@
then access your OM installation
</li>
<li>If you have Problems with conversion-jobs
check your openmeetings log
- output (available at
<tt>$RED5_HOME/log/openmeetings.log</tt>). There will be error Messages which
help you. You must
+ output (available at
<tt>$RED5_HOME/logs/openmeetings.log</tt>). There will be error Messages which
help you. You must
install OpenOffice, ImageMagick and
GhostScript to run
all conversion-Jobs correctly.
</li>
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 6ca2c90..80f00ff 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
@@ -37,7 +37,7 @@ public class OMContextListener implements
ServletContextListener {
String ctx = pathToName(event);
System.setProperty("current_openmeetings_context_name", ctx);
if (System.getProperty(LOG_DIR_PROP) == null) {
- System.setProperty(LOG_DIR_PROP, "log");
+ System.setProperty(LOG_DIR_PROP, "logs");
}
System.setProperty("webapp.contextPath", String.format("/%s",
ctx));
LoggerContext context =
(LoggerContext)LoggerFactory.getILoggerFactory();
diff --git a/pom.xml b/pom.xml
index 3e9487d..3759e21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -591,12 +591,6 @@
</dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
- <artifactId>openmeetings-flash</artifactId>
- <version>${project.version}</version>
- <type>swf</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-install</artifactId>
<version>${project.version}</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
[email protected].
