Fixing up the Maven samples to work with GWT 2.8 Change-Id: Ieeae3a206855dda43124842b43217b0c682d7631
diff --git a/samples/dynatablerf/pom.xml b/samples/dynatablerf/pom.xml index f401b29..1e26f6a 100644 --- a/samples/dynatablerf/pom.xml +++ b/samples/dynatablerf/pom.xml
@@ -13,7 +13,7 @@ <properties> <!-- Convenience property to set the GWT version --> - <gwtVersion>2.7.0-SNAPSHOT</gwtVersion> + <gwt.version>2.8.0-SNAPSHOT</gwt.version> <!-- GWT needs at least java 1.6 --> <maven.compiler.source>1.7</maven.compiler.source> @@ -29,7 +29,7 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -38,7 +38,6 @@ <dependencies> <!-- GWT --> - <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> @@ -82,7 +81,6 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -124,7 +122,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <executions> <execution> <goals> @@ -149,7 +147,6 @@ </plugin> </plugins> - </build> <repositories> @@ -166,8 +163,8 @@ </repositories> <pluginRepositories> <pluginRepository> - <id>codehaus-snapshots</id> - <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url> + <id>google-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> <releases> <enabled>false</enabled> </releases> @@ -176,8 +173,8 @@ </snapshots> </pluginRepository> <pluginRepository> - <id>google-snapshots</id> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> + <id>gwt-plugin-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> <releases> <enabled>false</enabled> </releases>
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml index b2d9c24..db30db4 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml
@@ -30,4 +30,9 @@ <entry-point class='com.google.gwt.sample.dynatablerf.client.DynaTableRf' /> <set-configuration-property name="CssResource.obfuscationPrefix" value="empty" /> + + <set-configuration-property name="CssResource.enableGss" value="true" /> + <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" /> + <!-- CSS to GSS Conversion --> + <set-configuration-property name="CssResource.conversionMode" value="strict" /> </module>
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/DynaTableRf.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/DynaTableRf.ui.xml index 2763c32..5303a09 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/DynaTableRf.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/DynaTableRf.ui.xml
@@ -1,6 +1,6 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets'> - <ui:style gss="true"> + <ui:style> body { background-color: white; color: black;
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/ErrorDialog.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/ErrorDialog.ui.xml index c573fa3..d3b8a46 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/ErrorDialog.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/ErrorDialog.ui.xml
@@ -1,5 +1,5 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> - <ui:style gss="true"> + <ui:style> .dialog { background: white; border: thin solid black;
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/PersonEditorWorkflow.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/PersonEditorWorkflow.ui.xml index 332c129..8950608 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/PersonEditorWorkflow.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/PersonEditorWorkflow.ui.xml
@@ -1,6 +1,6 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets'> - <ui:style src="common.css"> + <ui:style src="common.gss"> .dialog { background: white; border: thin solid #AAA;
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/common.css b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/common.gss similarity index 72% rename from samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/common.css rename to samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/common.gss index 85ce90f..0120839 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/common.css +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/common.gss
@@ -1,9 +1,9 @@ /* Common measurements used in the app. */ -@def fieldWidth 30em; +@def FIELDWIDTH 30em; .editField { display: inline; - width: fieldWidth; + width: FIELDWIDTH; } .rightAlign {
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/AddressEditor.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/AddressEditor.ui.xml index 992b10c..341a190 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/AddressEditor.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/AddressEditor.ui.xml
@@ -2,7 +2,7 @@ xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:e='urn:import:com.google.gwt.editor.ui.client'> - <ui:style src="../common.css"> + <ui:style src="../common.gss"> </ui:style> <g:HTMLPanel>
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/DayFilterWidget.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/DayFilterWidget.ui.xml index 0123608..932eab0 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/DayFilterWidget.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/DayFilterWidget.ui.xml
@@ -1,6 +1,6 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets'> - <ui:style gss="true"> + <ui:style> .all { float: left; }
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/FavoritesWidget.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/FavoritesWidget.ui.xml index 3d77570..72c17ff 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/FavoritesWidget.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/FavoritesWidget.ui.xml
@@ -1,5 +1,5 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> - <ui:style gss="true" + <ui:style type="com.google.gwt.sample.dynatablerf.client.widgets.FavoritesWidget.Style"> .header { font-weight: bold;
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/MentorSelector.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/MentorSelector.ui.xml index 5d365e6..c17a18c 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/MentorSelector.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/MentorSelector.ui.xml
@@ -1,7 +1,7 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets' xmlns:e='urn:import:com.google.gwt.editor.ui.client'> - <ui:style src="../common.css" /> + <ui:style src="../common.gss" /> <g:FlowPanel> <dt:NameLabel ui:field="nameLabel" stylePrimaryName="{style.editField}" /> <g:Button ui:field="choose">Choose Randomly</g:Button>
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/PersonEditor.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/PersonEditor.ui.xml index 40b32ce..61eb846 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/PersonEditor.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/PersonEditor.ui.xml
@@ -1,7 +1,7 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets' xmlns:e='urn:import:com.google.gwt.editor.ui.client'> - <ui:style src="../common.css"> + <ui:style src="../common.gss"> </ui:style> <g:HTMLPanel>
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/ScheduleEditor.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/ScheduleEditor.ui.xml index 9099687..5caa3a8 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/ScheduleEditor.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/ScheduleEditor.ui.xml
@@ -2,7 +2,7 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:dt='urn:import:com.google.gwt.sample.dynatablerf.client.widgets' > - <ui:style gss="true"> + <ui:style> .table { width: 100%; }
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/SummaryWidget.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/SummaryWidget.ui.xml index 8376f7e..7043781 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/SummaryWidget.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/SummaryWidget.ui.xml
@@ -1,6 +1,6 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:cv='urn:import:com.google.gwt.user.cellview.client'> - <ui:style src="../common.css" + <ui:style src="../common.gss" type="com.google.gwt.sample.dynatablerf.client.widgets.SummaryWidget.Style"> .displayInline { display: inline;
diff --git a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/TimeSlotListWidget.ui.xml b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/TimeSlotListWidget.ui.xml index 8a94801..d28e940 100644 --- a/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/TimeSlotListWidget.ui.xml +++ b/samples/dynatablerf/src/main/java/com/google/gwt/sample/dynatablerf/client/widgets/TimeSlotListWidget.ui.xml
@@ -2,7 +2,7 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:cv='urn:import:com.google.gwt.user.cellview.client'> - <ui:style gss="true"> + <ui:style> .table { width: 100%; }
diff --git a/samples/mobilewebapp/pom.xml b/samples/mobilewebapp/pom.xml index fb436ae..38bd959 100644 --- a/samples/mobilewebapp/pom.xml +++ b/samples/mobilewebapp/pom.xml
@@ -11,28 +11,37 @@ <properties> <!-- Convenience property to set the GWT version --> - <gwtVersion>2.7.0-SNAPSHOT</gwtVersion> + <gwt.version>2.8.0-SNAPSHOT</gwt.version> <!-- GWT needs at least java 1.6 --> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> - <!-- GAE properties --> - <gae.version>1.9.13</gae.version> - <gae.home>${user.home}/.m2/repository/com/google/appengine/appengine-java-sdk/${gae.version}/appengine-java-sdk-${gae.version}</gae.home> - <gae.application.version>1</gae.application.version> + <!-- App Engine properties --> + <appengine.version>1.9.30</appengine.version> + <appengine.application.version>1</appengine.application.version> <!-- Don't let your Mac use a crazy non-standard encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <!-- App Engine Goals --> + <!-- mvn help:describe -Dplugin=appengine --> + + <!-- Running with Maven --> + <!-- mvn clean package --> + <!-- mvn appengine:devserver_start - start web server --> + <!-- mvn gwt:run-codeserver - start gwt code server --> + <!-- goto http://localhost:8080 --> + <!-- mvn appengine:devserver_stop - stop web server --> + <dependencyManagement> <dependencies> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -40,9 +49,7 @@ </dependencyManagement> <dependencies> - <!-- GWT --> - <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> @@ -79,7 +86,6 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -114,28 +120,27 @@ <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-api-1.0-sdk</artifactId> - <version>${gae.version}</version> + <version>${appengine.version}</version> </dependency> <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-testing</artifactId> - <version>${gae.version}</version> + <version>${appengine.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-api-stubs</artifactId> - <version>${gae.version}</version> + <version>${appengine.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-api-labs</artifactId> - <version>${gae.version}</version> + <version>${appengine.version}</version> </dependency> <!-- Objectify for persistence. It uses the stock javax.persistence annotations --> - <dependency> <groupId>com.googlecode.objectify</groupId> <artifactId>objectify</artifactId> @@ -148,7 +153,6 @@ </dependency> <!-- GIN and Guice for IoC / DI --> - <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> @@ -167,11 +171,10 @@ </dependency> <!-- Unit tests --> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> </dependencies> @@ -186,7 +189,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <executions> <execution> <goals> @@ -214,13 +217,14 @@ <modules> <module>com.google.gwt.sample.mobilewebapp.MobileWebApp</module> </modules> - <appEngineVersion>${gae.version}</appEngineVersion> - <appEngineHome>${gae.home}</appEngineHome> + <logLevel>INFO</logLevel> <style>${gwt.style}</style> - <server>com.google.appengine.tools.development.gwt.AppEngineLauncher</server> <copyWebapp>true</copyWebapp> + + <!-- mvn gwt:run-codeserver - won't have to use the bookmarklet --> + <launcherDir>${project.build.directory}/${project.build.finalName}</launcherDir> <!-- Run tests using HtmlUnit --> <mode>htmlunit</mode> @@ -229,20 +233,22 @@ </configuration> </plugin> - <!-- Google App Engine plugin --> + <!-- Google App Engine Plugin --> + <!-- appengine:devserver_start - start web server --> + <!-- appengine:devserver_stop - stop web server --> <plugin> - <groupId>net.kindleit</groupId> - <artifactId>maven-gae-plugin</artifactId> - <version>0.8.1</version> - <executions> - <execution> - <id /> - <phase>validate</phase> - <goals> - <goal>unpack</goal> - </goals> - </execution> - </executions> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-maven-plugin</artifactId> + <version>${appengine.version}</version> + <configuration> + <version>${appengine.application.version}</version> + <enableJarClasses>false</enableJarClasses> + <!-- Uncomment the snippet below to bind to all IPs instead of just localhost --> + <!-- <address>0.0.0.0</address> <port>8080</port> --> + <!-- Uncomment the snippet below to enable local debugging with a remove debugger like those included with Eclipse + or IntelliJ --> + <!-- <jvmFlags><jvmFlag>-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</jvmFlag></jvmFlags> --> + </configuration> </plugin> <!-- Skip normal test execution, we use gwt:test instead --> @@ -255,36 +261,6 @@ </plugin> </plugins> - - <!-- Required by m2e for import into eclipse. No effect on command line builds --> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>net.kindleit</groupId> - <artifactId>maven-gae-plugin</artifactId> - <versionRange>[0.7.3,)</versionRange> - <goals> - <goal>unpack</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> <repositories> @@ -305,8 +281,8 @@ </repositories> <pluginRepositories> <pluginRepository> - <id>codehaus-snapshots</id> - <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url> + <id>google-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> <releases> <enabled>false</enabled> </releases> @@ -315,8 +291,8 @@ </snapshots> </pluginRepository> <pluginRepository> - <id>google-snapshots</id> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> + <id>gwt-plugin-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> <releases> <enabled>false</enabled> </releases>
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml index ce279d4..935de20 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml
@@ -42,4 +42,9 @@ <source path='client'/> <source path='presenter'/> <source path='shared'/> + + <set-configuration-property name="CssResource.enableGss" value="true" /> + <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" /> + <!-- CSS to GSS Conversion --> + <set-configuration-property name="CssResource.conversionMode" value="strict" /> </module>
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml index a343a06..8bb4a57 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml
@@ -5,7 +5,7 @@ xmlns:c="urn:import:com.google.gwt.user.cellview.client" xmlns:app="urn:import:com.google.gwt.sample.mobilewebapp.client.ui"> - <ui:style gss="true"> + <ui:style> .title { padding: 4px 10px; font-size: 14pt;
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.ui.xml index 0d4936c..9a5c23a 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.ui.xml
@@ -5,7 +5,7 @@ xmlns:c="urn:import:com.google.gwt.user.cellview.client" xmlns:app="urn:import:com.google.gwt.sample.mobilewebapp.client.ui"> - <ui:style gss="true"> + <ui:style> .title { padding: 4px 10px; font-size: 14pt;
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml index 263274c..22adec8 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml
@@ -6,7 +6,7 @@ xmlns:c="urn:import:com.google.gwt.user.cellview.client" xmlns:d="urn:import:com.google.gwt.sample.mobilewebapp.client.desktop"> - <ui:style gss="true"> + <ui:style> .header { border-bottom: 1px solid #666; padding-top: 6px;
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/TaskTemplateCell.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/TaskTemplateCell.ui.xml index a23d673..4393625 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/TaskTemplateCell.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/TaskTemplateCell.ui.xml
@@ -1,6 +1,6 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"> - <ui:style gss="true"> + <ui:style> .taskTemplateCell { margin: 8px; border: 1px solid #666;
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml index 199a0d0..f15908d 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml
@@ -4,7 +4,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:app="urn:import:com.google.gwt.sample.mobilewebapp.client.ui"> - <ui:style gss="true"> + <ui:style> .outer { background: #eee; }
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.ui.xml index 5ae81df..0680cbc 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.ui.xml
@@ -4,7 +4,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:app="urn:import:com.google.gwt.sample.mobilewebapp.client.ui"> - <ui:style gss="true"> + <ui:style> .outer { background: #eee; }
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml index ae1b3fb..00bcb98 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml
@@ -4,7 +4,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:c="urn:import:com.google.gwt.user.cellview.client"> - <ui:style gss="true"> + <ui:style> .backButton { display: none; }
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.ui.xml index a08c0ca..12f84a2 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.ui.xml
@@ -2,7 +2,7 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"> - <ui:style gss="true" field="cellStyle" + <ui:style field="cellStyle" type="com.google.gwt.sample.mobilewebapp.client.mobile.TaskProxyCell.CellStyle"> .noDate { font-size: 80%;
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml index ed3bab6..faecc55 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml
@@ -5,7 +5,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:c="urn:import:com.google.gwt.user.cellview.client"> - <ui:style gss="true"> + <ui:style> .header { background: #1a1a1a; position: relative;
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml index cfcf845..803817e 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml
@@ -4,7 +4,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:app="urn:import:com.google.gwt.sample.mobilewebapp.client.ui"> - <ui:style gss="true"> + <ui:style> .outer { background: #eee; }
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.ui.xml index ca2d863..e7014e4 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.ui.xml +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.ui.xml
@@ -4,7 +4,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:app="urn:import:com.google.gwt.sample.mobilewebapp.client.ui"> - <ui:style gss="true"> + <ui:style> .outer { background: #eee; }
diff --git a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.gss similarity index 95% rename from samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.gss index 064c117..ded47e1 100644 --- a/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css +++ b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.gss
@@ -1,4 +1,4 @@ .datePickerDay,.datePickerWeekdayLabel,.datePickerWeekendLabel,td.datePickerMonth - { +{ font-size: 30pt; }
diff --git a/samples/validation/pom.xml b/samples/validation/pom.xml index a7e0662..1dc42c4 100644 --- a/samples/validation/pom.xml +++ b/samples/validation/pom.xml
@@ -11,7 +11,7 @@ <properties> <!-- Convenience property to set the GWT version --> - <gwtVersion>2.7.0-SNAPSHOT</gwtVersion> + <gwt.version>2.8.0-SNAPSHOT</gwt.version> <!-- GWT needs at least java 1.6 --> <maven.compiler.source>1.7</maven.compiler.source> @@ -28,7 +28,7 @@ <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -36,8 +36,7 @@ </dependencyManagement> <dependencies> - <!-- GWT itself --> - + <!-- GWT --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> @@ -67,7 +66,6 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -129,7 +127,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <executions> <execution> <goals> @@ -152,24 +150,6 @@ <copyWebapp>true</copyWebapp> </configuration> </plugin> - - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.8</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>false</downloadJavadocs> - <wtpversion>2.0</wtpversion> - <additionalBuildcommands> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - </buildCommand> - </additionalBuildcommands> - <additionalProjectnatures> - <projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature> - </additionalProjectnatures> - </configuration> - </plugin> </plugins> </build> @@ -187,8 +167,18 @@ </repositories> <pluginRepositories> <pluginRepository> - <id>codehaus-snapshots</id> - <url>https://nexus.codehaus.org/content/groups/snapshots-group/</url> + <id>google-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>gwt-plugin-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/snapshots</url> <releases> <enabled>false</enabled> </releases>
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml b/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml index 04a1068..2e3dcca 100644 --- a/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml +++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/Validation.gwt.xml
@@ -40,4 +40,7 @@ <when-type-is class="com.google.gwt.validation.client.UserValidationMessagesResolver" /> </replace-with> + + <set-configuration-property name="CssResource.enableGss" value="true" /> + <set-configuration-property name="CssResource.gssDefaultInUiBinder" value="true" /> </module>
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationView.ui.xml b/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationView.ui.xml index 0f4e363..b396cd3 100644 --- a/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationView.ui.xml +++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/client/ValidationView.ui.xml
@@ -1,7 +1,7 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:style gss="true" type ="com.google.gwt.sample.validation.client.ValidationView.MyStyle"> + <ui:style type ="com.google.gwt.sample.validation.client.ValidationView.MyStyle"> @external gwt-DialogBox; .gwt-DialogBox { width: 400px;