Author: solomax
Date: Sat Mar 3 17:44:05 2012
New Revision: 1296672
URL: http://svn.apache.org/viewvc?rev=1296672&view=rev
Log:
Red5 sources removed
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/index.html
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
Removed:
incubator/openmeetings/trunk/singlewebapp/red5-1.0.0-r4315/
Modified:
incubator/openmeetings/trunk/singlewebapp/ (props changed)
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
incubator/openmeetings/trunk/singlewebapp/lib/ (props changed)
Propchange: incubator/openmeetings/trunk/singlewebapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 3 17:44:05 2012
@@ -6,4 +6,4 @@ screen_compile
junitreport
log
openlaszlo
-
+red5
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1296672&r1=1296671&r2=1296672&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Sat Mar 3 17:44:05
2012
@@ -110,57 +110,57 @@
<classpathentry kind="lib" path="lib/om/XmlSchema-bundle-1.4.7.jar"/>
<classpathentry kind="lib" path="lib/om/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/om/xstream-1.4.2.jar"/>
- <classpathentry kind="lib" path="lib/red5/bcprov-jdk16-145.jar"/>
- <classpathentry kind="lib" path="lib/red5/cglib-2.2.2.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.javax.xml.stream-1.0.1.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.antlr-3.1.3.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.aopalliance-1.0.0.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.apache.xerces-2.9.1.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.objectweb.asm-3.2.0.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.slf4j.api-1.6.1.jar"/>
- <classpathentry kind="lib"
path="lib/red5/com.springsource.slf4j.bridge-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/commons-beanutils-1.8.3.jar"/>
- <classpathentry kind="lib" path="lib/red5/commons-codec-1.6.jar"/>
- <classpathentry kind="lib"
path="lib/red5/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/commons-lang3-3.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/commons-modeler-2.0.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/commons-pool-1.5.6.jar"/>
- <classpathentry kind="lib" path="lib/red5/ehcache-core-2.5.0.jar"/>
- <classpathentry kind="lib"
path="lib/red5/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/httpclient-4.1.2.jar"/>
- <classpathentry kind="lib" path="lib/red5/httpcore-4.1.3.jar"/>
- <classpathentry kind="lib"
path="lib/red5/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="lib/red5/javaee-api-5.1.2.om.jar"/>
- <classpathentry kind="lib" path="lib/red5/jcl-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/jruby-complete-1.1.6.jar"/>
- <classpathentry kind="lib" path="lib/red5/jul-to-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/jython-2.5.jar"/>
- <classpathentry kind="lib" path="lib/red5/log4j-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/red5/logback-classic-0.9.28.jar"/>
- <classpathentry kind="lib" path="lib/red5/logback-core-0.9.28.jar"/>
- <classpathentry kind="lib" path="lib/red5/mina-core-2.0.4.jar"/>
- <classpathentry kind="lib"
path="lib/red5/mina-integration-beans-2.0.4.jar"/>
- <classpathentry kind="lib"
path="lib/red5/mina-integration-jmx-2.0.4.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.aop-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.asm-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.aspects-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.beans-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.context-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.core-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.expression-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.jdbc-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.orm-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.transaction-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.web-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib"
path="lib/red5/org.springframework.web.servlet-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/red5/quartz-1.8.5.jar"/>
- <classpathentry kind="lib"
path="lib/red5/spring-context-support-3.0.6.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/red5/xmlrpc-2.0.1.jar"/>
- <classpathentry kind="lib" path="red5-1.0.0-r4315/dist/red5.jar"/>
<classpathentry kind="lib" path="lib/om/servlet-api-jar-2.5.jar"/>
<classpathentry kind="lib" path="lib/dtd-generator/trang-20091111.jar"/>
+ <classpathentry kind="lib" path="lib/mainlibs/cglib-2.2.2.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/com.springsource.org.aopalliance-1.0.0.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/geronimo-jpa_2.0_spec-bundle-1.1.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/org.springframework.aop-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/org.springframework.aspects-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/org.springframework.jdbc-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/org.springframework.orm-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/org.springframework.transaction-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="lib/mainlibs/org.springframework.web.servlet-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="red5/dist/red5.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/bcprov-jdk16-145.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.javax.xml.stream-1.0.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.org.antlr-3.1.3.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.org.apache.xerces-2.9.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.org.codehaus.groovy-1.7.0.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.org.objectweb.asm-3.2.0.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.slf4j.api-1.6.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/com.springsource.slf4j.bridge-1.6.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/commons-beanutils-1.8.3.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/commons-lang3-3.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/commons-modeler-2.0.1.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/commons-pool-1.5.6.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/ehcache-core-2.5.0.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/httpclient-4.1.2.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/httpcore-4.1.3.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/javaee-api-5.1.2.om.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/jcl-over-slf4j-1.6.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/jruby-complete-1.1.6.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/jul-to-slf4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/jython-2.5.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/log4j-over-slf4j-1.6.1.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/logback-classic-0.9.28.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/logback-core-0.9.28.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/mina-core-2.0.4.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/mina-integration-beans-2.0.4.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/mina-integration-jmx-2.0.4.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/quartz-1.8.5.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-asm-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-beans-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-context-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-context-support-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-core-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-expression-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib"
path="red5/dist/lib/spring-web-3.0.6.RELEASE.jar"/>
+ <classpathentry kind="lib" path="red5/dist/lib/xmlrpc-2.0.1.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/red5/index.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5/index.html?rev=1296672&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/red5/index.html (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/red5/index.html Sat
Mar 3 17:44:05 2012
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>Your Page Title</title>
+<meta http-equiv="REFRESH"
content="0;url=http://demo.openmeetings.de/openmeetings/";></HEAD>
+<BODY>
+Redirect to http://demo.openmeetings.de/openmeetings/
+</BODY>
+</HTML>
+
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml?rev=1296672&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
(added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/red5/jee-container.xml
Sat Mar 3 17:44:05 2012
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:lang="http://www.springframework.org/schema/lang";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd";>
+
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader"
init-method="init" destroy-method="shutdown" depends-on="context.loader">
+
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <!-- Blocking I/O -->
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11Protocol" />
+ <!-- Non-blocking I/O -->
+ <!--
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
+ -->
+ <property name="port"><value>${http.port}</value></property>
+ <property
name="redirectPort"><value>${https.port}</value></property>
+ <property name="enableLookups"><value>false</value></property>
+ <property name="useIPVHosts"><value>true</value></property>
+ <property
name="URIEncoding"><value>${http.URIEncoding}</value></property>
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String"
value="${http.host}" />
+ <constructor-arg index="1" type="int" value="${http.port}" />
+ </bean>
+ </property>
+
+ <property name="baseHost">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${http.host}" />
+ <property name="unpackWARs" value="true" />
+ <property name="autoDeploy" value="true" />
+ <property name="xmlValidation" value="false" />
+ <property name="xmlNamespaceAware" value="false" />
+ </bean>
+ </property>
+
+ <property name="valves">
+ <list>
+ <bean id="valve.access"
class="org.apache.catalina.valves.AccessLogValve">
+ <property name="directory" value="log" />
+ <property name="prefix" value="${http.host}_access." />
+ <property name="suffix" value=".log" />
+ <property name="pattern" value="common" />
+ <property name="resolveHosts" value="false" />
+ <property name="rotatable" value="true" />
+ </bean>
+ </list>
+ </property>
+
+ </bean>
+
+ <!-- RTMPT (dedicated server) -->
+ <bean id="rtmpt.server"
class="org.red5.server.tomcat.rtmpt.RTMPTLoader" init-method="init"
lazy-init="true">
+
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property
name="port"><value>${rtmpt.port}</value></property>
+ <property
name="enableLookups"><value>false</value></property>
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String"
value="${rtmpt.host}" />
+ <constructor-arg index="1" type="int" value="${rtmpt.port}" />
+ </bean>
+ </property>
+
+ <property name="connectionProperties">
+ <map>
+ <entry key="maxKeepAliveRequests"
value="${rtmpt.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads"
value="${rtmpt.max_threads}"/>
+ <entry key="acceptorThreadCount"
value="${rtmpt.acceptor_thread_count}"/>
+ <entry key="processorCache"
value="${rtmpt.processor_cache}"/>
+ </map>
+ </property>
+
+ <property name="host">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${rtmpt.host}" />
+ <property name="unpackWARs" value="false" />
+ <property name="autoDeploy" value="false" />
+ <property name="xmlValidation" value="false" />
+ <property name="xmlNamespaceAware"
value="false" />
+ </bean>
+ </property>
+
+ </bean>
+
+ <!-- RTMPS (dedicated server) -->
+<!--
+ <bean id="rtmps.server"
class="org.red5.server.tomcat.rtmps.RTMPSLoader" init-method="init"
lazy-init="true">
+
+ <property name="webappFolder" value="${red5.root}/webapps" />
+
+ <property name="connector">
+ <bean class="org.apache.catalina.connector.Connector">
+ <constructor-arg type="java.lang.String"
value="org.apache.coyote.http11.Http11NioProtocol" />
+ <property name="port" value="${rtmps.port}" />
+ <property name="redirectPort"
value="${rtmp.port}" />
+ </bean>
+ </property>
+
+ <property name="address">
+ <bean class="java.net.InetSocketAddress">
+ <constructor-arg index="0" type="java.lang.String"
value="${rtmps.host}" />
+ <constructor-arg index="1" type="int" value="${rtmps.port}" />
+ </bean>
+ </property>
+
+ <property name="host">
+ <bean class="org.apache.catalina.core.StandardHost">
+ <property name="name" value="${rtmps.host}" />
+ <property name="unpackWARs" value="false" />
+ <property name="autoDeploy" value="false" />
+ <property name="xmlValidation" value="false" />
+ <property name="xmlNamespaceAware"
value="false" />
+ </bean>
+ </property>
+
+ <property name="connectionProperties">
+ <map>
+ <entry>
+ <key><value>port</value></key>
+ <value>${rtmps.port}</value>
+ </entry>
+ <entry>
+ <key><value>redirectPort</value></key>
+ <value>${rtmp.port}</value>
+ </entry>
+ <entry>
+ <key><value>SSLEnabled</value></key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key><value>sslProtocol</value></key>
+ <value>TLS</value>
+ </entry>
+ <entry>
+ <key><value>clientAuth</value></key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key><value>keystoreFile</value></key>
+ <value>conf/keystore</value>
+ </entry>
+ <entry>
+ <key><value>keystorePass</value></key>
+ <value>${rtmps.keystorepass}</value>
+ </entry>
+ <entry>
+ <key><value>keystoreType</value></key>
+ <value>JKS</value>
+ </entry>
+ <entry key="maxKeepAliveRequests"
value="${rtmps.max_keep_alive_requests}"/>
+ <entry key="useExecutor" value="true"/>
+ <entry key="maxThreads"
value="${rtmps.max_threads}"/>
+ <entry key="acceptorThreadCount"
value="${rtmps.acceptor_thread_count}"/>
+ <entry key="processorCache"
value="${rtmps.processor_cache}"/>
+ </map>
+ </property>
+
+ <property name="valves">
+ <list>
+ <bean id="valve.access"
class="org.apache.catalina.valves.AccessLogValve">
+ <property name="directory" value="log" />
+ <property name="prefix"
value="${rtmps.host}_rtmps_access." />
+ <property name="suffix" value=".log" />
+ <property name="pattern" value="common" />
+ <property name="resolveHosts" value="false" />
+ <property name="rotatable" value="true" />
+ </bean>
+ </list>
+ </property>
+
+ </bean>
+-->
+
+</beans>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1296672&r1=1296671&r2=1296672&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Sat Mar 3 17:44:05 2012
@@ -25,8 +25,9 @@
<property name="test.src.dir" value="${basedir}/src/test" />
<property name="main.out.dir" value="${basedir}/bin" />
- <!-- Red5 dir -->
- <property name="red5.server.dir" value="red5-1.0.0-r4315" />
+ <!-- Red5 -->
+ <property name="red5.revision" value="4315" />
+ <property name="red5.server.dir" value="${basedir}/red5" />
<!-- screen.out.dir -->
<property name="screen.out.dir" value="${basedir}/screen_compile" />
@@ -86,7 +87,7 @@
fxgutils.jar" />
</path>
- <property name="red5.lib.dir" value="${project.lib}/red5" />
+ <property name="mainlibs.lib.dir" value="${project.lib}/mainlibs" />
<property name="om.lib.dir" value="${project.lib}/om" />
<property name="anakia.lib.dir" value="${project.lib}/anakia" />
<property name="red5-screenshare.images"
value="${basedir}/WebContent/red5-screenshare" />
@@ -95,12 +96,13 @@
<property name="dtd-generator.lib.dir"
value="${project.lib}/dtd-generator" />
<property name="svntask.lib.dir" value="${project.lib}/svntask" />
- <property name="red5.lib" value="${basedir}/${red5.server.dir}/dist" />
+ <property name="red5.lib" value="${red5.server.dir}/dist" />
<property name="red5.server.lib" value="${red5.lib}/lib" />
<!-- compile classpath -->
<path id="compile.classpath">
- <fileset dir="${red5.lib.dir}" includes="*.jar" />
+ <fileset dir="${red5.server.lib}" includes="*.jar" />
+ <fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
<fileset dir="${om.lib.dir}" includes="*.jar" />
<fileset dir="${red5.lib}" includes="*.jar" />
<fileset dir="${junit.lib.dir}" includes="*.jar" />
@@ -144,7 +146,7 @@
<!-- build webapp -->
<target name="-copy-libraries" description="All jars downloaded by ivy
copied to appropriate places">
<copy todir="${dist.dir}/red5/lib">
- <fileset dir="${red5.lib.dir}" includes="*.jar" />
+ <fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
</copy>
<copy todir="${dist.webapps.dir}/WEB-INF/lib">
<fileset dir="${om.lib.dir}" includes="*.jar" />
@@ -164,10 +166,11 @@
depends="cleanForBinary, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, signWebStartJars, -copy-libraries"/>
<target name="prepare.mkdir" depends="-java6.check">
+ <mkdir dir="${red5.server.lib}" />
<mkdir dir="${screen.out.dir}" />
<mkdir dir="${dist.dir}" />
<mkdir dir="${main.out.dir}" />
- <mkdir dir="${red5.lib.dir}" />
+ <mkdir dir="${mainlibs.lib.dir}" />
<mkdir dir="${om.lib.dir}" />
<mkdir dir="${anakia.lib.dir}" />
<mkdir dir="${junit.lib.dir}" />
@@ -365,18 +368,18 @@
</genkey>
<copy todir="${screenshare.out.dir}" filtering="true">
<fileset dir="${red5-screenshare.images}" />
- <fileset dir="${red5.lib.dir}"
includes="commons-codec*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="httpclient*.jar" />
- <fileset dir="${red5.lib.dir}" includes="httpcore*.jar"
/>
- <fileset dir="${red5.lib.dir}"
includes="bcprov-jdk16*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="ehcache-core*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="commons-beanutils*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="commons-codec*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="httpclient*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="httpcore*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="bcprov-jdk16*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="ehcache-core*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="commons-beanutils*.jar" />
<fileset dir="${red5.server.dir}/dist"
includes="red5.jar" />
- <fileset dir="${red5.lib.dir}"
includes="org.springframework.context-*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="org.springframework.core-*.jar" />
- <fileset dir="${red5.lib.dir}" includes="logback*.jar"
/>
- <fileset dir="${red5.lib.dir}"
includes="mina-core*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="com.springsource.slf4j.api*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="org.springframework.context-*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="org.springframework.core-*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="logback*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="mina-core*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="com.springsource.slf4j.api*.jar" />
</copy>
<signjar alias="filetest" keystore="filetest.keystore"
storepass="secret" lazy="false">
<path>
@@ -435,9 +438,8 @@
<target name="compile" depends="prepare, compile.only" />
- <target name="compile.only"
depends="-retrieve-red5,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,compile.screen.share">
- <echo message="Compile main to ${main.out.dir}">
- </echo>
+ <target name="compile.only"
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,compile.screen.share">
+ <echo message="Compile main to ${main.out.dir}"/>
<javac debug="on" debuglevel="lines,vars,source"
destdir="${main.out.dir}">
<src path="${main.src.dir}" />
<classpath refid="compile.classpath" />
@@ -526,14 +528,15 @@
<fileset dir="${svntask.lib.dir}" includes="*.jar" />
<fileset dir="${project.lib}" includes="svn*.jar" />
</path>
- <target name="current_revision" depends="-retrieve-svntask">
+ <target name="-ant-task" depends="-retrieve-svntask">
<typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
<classpath>
<path refid="svntask.classpath" />
</classpath>
</typedef>
-
<svnSetting svnkit="false" javahl="false" id="svn.settings" />
<!-- native svn in the path-->
+ </target>
+ <target name="current_revision" depends="-ant-task">
<svn refid="svn.settings">
<info target="."/>
</svn>
@@ -590,11 +593,11 @@
<path id="anakia.classpath">
<path refid="compile.classpath" />
<fileset dir="${anakia.lib.dir}" includes="*.jar" />
- <fileset dir="${red5.lib.dir}"
includes="commons-collections*.jar,commons-lang*.jar,velocity*.jar" />
+ <fileset dir="${mainlibs.lib.dir}"
includes="commons-collections*.jar,commons-lang*.jar,velocity*.jar" />
</path>
- <target name="anakia"
depends="-retrieve-red5,-retrieve-om,-retrieve-anakia">
+ <target name="anakia"
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-anakia">
<taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
<classpath>
<path refid="anakia.classpath" />
@@ -755,7 +758,7 @@
</target>
<target name="-availability-check" unless="red5.installed"
description="Check which libraries need to be retrieved"
depends="prepare.mkdir">
- <available classpathref="compile.classpath"
classname="javax.persistence.spi.PersistenceProvider"
property="red5.installed"/>
+ <available classpathref="compile.classpath"
classname="javax.persistence.spi.PersistenceProvider"
property="mainlib.installed"/>
<available classpathref="compile.classpath"
classname="org.apache.axis2.Version" property="om.installed"/>
<available classpathref="anakia.classpath"
classname="org.apache.oro.text.GlobCompiler" property="anakia.installed"/>
<available classpathref="compile.classpath"
classname="org.junit.Test" property="junit.installed"/>
@@ -763,6 +766,7 @@
<available classpathref="compile.classpath"
classname="com.thaiopensource.relaxng.translate.Driver"
property="dtd-generator.installed"/>
<available classpathref="svntask.classpath"
classname="org.tmatesoft.svn.core.SVNCommitInfo" property="svntask.installed"/>
<available file="${laszlo.home}/WEB-INF/lib" type="dir"
property="laszlo.installed"/>
+ <available file="${red5.lib}/red5.sh" type="file"
property="red5.installed"/>
</target>
<target name="-retrieve" description="Retrieves the libraries if
needed">
@@ -771,7 +775,7 @@
<isset property="ivy.conf.name"/>
</not>
</condition>
- <condition property="ivy.lib.location" value="${red5.lib.dir}">
+ <condition property="ivy.lib.location"
value="${mainlibs.lib.dir}">
<not>
<isset property="ivy.lib.location"/>
</not>
@@ -792,27 +796,42 @@
</target>
<!-- Check for the Red5 libraries -->
- <target name="-retrieve-red5" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
+ <target name="-retrieve-red5" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-ant-task">
+ <svn refid="svn.settings">
+ <checkout
url="http://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.revision}" destPath="${red5.server.dir}" />
+ </svn>
+ <subant target="dist">
+ <fileset dir="${red5.server.dir}" includes="build.xml"/>
+ </subant>
+ <echo message="JAVAEE: ${red5.server.lib}/javaee-api-5.1.2.jar"
/>
+ <jar destfile="${red5.server.lib}/javaee-api-5.1.2.om.jar">
+ <zipfileset src="${red5.server.lib}/javaee-api-5.1.2.jar"
excludes="javax/persistence/**/*.*"/>
+ </jar>
+ <delete file="${red5.server.lib}/javaee-api-5.1.2.jar" />
+ <delete dir="${red5.lib}/webapps/installer"/>
+ <delete dir="${red5.lib}/webapps/live"/>
+ <delete dir="${red5.lib}/webapps/vod"/>
+ <copy file="${webcontent.src.dir}/red5/jee-container.xml"
todir="${red5.lib}/conf" />
+ <copy file="${webcontent.src.dir}/red5/index.html"
todir="${red5.lib}/webapps/root" />
+ </target>
+ <!-- Check for the Top level libraries -->
+ <target name="-retrieve-mainlibs" unless="mainlib.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5">
<!-- Ivy configuration -
http://ant.apache.org/ivy/history/trunk/ant.html -->
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
- <param name="ivy.conf.name" value="red5"/>
- <param name="ivy.lib.location" value="${red5.lib.dir}"/>
+ <param name="ivy.conf.name" value="mainlib"/>
+ <param name="ivy.lib.location"
value="${mainlibs.lib.dir}"/>
</antcall>
- <jar destfile="${red5.lib.dir}/javaee-api-5.1.2.om.jar">
- <zipfileset src="${red5.lib.dir}/javaee-api-5.1.2.jar"
excludes="javax/persistence/**/*.*"/>
- </jar>
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
- <param name="ivy.conf.name" value="red5.ext"/>
- <param name="ivy.lib.location" value="${red5.lib.dir}"/>
+ <param name="ivy.conf.name" value="mainlib.ext"/>
+ <param name="ivy.lib.location"
value="${mainlibs.lib.dir}"/>
<param name="ivy.lib.pattern"
value="[artifact]-[type]-[revision].[ext]"/>
</antcall>
<delete>
- <fileset dir="${red5.lib.dir}"
includes="*-source*.jar"/>
- <fileset dir="${red5.lib.dir}"
includes="*-javadoc*.jar"/>
+ <fileset dir="${mainlibs.lib.dir}"
includes="*-source*.jar"/>
+ <fileset dir="${mainlibs.lib.dir}"
includes="*-javadoc*.jar"/>
</delete>
- <delete file="${red5.lib.dir}/javaee-api-5.1.2.jar" />
</target>
- <!-- Check for the Red5 libraries -->
+ <!-- Check for the OM libraries -->
<target name="-retrieve-om" unless="om.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
<param name="ivy.conf.name" value="openmeetings"/>
@@ -835,7 +854,7 @@
</delete>
</target>
<!-- Check for the Anakia libraries -->
- <target name="-retrieve-anakia" unless="anakia.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5">
+ <target name="-retrieve-anakia" unless="anakia.installed"
description="Retrieves the libraries if needed" depends="-retrieve-mainlibs">
<antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
<param name="ivy.conf.name" value="anakia"/>
<param name="ivy.lib.location"
value="${anakia.lib.dir}"/>
@@ -899,11 +918,12 @@
<ivy:cleancache/>
</target>
- <target name="prepare-eclipse" if="java6.installed" description="Build
server core" depends="-java6.check">
- <antcall target="-retrieve-red5" inheritAll="true"
inheritRefs="true"/>
+ <target name="prepare-eclipse" if="java6.installed" description="Layout
various files necessary for development" depends="-java6.check">
+ <antcall target="-retrieve-mainlibs" inheritAll="true"
inheritRefs="true"/>
<antcall target="-retrieve-om" inheritAll="true"
inheritRefs="true"/>
<antcall target="-retrieve-junit" inheritAll="true"
inheritRefs="true"/>
<antcall target="-retrieve-dtd-generator" inheritAll="true"
inheritRefs="true"/>
<antcall target="-retrieve-tools.jar" inheritAll="true"
inheritRefs="true"/>
+ <antcall target="-retrieve-openlaszlo" inheritAll="true"
inheritRefs="true"/>
</target>
</project>
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1296672&r1=1296671&r2=1296672&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Sat Mar 3 17:44:05 2012
@@ -18,8 +18,8 @@
<info organisation="apache" module="openmeetings" />
<configurations defaultconfmapping="default">
<conf name="default" />
- <conf name="red5" extends="default" description="Red5 required
libraries" />
- <conf name="red5.ext" description="Red5 required libraries with
different pattern" />
+ <conf name="mainlib" extends="default" description="Top level
libraries" />
+ <conf name="mainlib.ext" description="Top level libraries with
different pattern" />
<conf name="openmeetings" description="Openmeetings required
libraries" />
<conf name="anakia" description="Openmeetings required
libraries" />
<conf name="openmeetings.ext" description="Openmeetings
required libraries with different pattern" />
@@ -31,30 +31,13 @@
<conf name="openlaszlo" description="Openlaszlo dependencies" />
</configurations>
<dependencies>
- <!-- START OF RED5 -->
- <dependency org="javax" name="javaee-api" rev="5.1.2" />
- <!-- Spring -->
+ <!-- START OF mainlib -->
<dependency org="org.springframework"
name="org.springframework.aop" rev="3.0.6.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.asm" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="org.springframework"
name="org.springframework.aspects" rev="3.0.6.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.beans" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="org.springframework"
name="org.springframework.context" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="org.springframework"
name="org.springframework.core" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
- <dependency org="org.springframework"
name="org.springframework.expression" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="org.springframework"
name="org.springframework.jdbc" rev="3.0.6.RELEASE" transitive="false">
<include type="jar" />
</dependency>
@@ -64,9 +47,6 @@
<dependency org="org.springframework"
name="org.springframework.transaction" rev="3.0.6.RELEASE" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.springframework"
name="org.springframework.web" rev="3.0.6.RELEASE" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="org.springframework"
name="org.springframework.web.servlet" rev="3.0.6.RELEASE" transitive="false">
<include type="jar" />
</dependency>
@@ -76,59 +56,10 @@
<dependency org="cglib" name="cglib" rev="2.2.2"
transitive="false">
<include type="jar" />
</dependency>
- <!-- Logging -->
- <dependency org="org.slf4j" name="com.springsource.slf4j.api"
rev="1.6.1" transitive="false" />
- <dependency org="org.slf4j"
name="com.springsource.slf4j.bridge" rev="1.6.1" transitive="false" />
- <dependency name="jul-to-slf4j" rev="1.6.1" />
- <dependency name="log4j-over-slf4j" rev="1.6.1" />
- <dependency name="jcl-over-slf4j" rev="1.6.1" />
- <dependency name="logback-classic" rev="0.9.28" />
- <dependency name="logback-core" rev="0.9.28" />
- <!-- General -->
- <dependency org="org.apache.commons" name="commons-beanutils"
rev="1.8.3" />
- <dependency org="org.apache.commons" name="commons-codec"
rev="1.6" />
- <dependency org="org.apache.commons" name="commons-collections"
rev="3.2.1" />
- <dependency org="commons" name="httpcore" rev="4.1.3" />
- <dependency org="commons" name="httpclient" rev="4.1.2" />
- <dependency org="org.apache.commons" name="commons-lang3"
rev="3.1" />
- <dependency org="org.apache.commons" name="commons-modeler"
rev="2.0.1" />
- <dependency org="org.apache.commons" name="commons-pool"
rev="1.5.6" />
- <dependency org="org.quartz-scheduler" name="quartz"
rev="1.8.5" />
- <dependency org="net.sf.ehcache" name="ehcache-core"
rev="2.5.0" />
- <!-- XML -->
- <dependency org="org.apache.xerces"
name="com.springsource.org.apache.xerces" rev="2.9.1" />
- <dependency name="xmlrpc" rev="2.0.1" />
- <!-- Mina -->
- <dependency org="mina" name="mina-integration-beans"
rev="2.0.4" />
- <dependency org="mina" name="mina-integration-jmx" rev="2.0.4"
/>
- <dependency org="mina" name="mina-core" rev="2.0.4" />
- <!-- Scripting -->
- <dependency org="org.objectweb.asm"
name="com.springsource.org.objectweb.asm"
- rev="3.2.0" transitive="false" />
- <dependency org="org.objectweb.asm"
- name="com.springsource.org.objectweb.asm.commons"
rev="3.2.0"
- transitive="false" />
- <dependency org="org.antlr" name="com.springsource.org.antlr"
- rev="3.1.3" transitive="false" />
- <dependency org="org.codehaus.groovy"
name="com.springsource.org.codehaus.groovy"
- rev="1.7.0" transitive="false" />
- <dependency name="jruby-complete" rev="1.1.6" />
- <dependency name="jython" rev="2.5" />
- <dependency org="org.mozilla.javascript"
name="com.springsource.org.mozilla.javascript"
- rev="1.7.0.R2" transitive="false" />
- <dependency org="javax.xml.stream"
name="com.springsource.javax.xml.stream"
- rev="1.0.1" transitive="false" />
- <dependency org="org.springframework"
name="spring-context-support"
- rev="3.0.6.RELEASE" />
- <!-- Crypto -->
- <dependency name="bcprov-jdk16" rev="145" conf="red5->*" />
- <!-- MP3 -->
- <dependency name="jaudiotagger" rev="2.0.4-SNAPSHOT" />
-
<!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
<dependency org="org.apache.geronimo.specs"
name="geronimo-jpa_2.0_spec"
- rev="1.1" conf="red5.ext->*" transitive="false"/>
- <!-- END OF RED5 -->
+ rev="1.1" conf="mainlib.ext->*" transitive="false"/>
+ <!-- END OF mainlib -->
<!-- START OF ANAKIA -->
<dependency org="org.jdom" name="jdom" rev="1.1"
conf="anakia->*" transitive="false">
Modified: incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1296672&r1=1296671&r2=1296672&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivysettings.xml Sat Mar 3
17:44:05 2012
@@ -24,17 +24,7 @@
<url name="mavencentral">
<artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
</url>
- <url name="apache">
- <artifact
pattern="https://repository.apache.org/content/repositories/releases/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
- <artifact
pattern="https://repository.apache.org/content/repositories/releases/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
- </url>
- <url name="sonatype">
- <artifact
pattern="http://oss.sonatype.org/content/repositories/sourceforge-releases/[organisation]/[artifact]-[revision].[ext]";
/>
- <artifact
pattern="http://oss.sonatype.org/content/repositories/central/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
- </url>
<url name="googlecode">
- <artifact
pattern="http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
<artifact
pattern="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
</url>
</chain>
Propchange: incubator/openmeetings/trunk/singlewebapp/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 3 17:44:05 2012
@@ -2,7 +2,7 @@ dtd-generator
red5-screenshare
-red5
+mainlibs
om
