Revision: 6840 Author: [email protected] Date: Wed Nov 11 08:33:29 2009 Log: Merge tr...@6839 to disable MHTML support in ClientBundle. $ svn merge --ignore-ancestry -c6839 https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6840 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/resources/Resources.gwt.xml ======================================= --- /releases/2.0/branch-info.txt Wed Nov 11 08:23:47 2009 +++ /releases/2.0/branch-info.txt Wed Nov 11 08:33:29 2009 @@ -540,4 +540,7 @@ svn merge --ignore-ancestry -c6836 \ http://google-web-toolkit.googlecode.com/svn/trunk/ . - +tr...@6839 was merged into this branch + Disable MHTML support for GWT 2.0, there are too many sharp edges. + svn merge --ignore-ancestry -c6839 https://google-web-toolkit.googlecode.com/svn/trunk/ . + ======================================= --- /releases/2.0/user/src/com/google/gwt/resources/Resources.gwt.xml Sat Oct 10 13:50:11 2009 +++ /releases/2.0/user/src/com/google/gwt/resources/Resources.gwt.xml Wed Nov 11 08:33:29 2009 @@ -34,24 +34,6 @@ class="com.google.gwt.resources.client.ClientBundle" /> </generate-with> - <!-- Last-matches wins, so this will selectively override the previous rule --> - <generate-with - class="com.google.gwt.resources.rebind.context.MhtmlClientBundleGenerator"> - - <!-- We have a number of conditions that must be satisfied --> - <all> - <!-- Is inlining enabled? --> - <when-property-is name="ClientBundle.enableInlining" value="true" /> - - <!-- Again, it's necessary to specify which types the generator runs on --> - <when-type-assignable - class="com.google.gwt.resources.client.ClientBundle" /> - - <!-- Do this only with IE6 browsers --> - <when-property-is name="user.agent" value="ie6" /> - </all> - </generate-with> - <!-- Last-matches wins, so this will selectively override the previous rule --> <generate-with class="com.google.gwt.resources.rebind.context.InlineClientBundleGenerator"> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
