[Red5commits] [1742] removed old code and placed a message about where to get the WAR from in the fut
pgregoire
luke at codegent.com
Thu Feb 22 18:20:10 EST 2007
removed old code and placed a message about where to get the WAR from in the future
Timestamp: 02/22/07 18:15:48 EST (less than one hour ago)
Change: 1742
Author: pgregoire
Files (see diff or trac for details):
java/war/trunk/.classpath
java/war/trunk/.project
java/war/trunk/.settings
java/war/trunk/.springBeans
java/war/trunk/README.txt
java/war/trunk/build.properties
java/war/trunk/build.xml
java/war/trunk/lib
java/war/trunk/license.txt
java/war/trunk/src
java/war/trunk/www
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1742
Index: /java/war/trunk/README.txt
===================================================================
--- /java/war/trunk/README.txt (revision 1742)
+++ /java/war/trunk/README.txt (revision 1742)
@@ -0,0 +1,5 @@
+This code / location is deprecated, please checkout the main server trunk and build the WAR with the following command
+ant webwar
+
+Thanks,
+Paul
Index: /va/war/trunk/.classpath
===================================================================
--- /java/war/trunk/.classpath (revision 1733)
+++ (revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding=".svn/*" kind="src" path="src"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jpda.jar"/>
- <classpathentry kind="lib" path="lib/commons-collections.jar"/>
- <classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5.20"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
- <classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
- <classpathentry kind="lib" path="lib/aopalliance.jar"/>
- <classpathentry kind="lib" path="lib/asm-2.2.2.jar"/>
- <classpathentry kind="lib" path="lib/cglib-nodep-2.1_3.jar"/>
- <classpathentry kind="lib" path="lib/commons-modeler.jar"/>
- <classpathentry kind="lib" path="lib/commons-pool-1.3.jar"/>
- <classpathentry kind="lib" path="lib/spring-aop.jar"/>
- <classpathentry kind="lib" path="lib/spring-beans.jar" sourcepath="D:/dev/shared/spring-framework-2.0/src"/>
- <classpathentry kind="lib" path="lib/spring-context.jar" sourcepath="D:/dev/shared/spring-framework-2.0/src"/>
- <classpathentry kind="lib" path="lib/spring-core.jar" sourcepath="D:/dev/shared/spring-framework-2.0/src"/>
- <classpathentry kind="lib" path="lib/spring-support.jar" sourcepath="D:/dev/shared/spring-framework-2.0/src"/>
- <classpathentry kind="lib" path="lib/spring-web.jar" sourcepath="D:/dev/shared/spring-framework-2.0/src"/>
- <classpathentry kind="lib" path="lib/xercesImpl-2.8.1.jar"/>
- <classpathentry kind="lib" path="lib/xmlParserAPIs-2.8.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
- <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/>
- <classpathentry kind="lib" path="lib/ehcache-1.2.3.jar"/>
- <classpathentry kind="lib" path="lib/whirlycache-1.0.1_lite.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/xbean.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/bsh-2.0b4.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/groovy-1.0.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/jruby.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/jsr173_1.0_api.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/jta.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/judo.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/jython.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/mina-core-2.0.0-M1.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/mina-filter-compression-2.0.0-M1.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/mina-filter-ssl-2.0.0-M1.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/mina-integration-spring-2.0.0-M1.jar"/>
- <classpathentry kind="lib" path="C:/dev/other/red5_dev/war/lib/quartz-1.6.0.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Extended"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java6"/>
- <classpathentry kind="output" path="www/WEB-INF/classes"/>
-</classpath>
Index: /va/war/trunk/license.txt
===================================================================
--- /java/war/trunk/license.txt (revision 1479)
+++ (revision )
@@ -1,29 +1,0 @@
-RED5 Open Source Flash Server - http://www.osflash.org/red5
-
-Copyright © 2006 by respective authors (see below). All rights reserved.
-
-This library is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2.1 of the License, or (at your option) any later
-version.
-
-This library is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this library; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-The Red5 Project (red5 at osflash.org)
-Luke Hubbard (luke at codegent.com)
-Dominick Accattato (daccattato at gmail.com)
-Chris Allen (mrchrisallen at gmail.com)
-Joachim Bauch (jojo at struktur.de)
-Mick Herres (mickherres at hotmail.com)
-John Grden (johng at acmewebworks.com)
-Grant Davies (grant at bluetube.com)
-Steven Elliott (steven.s.elliott at gmail.com)
-Jokul Tian (tianxuefeng at gmail.com)
-Steven Gong (steven.gong at gmail.com)
-Paul Gregoire (mondain at gmail.com)
Index: /va/war/trunk/.project
===================================================================
--- /java/war/trunk/.project (revision 1733)
+++ (revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>red5_server_war</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.jutils.lint4j.core.Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>com.jutils.lint4j.core.Nature</nature>
- </natures>
-</projectDescription>
Index: /va/war/trunk/.springBeans
===================================================================
--- /java/war/trunk/.springBeans (revision 1482)
+++ (revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <configExtensions>
- <configExtension>xml</configExtension>
- </configExtensions>
- <configs>
- <config>www/WEB-INF/red5-common.xml</config>
- <config>www/WEB-INF/red5-core.xml</config>
- <config>www/WEB-INF/beanRefContext.xml</config>
- <config>www/WEB-INF/ofla-context.xml</config>
- <config>www/WEB-INF/applicationContext.xml</config>
- <config>conf/global.xml</config>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
Index: /va/war/trunk/build.properties
===================================================================
--- /java/war/trunk/build.properties (revision 1733)
+++ (revision )
@@ -1,27 +1,0 @@
-#
-# Base build properties
-#
-
-#javac options
-# http://ant.apache.org/manual/CoreTasks/javac.html
-# sun javac
-build.compiler=modern
-# jikes
-#build.compiler=jikes
-
-# generic compiler options
-build.verbose=false
-build.fork=true
-build.deprecation=false
-build.nowarn=true
-
-# optimize only works with a few compilers
-build.optimize=true
-
-# Change this var to build to a different Java version
-java.target_version=1.6
-
-# jikes options
-build.compiler.emacs=false
-build.compiler.fulldepend=false
-build.compiler.pedantic=false
Index: /va/war/trunk/build.xml
===================================================================
--- /java/war/trunk/build.xml (revision 1733)
+++ (revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0"?>
-<project name="RED5WAR" basedir="." default="all">
-
- <!-- user overides for project properties
- <property file="${user.home}/ant.properties" /> -->
- <!-- base project properties -->
- <property file="build.properties" />
-
- <!-- project properties -->
- <property environment="env"/>
-
- <property name="java.home" value="${env.JAVA_HOME}"/>
-
- <property name="src.dir" value="src"/>
- <property name="dist.dir" value="dist"/>
- <property name="lib.dir" value="lib"/>
- <property name="build.dir" value="build"/>
- <property name="classes.dir" value="${build.dir}/WEB-INF/classes"/>
- <property name="debug.state" value="true"/>
-
- <path id="project.classpath">
- <fileset dir="${lib.dir}" includesfile="${lib.dir}/library.properties" />
- </path>
-
- <path id="script.classpath">
- <fileset dir="${lib.dir}" includesfile="${lib.dir}/script.properties" />
- <pathelement location="${bin.dir}"/>
- </path>
-
- <echo>java.home is ${java.home} and the target version is ${java.target_version}</echo>
-
- <!-- setup the directories for building -->
-
- <target name="prepare">
- <mkdir dir="${classes.dir}"/>
- <mkdir dir="${dist.dir}"/>
- </target>
-
- <!-- do a clean -->
-
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <condition property="java.target_version" value="1.6">
- <not>
- <isset property="java.target_version" />
- </not>
- </condition>
- <echo message="Javac version: ${java.target_version}" />
-
- <condition property="compiler" value="${build.compiler}${java.target_version}">
- <equals arg1="${build.compiler}" arg2="javac" />
- </condition>
- <property name="compiler" value="${build.compiler}" />
- <echo message="Compiler adapter name: ${compiler}" />
-
- <javac
- sourcepath=""
- srcdir="${src.dir}"
- destdir="${classes.dir}"
- classpathref="project.classpath"
-
- optimize="${build.optimize}"
- verbose="${build.verbose}"
- fork="${build.fork}"
- nowarn="${build.nowarn}"
- deprecation="${build.deprecation}"
-
- debug="${debug.state}"
- compiler="${compiler}"
- source="${java.target_version}"
- target="${java.target_version}"
- memoryMaximumSize="1024m"
- excludes="**/*.jsp,com/sun/**,org/red5/server/script/**"
- listfiles="false"
- />
-
- <javac
- sourcepath=""
- srcdir="${src.dir}"
- destdir="${classes.dir}"
- classpathref="script.classpath"
-
- optimize="${build.optimize}"
- verbose="${build.verbose}"
- fork="${build.fork}"
- nowarn="${build.nowarn}"
- deprecation="${build.deprecation}"
-
- debug="${debug.state}"
- compiler="${compiler}"
- source="${java.target_version}"
- target="${java.target_version}"
- memoryMaximumSize="1024m"
- listfiles="false"
- />
-
- </target>
-
- <target name="webwar" description="Make Web Archive" depends="compile">
- <tstamp prefix="build">
- <format property="TODAY" pattern="d-MMMM-yyyy" locale="en" />
- </tstamp>
- <copy todir="${build.dir}">
- <fileset dir=".">
- <include name="license.txt"/>
- </fileset>
- </copy>
- <copy todir="${build.dir}/WEB-INF">
- <fileset dir="www/WEB-INF">
- <include name="*.xml"/>
- <include name="*.properties"/>
- <exclude name="web.xml"/>
- </fileset>
- </copy>
- <copy todir="${build.dir}">
- <fileset dir="www">
- <include name="**/*.html"/>
- <include name="**/*.jsp"/>
- <include name="**/*.js"/>
- <include name="**/*.css"/>
- <include name="**/*.ico"/>
- <include name="**/*.swf"/>
- <include name="**/*.flv"/>
- <exclude name="WEB-INF"/>
- </fileset>
- </copy>
- <war destfile="${dist.dir}/red5.war" webxml="www/WEB-INF/web.xml">
- <fileset dir="${build.dir}"/>
- <lib dir="${lib.dir}">
- <exclude name="ext/**"/>
- <exclude name="*.properties"/>
- <exclude name="servlet-api-2.5.jar"/>
- <exclude name="ehcache-1.2.3.jar"/>
- <exclude name="whirlycache-1.0.1_lite.jar"/>
- </lib>
- <manifest>
- <attribute name="Built-By" value="RED5 Project - red5 at osflash.org" />
- <attribute name="Built-On" value="${build.TODAY}" />
- </manifest>
- </war>
- <delete dir="${build}" />
- </target>
-
- <target name="all" depends="clean, prepare, compile, webwar"/>
-
- <target name="usage">
- <echo message="Type ant -p for available targets" />
- </target>
-
-</project>
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list