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 2012/10/21 15:08:08 UTC
svn commit: r1400636 - in /incubator/openmeetings/trunk/singlewebapp: ./
WebContent/jrebel/ WebContent/openmeetings/WEB-INF/classes/
Author: solomax
Date: Sun Oct 21 13:08:08 2012
New Revision: 1400636
URL: http://svn.apache.org/viewvc?rev=1400636&view=rev
Log:
JRebel: missing files are added, ant build is modified to patch red5-debug.* for jRebel
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/
incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.bat
incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.sh
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel-remote.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.bat
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.bat?rev=1400636&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.bat (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.bat Sun Oct 21 13:08:08 2012
@@ -0,0 +1,6 @@
+@echo off
+
+if NOT DEFINED RED5_HOME set RED5_HOME=%~dp0
+
+set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n -javaagent:@jrebel.home@\jrebel.jar -Drebel.remoting_plugin=true -Dproject.root=@project.home@
+%RED5_HOME%\red5.bat
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.sh
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.sh?rev=1400636&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.sh (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/jrebel/red5-debug.sh Sun Oct 21 13:08:08 2012
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -z "$RED5_HOME" ]; then export RED5_HOME=.; fi
+
+# Debug options
+export JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS -javaagent:@jrebel.home@/jrebel.jar -Drebel.remoting_plugin=true -Dproject.root=@project.home@"
+
+# Start Red5
+exec $RED5_HOME/red5.sh
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel-remote.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel-remote.xml?rev=1400636&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel-remote.xml (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel-remote.xml Sun Oct 21 13:08:08 2012
@@ -0,0 +1,24 @@
+<?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.
+
+-->
+<rebel-remote>
+ <id>Openmeetings</id>
+ <url>http://localhost:5080/openmeetings/</url>
+</rebel-remote>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel.xml?rev=1400636&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel.xml (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/classes/rebel.xml Sun Oct 21 13:08:08 2012
@@ -0,0 +1,30 @@
+<?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.
+
+-->
+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
+ <classpath>
+ <dir name="${project.root}/build/classes/eclipse"/>
+ </classpath>
+ <web>
+ <link target="/">
+ <dir name="${project.root}/WebContent/openmeetings"/>
+ </link>
+ </web>
+</application>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1400636&r1=1400635&r2=1400636&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Sun Oct 21 13:08:08 2012
@@ -197,6 +197,12 @@
<!-- compiles the sources only with laszlo debug client -->
<target name="dist-debug" description="binary distribution of OpenMeetings" depends="clean, jar, compile.laszlo.main.debug, compile.laszlo.main.debug.as3, -copy-libraries, signWebStartJars" />
+ <target name="-cleanup-jrebel" unless="jrebel.enabled">
+ <delete>
+ <fileset dir="${dist.webapps.dir}/WEB-INF/classes" includes="rebel*.xml" />
+ </delete>
+ </target>
+
<!-- Check timestamp on files -->
<target name="prepare" depends="prepare.mkdir">
<copy todir="${red5.root}">
@@ -221,7 +227,7 @@
<exclude name="root-*.xml" />
</fileset>
</copy>
-
+ <antcall target="-cleanup-jrebel" />
<chmod dir="${red5.root}" perm="755" includes="**/*.sh" />
<antcall target="-process-db" inheritAll="true" inheritRefs="true" />
@@ -827,6 +833,15 @@
<ivy:retrieve conf="${ivy.conf.name}" pattern="${ivy.lib.location}/[artifact]-[type]-[revision].[ext]" />
</target>
+ <target name="-patch-red5-server-start-script" if="jrebel.home">
+ <echo>Going to patch red5-debug.* with ${jrebel.home}</echo>
+ <filter token="jrebel.home" value="${jrebel.home}" />
+ <filter token="project.home" value="${user.dir}" />
+ <copy todir="${red5.lib}" filtering="true" overwrite="true" force="true">
+ <fileset dir="${webcontent.src.dir}/jrebel" includes="red5-debug.*"/>
+ </copy>
+ </target>
+
<!-- Check for the Red5 libraries -->
<target name="-retrieve-red5-server" unless="red5.installed" description="Retrieves the libraries if needed" depends="-ant-task">
<svn refid="svn.settings">
@@ -863,6 +878,7 @@
<delete>
<fileset dir="${red5.server.lib}" includes="jaudiotagger*.jar" />
</delete>
+ <antcall target="-patch-red5-server-start-script"/>
</target>
<!-- Check for the Red5 libraries -->