[Smartfrog-checkins] SF.net SVN: smartfrog: [4397] trunk/core

[<st...@us...>]

Revision: 4397
          http://svn.sourceforge.net/smartfrog/?rev=4397&view=rev
Author:   steve_l
Date:     2007-06-22 06:49:50 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
SFOS-167: set default memory allocation of rmic and javac to 192m

Modified Paths:
--------------
    trunk/core/common.xml
    trunk/core/smartfrog/build.xml
    trunk/core/smartfrog/ivyconf.xml

Modified: trunk/core/common.xml
===================================================================
--- trunk/core/common.xml	2007-06-22 13:27:23 UTC (rev 4396)
+++ trunk/core/common.xml	2007-06-22 13:49:50 UTC (rev 4397)
@@ -90,11 +90,15 @@
     <property name="javac.debug.level" value="lines,vars,source" />
     <property name="javac.java.version" value="1.4" />
     <property name="javac.include.ant" value="false" />
+    <property name="javac.max.memory" value="192m" />
 
     <property name="smartfrog.daemon.port" value="3800" />
-    <!--use the forking compiler-->
+    <!--use the forking compiler with tuned memory use and profiling diagnostics-->
     <property name="rmic.compiler" value="forking"/>
-
+    <property name="rmic.max.memory" value="192m" />
+    <property name="rmic.forking.commandline.extras" value="" />
+    <property name="rmic.forking.commandline" 
+      value="-J-Xmx${rmic.max.memory} -J-XX:+HeapDumpOnOutOfMemoryError ${rmic.forking.commandline.extras}"/>
     
     <property name="extras.dir"
       location="${core.dir}/extras"/>
@@ -338,6 +342,7 @@
             source="${javac.java.version}"
             target="${javac.java.version}"
             includeAntRuntime="${javac.include.ant}"
+            memoryMaximumSize="${javac.max.memory}"
             includes="**/*.java"
             >
        </javac>
@@ -480,7 +485,9 @@
       <rmic
         compiler="${rmic.compiler}"
         verify="true"
-        stubversion="1.2" />
+        stubversion="1.2" >
+        <compilerarg line="${rmic.forking.commandline}" compiler="forking" /> 
+      </rmic>
     </presetdef>
   </target>
 

Modified: trunk/core/smartfrog/build.xml
===================================================================
--- trunk/core/smartfrog/build.xml	2007-06-22 13:27:23 UTC (rev 4396)
+++ trunk/core/smartfrog/build.xml	2007-06-22 13:49:50 UTC (rev 4397)
@@ -154,7 +154,6 @@
   <!--property name="redist" value="redist"/ -->
   <property name="examplesFiles" value="org/smartfrog/examples/**/*"/>
 
-  <property name="rmic.compiler" value="forking"/>
 
   <!-- Compile options for Smartfrog Release -->
   <property name="javac.debug.mode" value="on"/>
@@ -163,6 +162,15 @@
   <property name="javac.java.version" value="1.4"/>
   <property name="build.compiler" value="modern"/>
   <property name="javac.compiler" value="${build.compiler}"/>
+  <property name="javac.max.memory" value="192m" />
+    
+  <!--use the forking compiler with tuned memory use and profiling diagnostics-->
+  <property name="rmic.compiler" value="forking"/>
+  <property name="rmic.max.memory" value="192m" />
+  <property name="rmic.forking.commandline.extras" value="" />
+  <property name="rmic.forking.commandline" 
+    value="-J-Xmx${rmic.max.memory} -J-XX:+HeapDumpOnOutOfMemoryError ${rmic.forking.commandline.extras}"/>
+ 
   <!-- override point for javacc -->
   <property name="javacc.dir" location="javacc"/>
   <!-- Security related files -->
@@ -295,10 +303,17 @@
   <target name="compile-source" depends="initbuild,createParser" description="Compiles the source code">
     <!-- Compile the java code -->
     <echo level="verbose">${javac.java.version} build.compiler=${build.compiler} javac.compiler=${javac.compiler}</echo>
-    <javac compiler="${javac.compiler}" srcdir="${src.dir}"
-      includes="**/*.java" destdir="${build.classes.dir}"
-      debug="${javac.debug.mode}" debuglevel="${javac.debug.level}"
-      includeAntRuntime="false" source="${javac.java.version}" target="${javac.java.version}">
+    <javac compiler="${javac.compiler}" 
+      srcdir="${src.dir}"
+      includes="**/*.java" 
+      destdir="${build.classes.dir}"
+      debug="${javac.debug.mode}"
+      debuglevel="${javac.debug.level}"
+      includeAntRuntime="false" 
+      source="${javac.java.version}" 
+      target="${javac.java.version}"
+      memoryMaximumSize="${javac.max.memory}"
+      >
       <classpath refid="smartfrog.class.path"/>
     </javac>
   </target>
@@ -309,12 +324,13 @@
   <!-- =================================================================== -->
   <target name="rmi" depends="compile-source" description="create the RMI classes">
       <rmic
-          stubversion="1.2"
-          base="${build.classes.dir}"
-          verify="true"
-          compiler="${rmic.compiler}"
-          includes="**/*.class">
-          <classpath refid="smartfrog.class.path"/>
+        stubversion="1.2"
+        base="${build.classes.dir}"
+        verify="true"
+        compiler="${rmic.compiler}"
+        includes="**/*.class">
+        <classpath refid="smartfrog.class.path"/>
+        <compilerarg line="${rmic.forking.commandline}" compiler="forking" />
       </rmic>
   </target>
 

Modified: trunk/core/smartfrog/ivyconf.xml
===================================================================
--- trunk/core/smartfrog/ivyconf.xml	2007-06-22 13:27:23 UTC (rev 4396)
+++ trunk/core/smartfrog/ivyconf.xml	2007-06-22 13:49:50 UTC (rev 4397)
@@ -42,6 +42,6 @@
     </chain>
   </resolvers>
   <modules>
-    <module organisation="org.antbook" name=".*" resolver="internal"/>
+    <module organisation="org.smartfrog" name=".*" resolver="internal"/>
   </modules>
 </ivyconf>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.