Author: solomax
Date: Tue Mar 19 12:25:32 2013
New Revision: 1458243
URL: http://svn.apache.org/r1458243
Log:
[OPENMEETINGS-578] red5 version is bumped all components seems to work as
expected
Removed:
openmeetings/trunk/singlewebapp/WebContent/red5/red5-highperf.bat
openmeetings/trunk/singlewebapp/build-red5_ivy.xsl
openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl
openmeetings/trunk/singlewebapp/log/
Modified:
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/ivysettings.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Modified: openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Tue Mar 19 12:25:32 2013
@@ -1,33 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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.
- -->
-<classpath>
- <classpathentry kind="src" path="WebContent/WEB-INF"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src"
path="WebContent/openmeetings/WEB-INF/classes"/>
- <classpathentry exported="true" kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
- <attributes>
- <attribute
name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings&ivyXmlPath=build%2Fred5%2Fserver%2Fivy.xml&confs=default%2Cjava6&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%2Fbuild%2Fred5%2Fserver%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="lib" path="build/red5/server/dist/red5.jar"
sourcepath="build/red5/server/src"/>
- <classpathentry kind="lib"
path="build/red5/client/dist/red5-client.jar"
sourcepath="build/red5/client/src"/>
- <classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
- <classpathentry kind="lib" path="WebContent/screensharing"/>
- <classpathentry kind="output" path="build/classes/eclipse"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+ -->
+<classpath>
+ <classpathentry kind="src" path="WebContent/WEB-INF"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src"
path="WebContent/openmeetings/WEB-INF/classes"/>
+ <classpathentry exported="true" kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+ <attributes>
+ <attribute
name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
+ <classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
+ <classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
+ <classpathentry kind="lib" path="WebContent/screensharing"/>
+ <classpathentry kind="lib"
path="build/red5/client/dist/red5-client-1.0.2-SNAPSHOT.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/red5-server.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/slf4j-api-1.7.2.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-beans-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/mina-core-2.0.7.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/quartz-2.1.6.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/log4j-over-slf4j-1.7.2.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/commons-collections-20040616.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/spring-web-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/commons-beanutils-1.8.3.jar"/>
+ <classpathentry kind="lib"
path="build/red5/server/dist/lib/commons-lang3-3.1.jar"/>
+ <classpathentry kind="output" path="build/classes/eclipse"/>
+</classpath>
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Tue Mar 19 12:25:32 2013
@@ -113,7 +113,7 @@
</property>
<property name="concurrent" value="false" />
</bean>
- <bean id="triggerSessionClear"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <bean id="triggerSessionClear"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
<property name="jobDetail">
<!-- see the example of method invoking job above -->
<ref bean="sessionClearJob" />
@@ -138,7 +138,7 @@
</property>
<property name="concurrent" value="false" />
</bean>
- <bean id="triggerMeetingReminder"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <bean id="triggerMeetingReminder"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
<property name="jobDetail">
<!-- see the example of method invoking job above -->
<ref bean="meetingReminderClear" />
@@ -162,7 +162,7 @@
</property>
<property name="concurrent" value="false" />
</bean>
- <bean id="triggerTestSetupCleanup"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <bean id="triggerTestSetupCleanup"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
<property name="jobDetail">
<ref bean="testSetupCleanup" />
</property>
@@ -185,7 +185,7 @@
</property>
<property name="concurrent" value="false" />
</bean>
- <bean id="triggerResetSendingMailStatus"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <bean id="triggerResetSendingMailStatus"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
<property name="jobDetail">
<ref bean="resetSendingMailStatus" />
</property>
@@ -205,7 +205,7 @@
</property>
<property name="concurrent" value="false" />
</bean>
- <bean id="triggerSendMails"
class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+ <bean id="triggerSendMails"
class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
<property name="jobDetail">
<ref bean="sendMails" />
</property>
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Tue Mar 19 12:25:32 2013
@@ -1,20 +1,23 @@
-# Licensed 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.
-project.version=2.1.0
+# Licensed 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.
+project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
-red5.server.revision=4393
-red5.client.revision=4393
+maven.version=3.0.4
+red5.server.revision=4599
+red5.client.revision=4599
+red5.server.version=1.0.2-SNAPSHOT
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
backup.file.list=backup_v_1_4_rc1_r3326.zip,backup_v_1_5_rc1_r3393.zip,backup_v_1_6_2_r3675.zip,backup_v_1_7_0_r3822.zip,backup_v_1_8_8_r4555.zip,backup_v_1_9_1_r4707.zip,backup_v_2_0_0_r1361497.zip
db=derby
+
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Mar 19 12:25:32 2013
@@ -17,6 +17,7 @@
xmlns="antlib:org.apache.tools.ant"
xmlns:rat="antlib:org.apache.rat.anttasks"
xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant"
>
<loadproperties srcFile="build.properties" />
@@ -106,6 +107,7 @@
<target name="prepare.mkdir" depends="-java6or7.check">
<mkdir dir="${red5.server.lib}" />
+ <mkdir dir="${red5.lib}/log" />
<mkdir dir="${red5.client.dir}/dist" />
<mkdir dir="${dist.dir}" />
<mkdir dir="${main.out.dir}" />
@@ -439,6 +441,7 @@
<copy todir="${screenshare.out.dir}">
<fileset dir="${screensharing.resources}"
includes="*.jpg" />
<fileset dir="${red5.server.lib}"
includes="commons-codec*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="commons-lang3*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpclient*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpcore*.jar" />
<fileset dir="${red5.server.lib}"
includes="bcprov*.jar" />
@@ -447,7 +450,7 @@
<fileset dir="${red5.server.lib}"
includes="slf4j-api*.jar" />
<fileset dir="${red5.server.lib}"
includes="jcl-over-slf4j*.jar" />
<fileset dir="${red5.server.lib}"
includes="commons-collections*.jar" />
- <fileset dir="${red5.lib}" includes="red5.jar" />
+ <fileset dir="${red5.lib}" includes="red5-server*.jar"
excludes="*bootstrap.jar" />
<fileset dir="${red5.server.lib}"
includes="spring-context-3*.jar" />
<fileset dir="${red5.server.lib}"
includes="spring-core-*.jar" />
<fileset dir="${red5.server.lib}"
includes="spring-beans-*.jar" />
@@ -726,7 +729,7 @@
</path>
<target name="anakia"
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-anakia">
- <taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
+ <taskdef name="anakia" classname="org.apache.anakia.AnakiaTask">
<classpath>
<path refid="anakia.classpath" />
</classpath>
@@ -917,36 +920,51 @@
<fileset dir="${webcontent.src.dir}/jrebel"
includes="red5-debug.*"/>
</copy>
</target>
- <target name="-patch-red5-server-highperf-script">
- <echo>Going to patch red5-highperf.bat</echo>
- <copy todir="${red5.lib}" overwrite="true" force="true">
- <fileset dir="${webcontent.src.dir}/red5"
includes="red5-highperf.bat" />
- </copy>
+
+ <target name="-maven-task" unless="maven.installed">
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="mvn" />
+ <param name="ivy.lib.location"
value="${project.lib.dir}" />
+ </antcall>
+ <path id="maven-ant-tasks.classpath">
+ <fileset dir="${project.lib.dir}"
includes="maven-ant-tasks*.jar" />
+ </path>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <property name="maven.installed" value="true" />
</target>
<!-- Check for the Red5 server libraries -->
- <target name="-retrieve-red5-server" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-ant-task">
+ <target name="-retrieve-red5-server" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-ant-task,-maven-task">
<svn refid="svn.settings">
<checkout
url="http://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
</svn>
+ <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" /-->
+ <arg value="clean"/>
+ <arg value="install"/>
+ <jvmarg value="-Dmaven.test.skip=true" />
+ </artifact:mvn>
+ <untar
src="${red5.server.dir}/target/red5-server-${red5.server.version}-server.tar.gz"
dest="${red5.server.dir}/target" compression="gzip"/>
+ <move todir="${red5.lib}">
+ <fileset
dir="${red5.server.dir}/target/red5-server-${red5.server.version}">
+ <include name="**/*"/>
+ </fileset>
+ </move>
+
<!-- START of Tomcat 7 patch -->
<delete>
- <fileset dir="${red5.server.dir}/plugins"
includes="*.jar" />
+ <fileset dir="${red5.lib}/plugins" includes="*.jar" />
</delete>
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
<param name="ivy.conf.name" value="tomcat7" />
- <param name="ivy.lib.location"
value="${red5.server.dir}/plugins" />
+ <param name="ivy.lib.location"
value="${red5.lib}/plugins" />
</antcall>
- <!-- END of Tomcat 7 patch -->
- <xslt in="${red5.server.dir}/ivy.xml"
out="${red5.server.dir}/ivy1.xml" style="build-red5_ivy.xsl" />
- <move file="${red5.server.dir}/ivy1.xml"
tofile="${red5.server.dir}/ivy.xml" />
- <xslt in="${red5.server.dir}/ivysettings.xml"
out="${red5.server.dir}/ivysettings1.xml" style="build-red5_ivysettings.xsl" />
- <move file="${red5.server.dir}/ivysettings1.xml"
tofile="${red5.server.dir}/ivysettings.xml" />
- <subant target="dist">
- <fileset dir="${red5.server.dir}" includes="build.xml"
/>
- </subant>
- <!-- START of Tomcat 7 patch -->
<delete file="${red5.lib}/lib/javaee-api-5.1.2.jar" />
+ <delete file="${red5.lib}/lib/servlet-api-2.5.jar" />
<!-- END of Tomcat 7 patch -->
<delete dir="${red5.lib}/webapps/installer" />
<delete dir="${red5.lib}/webapps/live" />
@@ -954,13 +972,13 @@
<copy todir="${red5.lib}/conf" overwrite="true" force="true">
<fileset dir="${webcontent.src.dir}/red5"
includes="jee-container*.xml" />
</copy>
- <copy file="${red5.server.dir}/src/conf/red5.properties"
todir="${red5.lib}/conf" overwrite="true" force="true">
+ <!--copy file="${red5.server.dir}/src/conf/red5.properties"
todir="${red5.lib}/conf" overwrite="true" force="true">
<filterchain>
<tokenfilter>
<replaceregex pattern="^[
\t]*rtmpt.target_reponse_size[ \t]*=.*$"
replace="rtmpt.target_reponse_size=65536"/>
</tokenfilter>
</filterchain>
- </copy>
+ </copy-->
<copy file="${webcontent.src.dir}/red5/index.html"
todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
<copy todir="${red5.lib}" overwrite="true" force="true">
<fileset dir="${webcontent.src.dir}/red5"
includes="admin.*,network_test.sh" />
@@ -972,7 +990,6 @@
<fileset dir="${red5.server.lib}"
includes="jaudiotagger*.jar" />
</delete>
<antcall target="-patch-red5-server-start-script"/>
- <antcall target="-patch-red5-server-highperf-script"/>
</target>
<!-- Check for the Red5 client libraries -->
@@ -980,15 +997,20 @@
<svn refid="svn.settings">
<checkout
url="http://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
</svn>
- <copy file="${red5.lib}/red5.jar"
todir="${red5.client.dir}/lib" overwrite="true" force="true" />
- <xslt in="${red5.client.dir}/ivy.xml"
out="${red5.client.dir}/ivy1.xml" style="build-red5_ivy.xsl" />
- <move file="${red5.client.dir}/ivy1.xml"
tofile="${red5.client.dir}/ivy.xml" />
- <subant target="dist">
- <fileset dir="${red5.client.dir}" includes="build.xml"
/>
- </subant>
- <!-- START of Tomcat 7 patch -->
- <delete file="${red5.client.lib}/lib/javaee-api-5.1.2.jar" />
- <!-- END of Tomcat 7 patch -->
+ <delete>
+ <fileset dir="${red5.client.dir}/lib"
includes="red5-server*.jar" />
+ </delete>
+ <copy file="${red5.lib}/red5-server.jar"
todir="${red5.client.dir}/lib" overwrite="true" force="true" />
+ <artifact:mvn pom="${red5.client.dir}/pom.xml"
mavenVersion="${maven.version}" fork="true" dir="${red5.client.dir}">
+ <jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
+ <!--jvmarg value="-Dassembly.skipAssembly=true" /-->
+ <arg value="clean"/>
+ <arg value="install"/>
+ <jvmarg value="-Dmaven.test.skip=true" />
+ </artifact:mvn>
+ <copy todir="${red5.client.lib}" overwrite="true" force="true">
+ <fileset dir="${red5.client.dir}/target"
includes="red5-client-*.jar" excludes="*javadoc.jar,*sources.jar" />
+ </copy>
<echo message="Red5 Client build" />
</target>
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Tue Mar 19 12:25:32 2013
@@ -32,6 +32,7 @@
<conf name="openlaszlo" description="Openlaszlo dependencies" />
<conf name="openlaszlo46" description="Openlaszlo with Flex 4.6
dependencies" />
<conf name="mysql" description="MySQL JDBC driver" />
+ <conf name="mvn" description="Maven Ant task to build Red5" />
<conf name="tomcat7" description="Libraries necessary for
patching Red5 to use Tomcat7" />
</configurations>
<dependencies>
@@ -42,19 +43,25 @@
<dependency org="commons-io" name="commons-io" rev="2.1"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.aspects" rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="asm" name="asm" rev="3.1" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.jdbc" rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-aspects"
rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.orm" rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-jdbc"
rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.transaction" rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-orm"
rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.web.servlet" rev="3.1.1.RELEASE" transitive="false">
+ <dependency org="org.springframework" name="spring-tx"
rev="3.1.1.RELEASE" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.springframework" name="spring-webmvc"
rev="3.1.1.RELEASE" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.springframework"
name="spring-context-support" rev="3.1.1.RELEASE" transitive="false">
<include type="jar" />
</dependency>
<dependency org="cglib" name="cglib" rev="2.2.2"
transitive="false">
@@ -74,6 +81,9 @@
<dependency org="oro" name="oro" rev="2.0.8" conf="anakia->*"
transitive="false">
<include type="jar" />
</dependency>
+ <dependency org="org.apache.velocity" name="velocity-anakia"
rev="1.1.0-SNAPSHOT" conf="anakia->*" transitive="false">
+ <include type="jar" />
+ </dependency>
<!-- END OF ANAKIA -->
<!-- START OF OPENMEETINGS -->
@@ -279,7 +289,7 @@
<dependency org="junit" name="junit" rev="4.9" conf="junit->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.test" rev="3.1.1.RELEASE" conf="junit->*"
transitive="false">
+ <dependency org="org.springframework" name="spring-test"
rev="3.1.1.RELEASE" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3"
conf="junit->*" transitive="false">
@@ -340,19 +350,24 @@
</dependency>
<!-- END OF MySQL Driver -->
- <!-- Tomcat 7 -->
+ <!-- MVN -->
+ <dependency org="org.apache.maven" name="maven-ant-tasks"
conf="mvn->*" rev="2.1.3" transitive="false" >
+ <include type="jar" />
+ </dependency>
+
+ <!-- Tomcat 7 -->
<dependency org="org.apache.tomcat.embed"
name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.34" transitive="false" >
<include type="jar" />
- </dependency>
+ </dependency>
<dependency org="org.apache.tomcat.embed"
name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.34" transitive="false" >
<include type="jar" />
- </dependency>
+ </dependency>
<dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.34"
transitive="false" >
<include type="jar" />
- </dependency>
+ </dependency>
<dependency org="org.apache.tomcat.embed"
name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.34"
transitive="false" >
<include type="jar" />
- </dependency>
+ </dependency>
<dependency org="tomcatplugin" name="tomcatplugin" rev="1.4"
conf="tomcat7->*" transitive="false">
<include type="jar" />
</dependency>
Modified: openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ openmeetings/trunk/singlewebapp/ivysettings.xml Tue Mar 19 12:25:32 2013
@@ -12,14 +12,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivysettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<ivysettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="ivysettings.xsd">
<settings defaultResolver="chain"/>
<resolvers>
<chain name="chain">
<ibiblio name="central" m2compatible="true"/>
- <ibiblio name="springsource-external"
m2compatible="true"
root="http://repository.springsource.com/maven/bundles/external"/>
- <ibiblio name="springsource-release"
m2compatible="true"
root="http://repository.springsource.com/maven/bundles/release"/>
<ibiblio name="apache-public" m2compatible="true"
root="https://repository.apache.org/content/groups/public"; />
<url name="mavencentral">
<artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1458243&r1=1458242&r2=1458243&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Tue Mar 19 12:25:32 2013
@@ -40,6 +40,7 @@ import org.apache.velocity.VelocityConte
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.log.Log4JLogChute;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -211,6 +212,7 @@ public class ScreenController {
VelocityEngine ve = new VelocityEngine();
ve.setProperty(RuntimeConstants.RESOURCE_LOADER,
"classpath");
ve.setProperty("classpath.resource.loader.class",
ClasspathResourceLoader.class.getName());
+ ve.setProperty(Log4JLogChute.RUNTIME_LOG_LOG4J_LOGGER,
Log4JLogChute.class.getName());
ve.mergeTemplate(
"screenshare.vm"
