Turned javac-fork to false. Added initial memory setting to build. Ad…

…ded java6 bundles.

git-svn-id: http://red5.googlecode.com/svn/java/server/trunk@4373 1b6495e4-3631-0410-8e05-8f51eee8b9cc

build.properties

@@ -29,7 +29,7 @@ build.compiler=modern
 
 # generic compiler options
 build.verbose=false
-build.fork=true
+build.fork=false
 build.deprecation=false
 build.nowarn=true
 
@@ -41,7 +41,8 @@ build.optimize=false
 java.target_version=${java.specification.version}
 
 # If your system has less than a megabyte you may need to change this value
-memory.maximum=256m
+memory.maximum=768m
+memory.minimum=128m
 
 # jikes options
 build.compiler.emacs=false

build.xml

@@ -216,7 +216,7 @@
 		<antcall target="retrieve" inheritAll="true" inheritRefs="true">
 			<param name="ivy.conf.name" value="java6"/>
 		</antcall>
-		<javac sourcepath="" srcdir="${src.dir}" destdir="${dest.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}" memoryInitialSize="128m" memoryMaximumSize="${memory.maximum}" excludes="${std_excludes}" listfiles="false" includeantruntime="false"/>
+		<javac sourcepath="" srcdir="${src.dir}" destdir="${dest.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}" memoryInitialSize="${memory.minimum}" memoryMaximumSize="${memory.maximum}" excludes="${std_excludes}" listfiles="false" includeantruntime="false"/>
 		<!-- touch this source file so that the revision number will be updated upon svn commit -->
 		<touch file="${src.dir}/org/red5/server/api/Red5.java"/>
 	</target>
@@ -227,7 +227,7 @@
 		<javac sourcepath="" srcdir="${src.dir}" destdir="${dest.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="${memory.maximum}"
+			 source="${java.target_version}" target="${java.target_version}" memoryInitialSize="${memory.minimum}" memoryMaximumSize="${memory.maximum}"
 			 excludes="${std_excludes}" listfiles="false" includeantruntime="false"/>
 	</target>
 	<macrodef name="build-demo">