[gwt-contrib] [google-web-toolkit commit] r4222 - in releases/1.6/user/src/com/google/gwt: junit/tools user/tools

[codesite-noreply]

Author: [EMAIL PROTECTED]
Date: Tue Dec  2 09:12:50 2008
New Revision: 4222

Modified:
    releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-hosted.launchsrc
    releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-web.launchsrc
    releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc
    releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java
    releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc

Log:
This patch fixes issue 1816 and a similar bug with applicationCreator on  
Mac.

Patch by: amitmanjhi
Review by: jat (TBR)



Modified:  
releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-hosted.launchsrc
==============================================================================
--- releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-hosted.launchsrc     
 
(original)
+++ releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-hosted.launchsrc     
 
Tue Dec  2 09:12:50 2008
@@ -13,6 +13,6 @@
  @eclipseExtraLaunchPaths
  </listAttribute>
  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"  
value="@projectName"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="-Dgwt.args=&quot;-out www-test&quot; -Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="-Dgwt.args=&quot;-out www-test&quot; -Xmx256M @vmargs"/>
  <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"  
value="true"/>
  </launchConfiguration>

Modified:  
releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-web.launchsrc
==============================================================================
--- releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-web.launchsrc        
 
(original)
+++ releases/1.6/user/src/com/google/gwt/junit/tools/JUnit-web.launchsrc        
 
Tue Dec  2 09:12:50 2008
@@ -13,6 +13,6 @@
  @eclipseExtraLaunchPaths
  </listAttribute>
  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"  
value="@projectName"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="-Dgwt.args=&quot;-web -out www-test&quot; -Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="-Dgwt.args=&quot;-web -out www-test&quot; -Xmx256M @vmargs"/>
  <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"  
value="true"/>
  </launchConfiguration>

Modified: releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc       
(original)
+++ releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc       Tue Dec 
  
2 09:12:50 2008
@@ -9,7 +9,7 @@
  <listEntry value="&lt;?xml version=&quot;1.0&quot;  
encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry  
externalArchive=&quot;@gwtDevPath&quot; path=&quot;3&quot;  
type=&quot;2&quot;/&gt;&#13;&#10;"/>
  @eclipseExtraLaunchPaths
  </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="@vmargs -Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="@eclipseVmargs -Xmx256M"/>
  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"  
value="-out
    war -startupUrl @startupUrl @moduleName"/>
  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"  
value="@projectName"/>

Modified:  
releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java     
 
(original)
+++ releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java     
 
Tue Dec  2 09:12:50 2008
@@ -309,6 +309,7 @@
      replacements.put("@startupUrl", startupUrl);
      replacements.put("@vmargs", isMacOsX
          ? "<jvmarg value=\"-XstartOnFirstThread\"/>" : "");
+    replacements.put("@eclipseVmargs",  
isMacOsX ? "-XstartOnFirstThread" : "");
      replacements.put("@eclipseExtraLaunchPaths",
          CreatorUtilities.createEclipseExtraLaunchPaths(extraClassPaths));
      replacements.put("@extraModuleInherits",

Modified: releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc   
(original)
+++ releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc  Tue  
Dec  2 09:12:50 2008
@@ -50,6 +50,7 @@
          <pathelement path="${java.class.path}/"/>
          <pathelement path="@gwtUserPath"/>
        </classpath>
+      <jvmarg value="-Xmx256M"/>
        @vmargs
        <arg value="-out"/>
        <arg file="${outdir}"/>
@@ -63,13 +64,13 @@
    <target name="shell" depends="javac" description="Run the deployed app  
in GWT hosted mode">
      <java failonerror="true" fork="true"
            classname="@shellClass">
-      <jvmarg value="-Xmx256M"/>
        <classpath>
          <pathelement location="src"/>
          <pathelement location="@gwtDevPath"/>
          <pathelement path="${java.class.path}/"/>
          <pathelement path="@gwtUserPath"/>
        </classpath>
+      <jvmarg value="-Xmx256M"/>
        @vmargs
        <arg value="-out"/>
        <arg file="${outdir}"/>

--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---