Skip to content

Commit 33b9436

Browse files
committed
Merge branch 'master' of github.com:Red5/red5-server
2 parents cabca55 + 30ed764 commit 33b9436

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ red5-server - Red5 server core
22
===========
33

44
![TravisCI](https://travis-ci.org/Red5/red5-server.svg?branch=master)
5+
[![Maven Central](https://img.shields.io/maven-central/v/org.red5/red5-server.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.red5%22)
56
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
67

78
Red5 is an Open Source Flash Server written in Java that supports:
@@ -17,21 +18,21 @@ Red5 is an Open Source Flash Server written in Java that supports:
1718
Additional features supported via plugin:
1819

1920
* [WebSocket (ws and wss)](https://github.com/Red5/red5-websocket)
20-
* [HLS](https://github.com/Red5/red5-hls-plugin)
2121
* [RTSP (From Axis-type cameras)](https://github.com/Red5/red5-rtsp-restreamer)
22+
* [HLS](https://github.com/Red5/red5-hls-plugin)
2223

2324
The Red5 users list may be found here: [red5interest](https://groups.google.com/forum/#!forum/red5interest)
2425

2526
Subreddit: [r/red5](http://www.reddit.com/r/red5)
2627

27-
Automatic builds (Courtesy of Apache / OpenMeetings):
28+
Automatic builds (Courtesy of Apache [OpenMeetings](http://openmeetings.apache.org/)):
2829
* [Red5](https://builds.apache.org/view/M-R/view/OpenMeetings/job/Red5-server/)
2930
* [Windows Installer](https://builds.apache.org/view/M-R/view/OpenMeetings/job/red5-installer/)
3031

3132
# Releases
3233
Stable release version is [1.0.7-RELEASE](https://github.com/Red5/red5-server/releases/tag/v1.0.7-RELEASE)
3334

34-
Pre-release version is [1.0.8-M2](https://github.com/Red5/red5-server/releases/tag/v1.0.8-M2)
35+
Pre-release version is [1.0.8-M5](https://github.com/Red5/red5-server/releases/tag/v1.0.8-M5)
3536

3637
[Releases](https://github.com/Red5/red5-server/releases/latest)
3738
----------------

src/main/server/conf/context.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,19 @@
1717
1818
-->
1919
<!-- The contents of this file will be loaded for each web application -->
20-
<!--
21-
<Context processTlds="false">
22-
-->
2320
<Context>
2421
<!--
2522
Scanner https://tomcat.apache.org/tomcat-8.0-doc/config/jar-scanner.html
2623
Filter https://tomcat.apache.org/tomcat-8.0-doc/config/jar-scan-filter.html
2724
-->
2825
<JarScanner scanBootstrapClassPath="false" scanClassPath="false">
2926
<JarScanFilter
30-
defaultPluggabilityScan="false"
27+
defaultPluggabilityScan="true"
3128
pluggabilityScan="${tomcat.util.scan.StandardJarScanFilter.jarsToScan}"
3229
defaultTldScan="false"
3330
tldScan="${tomcat.util.scan.StandardJarScanFilter.jarsToScan}"/>
3431
</JarScanner>
3532
<!-- Default set of monitored resources -->
3633
<WatchedResource>WEB-INF/web.xml</WatchedResource>
3734
<WatchedResource>META-INF/context.xml</WatchedResource>
38-
<!-- <Loader loaderClass="org.red5.server.tomcat.WebappClassLoader" useSystemClassLoaderAsParent="false" /> -->
39-
</Context>
35+
</Context>

0 commit comments

Comments
 (0)