[Red5commits] [1703] updates to fix compilation problems with Java5

[jbauch]

updates to fix compilation problems with Java5


Timestamp: 02/07/07 15:59:02 EST (less than one hour ago) 
Change: 1703 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/build.xml
java/server/trunk/lib/java6.properties


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1703

Index: /java/server/trunk/build.xml
===================================================================
--- /java/server/trunk/build.xml (revision 1698)
+++ /java/server/trunk/build.xml (revision 1703)
@@ -37,5 +37,5 @@
     <!-- For use with pre-java6 environment -->
 	<path id="project_compatibility.classpath">
-        <fileset dir="${lib.dir}" includesfile="${lib.dir}/library.properties" />
+        <fileset dir="${lib.dir}" includesfile="${lib.dir}/library.properties" excludesfile="${lib.dir}/java6.properties" />
         <fileset dir="${lib.dir}/java5" includesfile="${lib.dir}/java5/java5.properties" />
 	</path>
@@ -58,4 +58,13 @@
         <fileset dir="${lib.dir}" includesfile="${lib.dir}/library.properties" />
         <fileset dir="${lib.dir}" includesfile="${lib.dir}/script.properties" />
+		<fileset dir="./">
+			<filename name="red5.jar"/>
+		</fileset>
+	</path>
+
+	<path id="full_compatibility.classpath">
+		<fileset dir="${lib.dir}" includesfile="${lib.dir}/library.properties" excludesfile="${lib.dir}/java6.properties" />
+		<fileset dir="${lib.dir}/java5" includesfile="${lib.dir}/java5/java5.properties" />
+		<fileset dir="${lib.dir}" includesfile="${lib.dir}/script.properties" />
 		<fileset dir="./">
 			<filename name="red5.jar"/>
@@ -338,5 +347,5 @@
     </target>
 
-	<target name="javadoc" description="Generate JavaDoc">
+	<target name="javadoc_compatibility" description="Generate JavaDoc" unless="java6.installed">
 	    <echo message="Path: ${env.Path}" />
         <!-- Determine the location of Suns api docs -->
@@ -350,5 +359,52 @@
         </condition>               
 	    <echo message="Javadoc api stub: ${javadoc.loc}" />
-
+        
+		<javadoc
+		        useexternalfile="true"
+		        failonerror="false"
+		        verbose="false"
+				classpathref="full_compatibility.classpath"
+				destdir="${javadoc.dir}"
+				author="true"
+				version="true"
+				use="true"
+				splitindex="true"
+				windowtitle="Red5 Server Documentation">
+
+			<fileset dir="${src.dir}" defaultexcludes="yes">
+				<include name="org/red5/**"/>
+				<exclude name="**/*.xml"/>
+				<exclude name="**/*.xsd"/>
+			</fileset>
+
+			<doctitle><![CDATA[<h1>Red5 Server Documentation</h1>]]></doctitle>
+			<bottom><![CDATA[<i>Copyright &#169; 2006-2007 <a href="http://osflash.org/red5" target="_blank">the Red5 project</a>.</i>]]></bottom>
+			<tag name="todo" scope="all" description="To do:"/>
+			<group title="Public API" packages="org.red5.server.api:org.red5.server.api.*"/>
+			<group title="Network Protocols" packages="org.red5.server.net:org.red5.server.net.*"/>
+			<group title="Streaming" packages="org.red5.server.stream:org.red5.server.stream.*"/>
+			<group title="IO Packages" packages="org.red5.io:org.red5.io.*"/>
+			<group title="Scripting" packages="org.red5.server.script:org.red5.server.script.*"/>
+			<link href="http://java.sun.com/${javadoc.loc}/docs/api"/>
+			<link href="http://jetty.mortbay.org/apidocs"/>
+			<link href="http://directory.apache.org/subprojects/mina/apidocs"/>
+			<link href="http://www.springframework.org/docs/api"/>
+			<link href="http://www.opensymphony.com/quartz/api"/>
+		</javadoc>
+	</target>
+
+	<target name="javadoc" description="Generate JavaDoc" if="java6.installed">
+	    <echo message="Path: ${env.Path}" />
+        <!-- Determine the location of Suns api docs -->
+        <condition property="javadoc.loc" value="javase/6">
+            <equals arg1="${java6.installed}" arg2="true" />
+        </condition>   
+        <condition property="javadoc.loc" value="j2se/1.5.0">
+            <not>
+                <equals arg1="${java6.installed}" arg2="true" />
+            </not>
+        </condition>               
+	    <echo message="Javadoc api stub: ${javadoc.loc}" />
+        
 		<javadoc
 		        useexternalfile="true"
@@ -559,5 +615,5 @@
 	</target>
 
-	<target name="dist" description="Make Binary Distribution" depends="clean, jar, javadoc">
+	<target name="dist" description="Make Binary Distribution" depends="clean, jar, javadoc, javadoc_compatibility">
 		<copy todir="${dist.dir}/doc">
 			<fileset dir="doc"/>
Index: /java/server/trunk/lib/java6.properties
===================================================================
--- /java/server/trunk/lib/java6.properties (revision 1703)
+++ /java/server/trunk/lib/java6.properties (revision 1703)
@@ -0,0 +1,8 @@
+#
+# Java6-only libraries
+#
+# IO
+mina-core-2.0.0-M1.jar
+mina-filter-compression-2.0.0-M1.jar
+mina-filter-ssl-2.0.0-M1.jar
+mina-integration-spring-2.0.0-M1.jar


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.