1
Description: Allows eucalyptus 1.7 to be compiled with gwt 1.6.4.
2
This patch should be removed when gwt package has been updated to 2.0.*
3
Author: Dmitrii Zagorodnov <dmitrii@eucalyptus.com>
4
Bug: https://launchpad.net/bugs/597330
8
<copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
9
<fileset dir="${deps.lib.dir}">
10
<include name="**/*" />
11
- <exclude name="**/gwt-api-checker-*.jar" />
12
+ <!--exclude name="**/gwt-api-checker-*.jar" />
13
<exclude name="**/gwt-dev-*.jar" />
14
<exclude name="**/gwt-soyc-vis-*.jar" />
15
- <exclude name="**/gwt-user-*.jar" />
16
+ <exclude name="**/gwt-user-*.jar" /-->
19
<!--copy admin tools -->
20
--- a/clc/modules/www/build.xml
21
+++ b/clc/modules/www/build.xml
23
<property environment="env" />
24
<path id="gwtclasspath">
25
<fileset dir="${lib.dir}">
26
+ <include name="**/gwt-dev-linux-1.6.4.jar" />
27
<include name="**/*.jar" />
29
<pathelement path="conf" />
32
<path id="gwtcompilerclasspath">
33
<fileset dir="${lib.dir}">
34
- <include name="**/gwt-dev.jar" />
35
+ <include name="**/gwt-dev-linux-1.6.4.jar" />
37
<path refid="gwtclasspath" />
38
<dirset dir="${modules.dir}">
39
--- a/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml
40
+++ b/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/EucalyptusWebInterface.gwt.xml
43
<!-- Inherit the core Web Toolkit stuff. -->
44
<inherits name='com.google.gwt.user.User'/>
45
- <inherits name="com.google.gwt.resources.Resources" />
46
+ <!--inherits name="com.google.gwt.resources.Resources" /-->
47
<!-- <set-property name='user.agent' value='gecko1_8' /> -->
48
<!-- Inherit internationalization support. -->
49
<!-- <inherits name='com.google.gwt.i18n.I18N'/> -->
50
--- a/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/client/util/XHTML.java
53
-package edu.ucsb.eucalyptus.admin.client.util;
55
-import com.google.gwt.resources.client.ImageResource;
56
-import com.google.gwt.user.client.ui.HTML;
57
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
58
-import com.google.gwt.user.client.ui.HorizontalPanel;
59
-import com.google.gwt.user.client.ui.Image;
62
- public static String headerWithImage( final String text, final ImageResource image, final String style ) {
63
- return new HorizontalPanel( ) {
66
- setVerticalAlignment( HasVerticalAlignment.ALIGN_MIDDLE );
67
- add( new Image( image ) );
68
- HTML headerText = new HTML( text ) {
70
- setStyleName( style );
75
- }.getElement( ).getString( );