Convert samples/mobilewebapp to use maven. This paves the way to converting the sample to use GIN and Objectify. mvn gwt:run works as expected, and importing into eclipse as a maven project works fine too. README-MAVEN.txt includes instructions for working against gwt source. This change is not as big as it looks. 99% of the adds and deletes are actually simple moves, without even a package name change -- Maven is happiest when source lives at src/main/java rather than right in src/main. Also, there appears to be no need for src/dev. The AppCacheLinker is working just fine in src/main/java along with all its little friends. One big caveat: DataNucleus intrumentation is not working from the command line, though it is working in eclipse. This doesn't seem worth fixing since we want to switch to Objectify very soon. Review at http://gwt-code-reviews.appspot.com/1450809 git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10253 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/mobilewebapp/README-MAVEN.txt b/samples/mobilewebapp/README-MAVEN.txt new file mode 100644 index 0000000..f3f5210 --- /dev/null +++ b/samples/mobilewebapp/README-MAVEN.txt
@@ -0,0 +1,65 @@ +-- Option A: Import your project into Eclipse (recommended) -- + +If you use Eclipse for Jave EE, you can simply import the generated +project into Eclipse. We've tested against Eclipse 3.6. Later versions +will likely also work, earlier versions may not. (Please note that +this demo requires WTP, which is pre-installed with the Jave EE +versions of Eclipse.) + +Eclipse users will need to install the following plugin components: +- Google Plugin for Eclipse (instructions at http://code.google.com/eclipse/) +- m2eclipse Core +- Maven Integration for WTP (in m2eclipse extras) + Instructions for installing the maven plugins can be found here: + http://m2eclipse.sonatype.org/installing-m2eclipse.html + +Ensure Eclipse is configured to use Java 1.6 as this sample uses +AppEngine. + +In Eclipse, go to the File menu and choose: + + File -> Import... -> Existing Maven Projects into Workspace + + Select the directory containing this file. + + Click Finish. + +You can now browse the project in Eclipse. + +To launch your web app in GWT development mode + + Go to the Run menu item and select Run -> Run as -> Web Application. + + If prompted for which directory to run from, simply select the directory + that Eclipse defaults to. + + You can now use the built-in debugger to debug your web app in development mode. + +GWT developers (those who build GWT from source) may add their +gwt-user project to this project's class path in order to use +the built-from-source version of GWT instead of the version specified +in the POM. + + Select the project in the Project explorer and select File > Properties + + Select Java Build Path and click the Projects tab + + Click Add..., select gwt-user, and click OK + +-- Option B: Build from the command line with Maven -- + +If you prefer to work from the command line, you can use Maven to +build your project (http://maven.apache.org/). You will also need Java +1.6 JDK. Maven uses the supplied 'pom.xml' file which describes +exactly how to build your project. This file has been tested to work +against Maven 2.2.1. The following assumes 'mvn' is on your command +line path. + +To run development mode use the Maven GWT Plugin. + + mvn gwt:run + +To compile your project for deployment, just type 'mvn package'. + +For a full listing of other goals, visit: +http://mojo.codehaus.org/gwt-maven-plugin/plugin-info.html
diff --git a/samples/mobilewebapp/README.txt b/samples/mobilewebapp/README.txt deleted file mode 100644 index e450ac5..0000000 --- a/samples/mobilewebapp/README.txt +++ /dev/null
@@ -1,80 +0,0 @@ --- Preparation -- - -Use Ant to build this project (http://ant.apache.org/). Ant uses the -'build.xml' file in this folder, which describes exactly how to build -your project. This file has been tested to work against Ant 1.7.1. -The following assumes 'ant' is on your command line path. - -This project uses Google App Engine -(https://appengine.google.com/). You can download the Google App -Engine SDK from http://code.google.com/appengine/. The Ant build.xml -script needs to know where your Google App Engine SDK is -installed. Create a file named local.properties in the same folder as -the build.xml file. It needs to contain a definition for the -appengine.sdk property. For example, if the Google App Engine SDK is -installed at /opt/appengine-sdk, a line in the local.properties file -should contain: - -appengine.sdk=/opt/appengine-sdk - --- Build from the command line with Ant -- - -To run development mode, just type 'ant devmode'. - -To compile your project for deployment, just type 'ant'. - -To compile and also bundle into a .war file, type 'ant war'. - -For a full listing of other targets, type 'ant -p'. - --- Building with Eclipse and the Google Plugin for Eclipse -- - -If you use Eclipse, you can simply import the generated project into -Eclipse. We've tested against Eclipse 3.5 and 3.6 and GPE 2.3. Later -versions will likely also work, earlier versions may not. - -1. In Eclipse, make sure the App Engine SDK is configured in - - Window -> Properties -> Google -> App Engine - -2. Go to the File menu and choose: - - File -> Import... -> Existing Projects into Workspace - - Browse to the directory containing this file, - select "MobileWebApp". - - Be sure to uncheck "Copy projects into workspace" if it is checked. - - Click Finish. - - You can now browse the project in Eclipse. - -3. Eclipse may produce warings indicating that - - "The App Engine SDJ JAR xx.yy.jar is missing in the WEB-INF/lib directory" - - Select the warning, right click and choose - - "Quick fix" -> "Synchronize <WAR>/WEB-INF/lib with SDK libraries" - - Click "Finish" - -4. Eclipse may also produce a warning indicating that - - "The GWT SDK JAR gwt-servlet.jar is missing in the WEB-INF/lib directory" - - Select the warning, right click and choose - - "Quick fix" -> "Synchronize <WAR>/WEB-INF/lib with SDK libraries" - - Click "Finish" - -5. To launch your web app in GWT development mode, go to the Run menu and choose: - - Run -> Open Debug Dialog... - - Under Java Application, you should find a launch configuration - named "MobileWebApp". Select and click "Debug". - - You can now use the built-in debugger to debug your web app in development mode.
diff --git a/samples/mobilewebapp/build.xml b/samples/mobilewebapp/build.xml index 190260d..3a47a20 100755 --- a/samples/mobilewebapp/build.xml +++ b/samples/mobilewebapp/build.xml
@@ -1,19 +1,11 @@ -<project name="mobilewebapp" default="source+libs" basedir="."> +<project name="mobilewebapp" default="source" basedir="."> <property name="sample.root" value="mobilewebapp" /> <property name="sample.module" value="MobileWebApp" /> - <property name="sample.path" value="src/main" /> + <property name="sample.path" value="src/main/java" /> <import file="../common.ant.xml" /> <!-- these are after the common.ant.xml so they have gwt.tools... --> <path id="sample.extraclasspath"> </path> - <fileset id="sample.server.libs" dir="${gwt.tools}"> - <include name="lib/javax/validation/validation-api-1.0.0.GA.jar"/> - <include name="lib/hibernate/validator/hibernate-validator-4.1.0.Final.jar"/> - <include name="lib/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/> - <include name="lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/> - <include name="lib/apache/log4j/log4j-1.2.16.jar"/> - <include name="redist/json/r2_20080312/json-1.5.jar"/> + <fileset id="sample.server.libs" dir="${gwt.tools.lib}"> </fileset> - - <target name="source+libs" depends="source, serverlibs"/> </project>
diff --git a/samples/mobilewebapp/pom.xml b/samples/mobilewebapp/pom.xml new file mode 100644 index 0000000..530873e --- /dev/null +++ b/samples/mobilewebapp/pom.xml
@@ -0,0 +1,403 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <!-- POM file generated with GWT webAppCreator --> + <modelVersion>4.0.0</modelVersion> + <groupId>com.google.gwt.sample.mobilewebapp</groupId> + <artifactId>MobileWebApp</artifactId> + <packaging>war</packaging> + <version>1.0-SNAPSHOT</version> + <name>com.google.gwt.sample.mobilewebapp.MobileWebApp</name> + + <properties> + <!-- Convenience property to set the GWT version --> + <gwtVersion>2.3.0</gwtVersion> + + <!-- GWT needs at least java 1.6 --> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + + <!-- GAE properties --> + <gae.version>1.5.0.1</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> + + <!-- TODO: DataNucleus trash --> + <datanucleus.version>1.1.5</datanucleus.version> + </properties> + + <repositories> + <!-- <repository> + <id>objectify-appengine</id> + <url>http://objectify-appengine.googlecode.com/svn/maven</url> + </repository> --> + + <!-- TODO: DataNucleus trash --> + <repository> + <id>DataNucleus_2</id> + <url>http://www.datanucleus.org/downloads/maven2/</url> + <name>DataNucleus</name> + </repository> + <repository> + <id>JBoss Repo</id> + <url>https://repository.jboss.org/nexus/content/repositories/releases</url> + <name>JBoss Repo</name> + </repository> + </repositories> + + <!-- TODO: DataNucleus trash --> + <pluginRepositories> + <pluginRepository> + <id>DataNucleus_2</id> + <url>http://www.datanucleus.org/downloads/maven2/</url> + </pluginRepository> + </pluginRepositories> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + + <!-- Google Web Toolkit (GWT) itself --> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + </dependency> + + <!-- GWT RequestFactory will use JSR 303 javax.validation if you let it --> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.2.GA</version> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- GWT RequestFactory requires org.json --> + <!-- TODO: can we declare the json and validation dependencies somewhere for the world to pick up, + rather than requiring everyone to know about them? --> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + </dependency> + + <!-- Google App Engine (GAE) itself --> + + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-1.0-sdk</artifactId> + <version>${gae.version}</version> + </dependency> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-testing</artifactId> + <version>${gae.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-stubs</artifactId> + <version>${gae.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-labs</artifactId> + <version>${gae.version}</version> + </dependency> + <!-- uncomment for testing <dependency> <groupId>com.google.appengine</groupId> + <artifactId>appengine-local-runtime</artifactId> <version>${gae.version}</version> + <scope>system</scope> <systemPath>${gae.home}/lib/impl/appengine-local-runtime.jar</systemPath> + </dependency> <dependency> <groupId>com.google.appengine</groupId> <artifactId>appengine-tools-api</artifactId> + <version>${gae.version}</version> <scope>system</scope> <systemPath>${gae.home}/lib/appengine-tools-api.jar</systemPath> + </dependency> --> + + <!-- Who is this for? What is it? --> + + <dependency> + <groupId>net.sf.jsr107cache</groupId> + <artifactId>jsr107cache</artifactId> + <version>1.1</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + + <!-- Objectify for persistence. It uses the stock javax.persistence annotations --> + + <!-- <dependency> + <groupId>com.googlecode.objectify</groupId> + <artifactId>objectify</artifactId> + <version>3.0</version> + </dependency> --> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + + <!-- GIN and Guice for IoC / DI --> + + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>com.google.gwt.inject</groupId> + <artifactId>gin</artifactId> + <version>1.0</version> + </dependency> + + <!-- TODO: Who is using this? Is it just cruft from listwidget? --> + + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> + + <!-- TODO: Who is using this? Just GAE? Is anyone, really? --> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> + </dependency> + + <!-- The stuff needed by data nucleus until we can rip it out --> + + <dependency> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-core</artifactId> + <version>${datanucleus.version}</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>transaction-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-jpa</artifactId> + <version>1.1.5</version> + </dependency> + <dependency> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-rdbms</artifactId> + <version>${datanucleus.version}</version> + </dependency> + <dependency> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-enhancer</artifactId> + <version>1.1.4</version> + </dependency> + <dependency> + <groupId>javax.jdo</groupId> + <artifactId>jdo2-api</artifactId> + <version>2.3-eb</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>transaction-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.appengine.orm</groupId> + <artifactId>datanucleus-appengine</artifactId> + <version>1.0.8</version> + </dependency> + <!-- must be in main dependencies as well as plugin dependencies below --> + <!-- <dependency> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-core</artifactId> + <version>${datanucleus.version}</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>transaction-api</artifactId> + </exclusion> + </exclusions> + </dependency> --> + + </dependencies> + + <build> + <!-- Generate compiled stuff in the folder used for developing mode --> + <outputDirectory>target/www/WEB-INF/classes</outputDirectory> + + <plugins> + <!-- GWT Maven Plugin--> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>2.2.0</version> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwtVersion}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + </dependency> + </dependencies> + <!-- JS is only needed in the package phase, this speeds up testing --> + <executions> + <execution> + <phase>prepare-package</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + <!-- Plugin configuration. There are many available options, + see gwt-maven-plugin documentation at codehaus.org --> + <configuration> + <!-- URL that should be automatically opened in the GWT shell (gwt:run). --> + <runTarget>MobileWebApp.html</runTarget> + <!-- Location of the develop-mode web application structure (gwt:run). --> + <hostedWebapp>target/www</hostedWebapp> + <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) --> + <compileReport>true</compileReport> + <module>com.google.gwt.sample.mobilewebapp.MobileWebApp</module> + + <appEngineVersion>${gae.version}</appEngineVersion> + <appEngineHome>${gae.home}</appEngineHome> + <logLevel>INFO</logLevel> + <style>${gwt.style}</style> + + <hostedWebapp>${project.build.directory}/${project.build.finalName}</hostedWebapp> + <server>com.google.appengine.tools.development.gwt.AppEngineLauncher</server> + <copyWebapp>true</copyWebapp> + </configuration> + </plugin> + + <!-- Google App Engine plugin --> + <plugin> + <groupId>net.kindleit</groupId> + <artifactId>maven-gae-plugin</artifactId> + <version>0.8.0</version> + <executions> + <execution> + <id /> + <phase>validate</phase> + <goals> + <goal>unpack</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- Add source folders to test classpath in order to run gwt-tests as normal junit-tests --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.5</version> + <configuration> + <additionalClasspathElements> + <additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement> + <additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement> + </additionalClasspathElements> + <useManifestOnlyJar>false</useManifestOnlyJar> + <forkMode>always</forkMode> + + <!-- Folder for generated testing stuff --> + <systemProperties> + <property> + <name>gwt.args</name> + <value>-out target/www</value> + </property> + </systemProperties> + </configuration> + </plugin> + + <!-- Copy static web files before executing gwt:run --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.2</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target/www</outputDirectory> + <resources> + <resource> + <directory>src/main/webapp</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> <!-- Note 2.8 does not work with AspectJ aspect path --> + <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> + <projectnature>com.google.appengine.eclipse.core.gaeNature</projectnature> + </additionalProjectnatures> + </configuration> + </plugin> + + </plugins> + </build> +</project>
diff --git a/samples/mobilewebapp/src/main/META-INF/jdoconfig.xml b/samples/mobilewebapp/src/main/java/META-INF/jdoconfig.xml similarity index 100% rename from samples/mobilewebapp/src/main/META-INF/jdoconfig.xml rename to samples/mobilewebapp/src/main/java/META-INF/jdoconfig.xml
diff --git a/samples/mobilewebapp/src/main/META-INF/persistence.xml b/samples/mobilewebapp/src/main/java/META-INF/persistence.xml similarity index 100% rename from samples/mobilewebapp/src/main/META-INF/persistence.xml rename to samples/mobilewebapp/src/main/java/META-INF/persistence.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/GaeRequest.gwt.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/GaeRequest.gwt.xml similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/GaeRequest.gwt.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/GaeRequest.gwt.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/client/GaeAuthRequestTransport.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/client/GaeAuthRequestTransport.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/client/GaeAuthRequestTransport.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/client/GaeAuthRequestTransport.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/client/GaeAuthenticationFailureEvent.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/client/GaeAuthenticationFailureEvent.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/client/GaeAuthenticationFailureEvent.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/client/GaeAuthenticationFailureEvent.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/client/ReloadOnAuthenticationFailure.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/client/ReloadOnAuthenticationFailure.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/client/ReloadOnAuthenticationFailure.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/client/ReloadOnAuthenticationFailure.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/server/GaeAuthFilter.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/server/GaeAuthFilter.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/server/GaeAuthFilter.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/server/GaeAuthFilter.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/shared/GaeHelper.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/shared/GaeHelper.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/gaerequest/shared/GaeHelper.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/gaerequest/shared/GaeHelper.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/FormFactor.gwt.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/MobileWebApp.gwt.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/App.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/App.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/App.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/App.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactory.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImpl.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplMobile.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ClientFactoryImplTablet.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/MobileWebApp.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/MobileWebAppShell.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/Provider.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/Provider.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/Provider.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/Provider.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ProvidesPresenter.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ProvidesPresenter.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ProvidesPresenter.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ProvidesPresenter.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/TaskProxyLocalStorage.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/TaskProxyLocalStorage.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/TaskProxyLocalStorage.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/TaskProxyLocalStorage.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/AppActivityMapper.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditActivity.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskEditView.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskListActivity.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskListView.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskReadView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskReadView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/activity/TaskReadView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/activity/TaskReadView.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.css b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.css similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.css rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.css
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskEditView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskListView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/DesktopTaskReadView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuCellList.css
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuItem.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuItem.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuItem.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MainMenuItem.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/MobileWebAppShellDesktop.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/desktop/PieChart.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/AddTaskEvent.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/AddTaskEvent.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/AddTaskEvent.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/AddTaskEvent.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/EditingCanceledEvent.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/EditingCanceledEvent.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/EditingCanceledEvent.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/EditingCanceledEvent.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/GoHomeEvent.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/GoHomeEvent.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/GoHomeEvent.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/GoHomeEvent.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/ShowTaskEvent.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/ShowTaskEvent.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/ShowTaskEvent.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/ShowTaskEvent.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/TaskSavedEvent.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/TaskSavedEvent.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/event/TaskSavedEvent.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/event/TaskSavedEvent.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileCellList.css
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskEditView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskListView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileTaskReadView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/MobileWebAppShellMobile.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/mobile/TaskProxyCell.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/place/AppPlaceHistoryMapper.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/place/TaskEditPlace.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/place/TaskListPlace.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/MobileWebAppShellTablet.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletResources.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskEditView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.java
diff --git a/samples/mobilewebapp/src/main/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 similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.ui.xml rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/TabletTaskReadView.ui.xml
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/tablet/tabletStyles.css
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/DateButton.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/EditorDecorator.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/OrientationHelper.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/OrientationHelper.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/OrientationHelper.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/OrientationHelper.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/SoundEffects.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/WindowBasedOrientationHelper.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/WindowBasedOrientationHelper.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/client/ui/WindowBasedOrientationHelper.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/client/ui/WindowBasedOrientationHelper.java
diff --git a/samples/mobilewebapp/src/dev/com/google/gwt/sample/mobilewebapp/linker/AppCacheLinker.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/linker/AppCacheLinker.java similarity index 100% rename from samples/mobilewebapp/src/dev/com/google/gwt/sample/mobilewebapp/linker/AppCacheLinker.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/linker/AppCacheLinker.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/server/domain/EMF.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/Task.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/server/domain/Task.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/Task.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/server/domain/Task.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/UserServiceWrapper.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/server/domain/UserServiceWrapper.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/server/domain/UserServiceWrapper.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/server/domain/UserServiceWrapper.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/FieldVerifier.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/MobileWebAppRequestFactory.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/MobileWebAppRequestFactory.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/MobileWebAppRequestFactory.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/MobileWebAppRequestFactory.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/TaskProxy.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/TaskProxyImpl.java
diff --git a/samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskRequest.java b/samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/TaskRequest.java similarity index 100% rename from samples/mobilewebapp/src/main/com/google/gwt/sample/mobilewebapp/shared/TaskRequest.java rename to samples/mobilewebapp/src/main/java/com/google/gwt/sample/mobilewebapp/shared/TaskRequest.java
diff --git a/samples/mobilewebapp/src/main/log4j.properties b/samples/mobilewebapp/src/main/java/log4j.properties similarity index 100% rename from samples/mobilewebapp/src/main/log4j.properties rename to samples/mobilewebapp/src/main/java/log4j.properties
diff --git a/samples/mobilewebapp/war/MobileWebApp.css b/samples/mobilewebapp/src/main/webapp/MobileWebApp.css similarity index 100% rename from samples/mobilewebapp/war/MobileWebApp.css rename to samples/mobilewebapp/src/main/webapp/MobileWebApp.css
diff --git a/samples/mobilewebapp/war/MobileWebApp.html b/samples/mobilewebapp/src/main/webapp/MobileWebApp.html similarity index 100% rename from samples/mobilewebapp/war/MobileWebApp.html rename to samples/mobilewebapp/src/main/webapp/MobileWebApp.html
diff --git a/samples/mobilewebapp/war/WEB-INF/appengine-web.xml b/samples/mobilewebapp/src/main/webapp/WEB-INF/appengine-web.xml similarity index 100% rename from samples/mobilewebapp/war/WEB-INF/appengine-web.xml rename to samples/mobilewebapp/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/samples/mobilewebapp/war/WEB-INF/datastore-indexes.xml b/samples/mobilewebapp/src/main/webapp/WEB-INF/datastore-indexes.xml similarity index 100% rename from samples/mobilewebapp/war/WEB-INF/datastore-indexes.xml rename to samples/mobilewebapp/src/main/webapp/WEB-INF/datastore-indexes.xml
diff --git a/samples/mobilewebapp/war/WEB-INF/logging.properties b/samples/mobilewebapp/src/main/webapp/WEB-INF/logging.properties similarity index 100% rename from samples/mobilewebapp/war/WEB-INF/logging.properties rename to samples/mobilewebapp/src/main/webapp/WEB-INF/logging.properties
diff --git a/samples/mobilewebapp/war/WEB-INF/web.xml b/samples/mobilewebapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/mobilewebapp/war/WEB-INF/web.xml rename to samples/mobilewebapp/src/main/webapp/WEB-INF/web.xml
diff --git a/samples/mobilewebapp/war/app_icon.png b/samples/mobilewebapp/src/main/webapp/app_icon.png similarity index 100% rename from samples/mobilewebapp/war/app_icon.png rename to samples/mobilewebapp/src/main/webapp/app_icon.png Binary files differ
diff --git a/samples/mobilewebapp/war/audio/error.mp3 b/samples/mobilewebapp/src/main/webapp/audio/error.mp3 similarity index 100% rename from samples/mobilewebapp/war/audio/error.mp3 rename to samples/mobilewebapp/src/main/webapp/audio/error.mp3 Binary files differ
diff --git a/samples/mobilewebapp/war/audio/error.ogg b/samples/mobilewebapp/src/main/webapp/audio/error.ogg similarity index 100% rename from samples/mobilewebapp/war/audio/error.ogg rename to samples/mobilewebapp/src/main/webapp/audio/error.ogg Binary files differ
diff --git a/samples/mobilewebapp/war/audio/error.wav b/samples/mobilewebapp/src/main/webapp/audio/error.wav similarity index 100% rename from samples/mobilewebapp/war/audio/error.wav rename to samples/mobilewebapp/src/main/webapp/audio/error.wav Binary files differ
diff --git a/samples/mobilewebapp/war/favicon.ico b/samples/mobilewebapp/src/main/webapp/favicon.ico similarity index 100% rename from samples/mobilewebapp/war/favicon.ico rename to samples/mobilewebapp/src/main/webapp/favicon.ico Binary files differ
diff --git a/samples/mobilewebapp/war/video/tutorial.mp4 b/samples/mobilewebapp/src/main/webapp/video/tutorial.mp4 similarity index 100% rename from samples/mobilewebapp/war/video/tutorial.mp4 rename to samples/mobilewebapp/src/main/webapp/video/tutorial.mp4 Binary files differ
diff --git a/samples/mobilewebapp/war/video/tutorial.ogv b/samples/mobilewebapp/src/main/webapp/video/tutorial.ogv similarity index 100% rename from samples/mobilewebapp/war/video/tutorial.ogv rename to samples/mobilewebapp/src/main/webapp/video/tutorial.ogv Binary files differ
diff --git a/samples/mobilewebapp/user-classpath b/samples/mobilewebapp/user-classpath deleted file mode 100644 index 8321a25..0000000 --- a/samples/mobilewebapp/user-classpath +++ /dev/null
@@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main"/> - <classpathentry kind="src" output="build" path="src/dev"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> - <classpathentry kind="output" path="war/WEB-INF/classes"/> -</classpath>
diff --git a/samples/mobilewebapp/user-project b/samples/mobilewebapp/user-project deleted file mode 100644 index 9c11988..0000000 --- a/samples/mobilewebapp/user-project +++ /dev/null
@@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>MobileWebApp</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.appengine.eclipse.core.projectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.appengine.eclipse.core.enhancerbuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>com.google.appengine.eclipse.core.gaeNature</nature> - <nature>com.google.gwt.eclipse.core.gwtNature</nature> - </natures> -</projectDescription>
diff --git a/samples/mobilewebapp/user-settings/com.google.appengine.eclipse.core.prefs b/samples/mobilewebapp/user-settings/com.google.appengine.eclipse.core.prefs deleted file mode 100644 index f9302b1..0000000 --- a/samples/mobilewebapp/user-settings/com.google.appengine.eclipse.core.prefs +++ /dev/null
@@ -1,3 +0,0 @@ -#Fri Apr 29 15:39:20 EDT 2011 -eclipse.preferences.version=1 -ormEnhancementInclusions=src/main/