Author: solomax
Date: Tue Aug 5 18:21:41 2014
New Revision: 1615971
URL: http://svn.apache.org/r1615971
Log:
[OPENMEETINGS-1028] red5 is updated to latest release; code clean-up
Modified:
openmeetings/branches/3.0.x/.classpath
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
Modified: openmeetings/branches/3.0.x/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/.classpath?rev=1615971&r1=1615970&r2=1615971&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/.classpath (original)
+++ openmeetings/branches/3.0.x/.classpath Tue Aug 5 18:21:41 2014
@@ -58,7 +58,7 @@
<classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-test-4.0.6.RELEASE.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/commons-pool-1.5.6.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/ehcache-core-2.5.0.jar"/>
- <classpathentry kind="lib"
path="build/red5/server/dist/plugins/tomcat-embed-core-7.0.50.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/plugins/tomcat-embed-core.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/bcprov-jdk15on-1.50.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/cglib-nodep-2.2.2.jar"/>
<classpathentry kind="lib"
path="build/red5/client/dist/red5-client-jar-1.0.2-RC2.jar"/>
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1615971&r1=1615970&r2=1615971&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Tue Aug 5 18:21:41 2014
@@ -1174,7 +1174,7 @@
<target name="-retrieve-red5-server" unless="red5.server.installed"
description="Retrieves the libraries if needed"
depends="-ant-task,-maven-task,-jgit-task">
<!-- Needs an empty dir to checkout to -->
<delete dir="${red5.server.dir}"></delete>
- <git-clone uri="https://github.com/Red5/red5-server.git";
dest="${red5.server.dir}"/><!-- branch="v${red5.server.version}" -->
+ <git-clone uri="https://github.com/Red5/red5-server.git";
dest="${red5.server.dir}" branch="v${red5.server.version}"/>
<artifact:mvn pom="${red5.server.dir}/pom.xml"
mavenVersion="${maven.version}" fork="true" dir="${red5.server.dir}">
<jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
<!--jvmarg value="-Dassembly.skipAssembly=true" /-->
@@ -1192,6 +1192,7 @@
<delete dir="${red5.lib}/webapps/installer" />
<delete dir="${red5.lib}/webapps/live" />
<delete dir="${red5.lib}/webapps/vod" />
+ <delete dir="${red5.lib}/webapps/chat" />
<copy file="${webcontent.base.dir}/red5/index.html"
todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
<fileset dir="${webcontent.base.dir}/red5"
includes="red5*,admin.*,network_test.sh"/>
Modified:
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java?rev=1615971&r1=1615970&r2=1615971&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
(original)
+++
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
Tue Aug 5 18:21:41 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.doc;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.FileWriter;
import java.util.ArrayList;
@@ -26,6 +28,8 @@ import java.util.Map;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.RootDoc;
@@ -33,6 +37,8 @@ import com.sun.javadoc.Tag;
import com.sun.tools.doclets.standard.Standard;
public class WebServiceDoclet extends Standard {
+ private static final Logger log =
Red5LoggerFactory.getLogger(WebServiceDoclet.class, webAppRootKey);
+
static final String baseTemplatePath = "xdocs";
static final String basePath = "docs";
static final String templateName = "ApiMethodsTemplate.vm";
@@ -98,7 +104,7 @@ public class WebServiceDoclet extends St
} catch (Exception err) {
- err.printStackTrace();
+ log.error("[start]", err);
}
// No error processing done, simply return true.
