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 2013/09/09 06:29:27 UTC
svn commit: r1520959 - in /openmeetings/branches/2.x: ./ WebContent/WEB-INF/
src/org/apache/openmeetings/data/user/
src/org/apache/openmeetings/data/user/dao/
src/org/apache/openmeetings/servlet/outputhandler/
src/org/apache/openmeetings/utils/ src/org...
Author: solomax
Date: Mon Sep 9 04:29:26 2013
New Revision: 1520959
URL: http://svn.apache.org/r1520959
Log:
[OPENMEETINGS-790] red5 version is bumped to be the latest
Modified:
openmeetings/branches/2.x/.classpath
openmeetings/branches/2.x/.project
openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/branches/2.x/build.properties
openmeetings/branches/2.x/build.xml
openmeetings/branches/2.x/ivy.xml
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java
openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
openmeetings/branches/2.x/src/org/apache/openmeetings/utils/DaoHelper.java
openmeetings/branches/2.x/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java
Modified: openmeetings/branches/2.x/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/.classpath?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/.classpath (original)
+++ openmeetings/branches/2.x/.classpath Mon Sep 9 04:29:26 2013
@@ -1,16 +1,21 @@
<?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.
+ 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.
-->
<classpath>
<classpathentry kind="src" path="WebContent/WEB-INF"/>
@@ -23,11 +28,33 @@
</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+2.1&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+2.1%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings+2.1&ivyXmlPath=build%2Fred5%2Fserver%2Fivy.xml&confs=default%2Cjava6&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+2.1%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="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings+2.x&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings+2.x%2Fivysettings.xml%7D&loadSettingsOnDemand=false&propertyFiles="/>
+ <classpathentry kind="lib" path="build/red5/client/dist/red5_client-jar-r4393.jar"/>
+ <classpathentry kind="lib" path="build/red5/client/dist/red5_server-jar-r4393.jar"/>
<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
<classpathentry kind="lib" path="WebContent/screensharing"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/slf4j-api-1.7.5.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.5.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="lib" path="build/red5/server/dist/lib/logback-core-1.0.13.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/logback-classic-1.0.13.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-asm-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-expression-3.1.1.RELEASE.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-context-support-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/aopalliance-1.0.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-aop-3.1.1.RELEASE.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/spring-test-3.1.1.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.41.jar"/>
+ <classpathentry kind="lib" path="build/red5/server/dist/lib/bcprov-jdk15on-1.47.jar"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: openmeetings/branches/2.x/.project
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/.project?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/.project (original)
+++ openmeetings/branches/2.x/.project Mon Sep 9 04:29:26 2013
@@ -13,7 +13,7 @@
limitations under the License.
-->
<projectDescription>
- <name>Openmeetings 2.1</name>
+ <name>Openmeetings 2.x</name>
<comment></comment>
<projects>
</projects>
Modified: openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/branches/2.x/WebContent/WEB-INF/openmeetings-applicationContext.xml Mon Sep 9 04:29:26 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/branches/2.x/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/build.properties?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/build.properties (original)
+++ openmeetings/branches/2.x/build.properties Mon Sep 9 04:29:26 2013
@@ -9,11 +9,13 @@
# 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.1
+project.version=2.2.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
-red5.server.revision=4393
+maven.version=3.0.4
+red5.server.revision=4710
red5.client.revision=4393
+red5.server.version=1.0.2-RC1
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
Modified: openmeetings/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/build.xml?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/build.xml (original)
+++ openmeetings/branches/2.x/build.xml Mon Sep 9 04:29:26 2013
@@ -1,22 +1,28 @@
<?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.
+ 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 project>
<project name="openmeetings" basedir="./" default="dist"
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" />
@@ -97,6 +103,7 @@
</path>
<path id="compile.classpath">
<fileset dir="${red5.lib}/plugins" includes="*.jar" />
+ <fileset dir="${red5.server.dir}/target/lib" includes="junit*.jar" />
<path refid="check.classpath"/>
</path>
@@ -106,6 +113,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}" />
@@ -447,14 +455,13 @@
<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.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" />
<fileset dir="${red5.server.lib}" includes="logback*.jar" />
<fileset dir="${red5.server.lib}" includes="mina-core*.jar" />
<fileset dir="${red5.server.lib}" includes="com.springsource.slf4j.api*.jar" />
- <fileset dir="${red5.client.lib}" includes="red5-client*.jar" />
+ <fileset dir="${red5.client.lib}" includes="red5*.jar" />
</copy>
<signjar alias="filetest" keystore="${keystore.file}" storepass="secret" lazy="false"
sigalg="MD5withRSA" digestalg="SHA1">
@@ -917,50 +924,46 @@
<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>
- <!-- START of Tomcat 7 patch -->
- <delete>
- <fileset dir="${red5.server.dir}/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" />
- </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>
+ <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 file="${red5.lib}/lib/javaee-api-5.1.2.jar" />
<!-- END of Tomcat 7 patch -->
<delete dir="${red5.lib}/webapps/installer" />
<delete dir="${red5.lib}/webapps/live" />
<delete dir="${red5.lib}/webapps/vod" />
- <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">
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="^[ \t]*rtmpt.target_reponse_size[ \t]*=.*$" replace="rtmpt.target_reponse_size=65536"/>
- </tokenfilter>
- </filterchain>
- </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,23 +975,14 @@
<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 -->
<target name="-retrieve-red5-client" unless="red5.client.installed" description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
- <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 -->
+ <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
+ <param name="ivy.conf.name" value="red5-client" />
+ <param name="ivy.lib.location" value="${red5.client.lib}" />
+ </antcall>
<echo message="Red5 Client build" />
</target>
Modified: openmeetings/branches/2.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/ivy.xml?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/ivy.xml (original)
+++ openmeetings/branches/2.x/ivy.xml Mon Sep 9 04:29:26 2013
@@ -1,16 +1,21 @@
<?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.
+ 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.
-->
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,7 +37,8 @@
<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="tomcat7" description="Libraries necessary for patching Red5 to use Tomcat7" />
+ <conf name="mvn" description="Maven Ant task to build Red5" />
+ <conf name="red5-client" description="Red5 Client/Server for screensharing" />
</configurations>
<dependencies>
<!-- START OF mainlib -->
@@ -42,19 +48,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 +86,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 -->
@@ -176,9 +191,6 @@
<dependency org="org.apache.velocity" name="velocity-tools" rev="2.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
<!-- added to avoid downloading version 1.3 with Axis2 -->
<dependency org="commons-codec" name="commons-codec" rev="1.6" conf="openmeetings->*" transitive="false">
<include type="jar" />
@@ -210,7 +222,7 @@
<dependency org="xpp3" name="xpp3" rev="1.1.4c" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="javax.mail" name="mail" rev="1.4.4" conf="openmeetings->*" transitive="false">
+ <dependency org="javax.mail" name="mail" rev="1.4.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.simpleframework" name="simple-xml" rev="2.6.9" conf="openmeetings->*" transitive="false">
@@ -245,7 +257,7 @@
</dependency>
<!-- iCal4j seems to need this JAR -->
- <dependency org="edu.emory.mathcs" name="backport-util-concurrent" rev="3.1" conf="openmeetings->*"/>
+ <dependency org="backport-util-concurrent" name="backport-util-concurrent" rev="3.1" conf="openmeetings->*"/>
<dependency org="commons-net" name="commons-net" rev="3.1" conf="openmeetings->*" transitive="false">
<include type="jar" />
@@ -263,6 +275,7 @@
<!-- include type="bundle" / FIXME unable to get openjpa without sources -->
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.3" conf="openmeetings.ext->*" transitive="false"/>
<dependency org="org.apache.openjpa" name="openjpa" rev="2.2.1" conf="openmeetings.ext->*" transitive="false"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.4" conf="openmeetings.ext->*" transitive="false"/> <!-- required by PCEnchancer -->
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
@@ -276,9 +289,6 @@
<!-- END OF OPENMEETINGS -->
<!-- START OF JUNIT -->
- <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">
<include type="jar" />
</dependency>
@@ -340,24 +350,19 @@
</dependency>
<!-- END OF MySQL Driver -->
- <!-- 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 org="org.apache.tomcat.embed" name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.34" transitive="false" >
- <include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.34" transitive="false" >
+ <!-- MVN -->
+ <dependency org="org.apache.maven" name="maven-ant-tasks" conf="mvn->*" rev="2.1.3" transitive="false" >
<include type="jar" />
- </dependency>
- <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.34" transitive="false" >
+ </dependency>
+
+ <!-- Red5 Client/Server for screensharing -->
+ <dependency org="red5_client" name="red5_client" rev="r4393" conf="red5-client->*" transitive="false">
<include type="jar" />
- </dependency>
- <dependency org="tomcatplugin" name="tomcatplugin" rev="1.4" conf="tomcat7->*" transitive="false">
+ </dependency>
+ <dependency org="red5_server" name="red5_server" rev="r4393" conf="red5-client->*" transitive="false">
<include type="jar" />
</dependency>
<exclude org="javax.servlet" module="servlet-api" type="*" ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
-
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/UserManager.java Mon Sep 9 04:29:26 2013
@@ -36,7 +36,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java Mon Sep 9 04:29:26 2013
@@ -27,7 +27,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.Query;
import javax.persistence.TypedQuery;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/UsersDao.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/data/user/dao/UsersDao.java Mon Sep 9 04:29:26 2013
@@ -26,7 +26,7 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java Mon Sep 9 04:29:26 2013
@@ -26,7 +26,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Mon Sep 9 04:29:26 2013
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.SessiondataDao;
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Mon Sep 9 04:29:26 2013
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.file.FileProcessor;
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/utils/DaoHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/utils/DaoHelper.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/utils/DaoHelper.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/utils/DaoHelper.java Mon Sep 9 04:29:26 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class DaoHelper {
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java?rev=1520959&r1=1520958&r2=1520959&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java Mon Sep 9 04:29:26 2013
@@ -22,7 +22,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.LinkedHashMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;