Revision: 6573 Author: rj...@google.com Date: Fri Oct 30 16:12:45 2009 Log: tr...@6570 was merged into this branch Fixing the UiBinderTestApp svn merge --ignore-ancestry -c 6572 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=6573 Added: /releases/2.0/user/test/com/google/gwt/uibinder/test/public/UiBinderTestApp.html Deleted: /releases/2.0/user/test/com/google/gwt/uibinder/test/public/UiBinderDemo.html Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/uibinder/UiBinder.gwt.xml /releases/2.0/user/test/com/google/gwt/uibinder/test/UiBinderTestApp.gwt.xml ======================================= --- /dev/null +++ /releases/2.0/user/test/com/google/gwt/uibinder/test/public/UiBinderTestApp.html Fri Oct 30 16:12:45 2009 @@ -0,0 +1,21 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!-- --> +<!-- Copyright 2008 Google Inc. --> +<!-- Licensed under the Apache License, Version 2.0 (the "License"); you --> +<!-- may not use this file except in compliance with the License. You may --> +<!-- may obtain a copy of the License at --> +<!-- --> +<!-- http://www.apache.org/licenses/LICENSE-2.0 --> +<!-- --> +<!-- Unless required by applicable law or agreed to in writing, software --> +<!-- distributed under the License is distributed on an "AS IS" BASIS, --> +<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or --> +<!-- implied. License for the specific language governing permissions and --> +<!-- limitations under the License. --> +<html> + <head></head> + <body> + <script language='javascript' src='com.google.gwt.uibinder.test.UiBinderTestApp.nocache.js'></script> + </body> +</html> ======================================= --- /releases/2.0/user/test/com/google/gwt/uibinder/test/public/UiBinderDemo.html Thu Oct 29 22:34:03 2009 +++ /dev/null @@ -1,21 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<!-- --> -<!-- Copyright 2008 Google Inc. --> -<!-- Licensed under the Apache License, Version 2.0 (the "License"); you --> -<!-- may not use this file except in compliance with the License. You may --> -<!-- may obtain a copy of the License at --> -<!-- --> -<!-- http://www.apache.org/licenses/LICENSE-2.0 --> -<!-- --> -<!-- Unless required by applicable law or agreed to in writing, software --> -<!-- distributed under the License is distributed on an "AS IS" BASIS, --> -<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or --> -<!-- implied. License for the specific language governing permissions and --> -<!-- limitations under the License. --> -<html> - <head></head> - <body> - <script language='javascript' src='com.google.gwt.uibinder.sample.UiBinderDemo.nocache.js'></script> - </body> -</html> ======================================= --- /releases/2.0/branch-info.txt Fri Oct 30 14:33:17 2009 +++ /releases/2.0/branch-info.txt Fri Oct 30 16:12:45 2009 @@ -143,3 +143,6 @@ Revert r6456 because it was causing JUnitShell to wait indefinitely. svn merge --ignore-ancestry -c 6570 http://google-web-toolkit.googlecode.com/svn/trunk/ . +tr...@6570 was merged into this branch + Fixing the UiBinderTestApp + svn merge --ignore-ancestry -c 6572 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/user/src/com/google/gwt/uibinder/UiBinder.gwt.xml Wed Aug 5 20:27:52 2009 +++ /releases/2.0/user/src/com/google/gwt/uibinder/UiBinder.gwt.xml Fri Oct 30 16:12:45 2009 @@ -14,8 +14,7 @@ <!-- GWT UI Binder support. --> <module> - <!-- Inheriting the debug module --> - <inherits name="com.google.gwt.debug.Debug"/> + <inherits name="com.google.gwt.resources.Resources" /> <generate-with class="com.google.gwt.uibinder.rebind.UiBinderGenerator"> <when-type-assignable class="com.google.gwt.uibinder.client.UiBinder"/> ======================================= --- /releases/2.0/user/test/com/google/gwt/uibinder/test/UiBinderTestApp.gwt.xml Thu Oct 29 22:34:03 2009 +++ /releases/2.0/user/test/com/google/gwt/uibinder/test/UiBinderTestApp.gwt.xml Fri Oct 30 16:12:45 2009 @@ -13,7 +13,7 @@ <!-- GWT UiBinder support. --> <module> - <inherits name="com.google.gwt.resources.Resources" /> <inherits name="com.google.gwt.uibinder.UiBinder" /> - <entry-point class="com.google.gwt.uibinder.sample.client.UiBinderTestApp" /> + <inherits name="com.google.gwt.debug.Debug"/> + <entry-point class="com.google.gwt.uibinder.test.client.UiBinderTestApp" /> </module> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
