From 31d1c7cae609b4adb17cfee60d112474576dd054 Mon Sep 17 00:00:00 2001
From: Ray Cromwell <cromwellian@gmail.com>
Date: Mon, 27 Jul 2009 09:01:20 +0000
Subject: [PATCH] Update to codehaus gwt-maven-plugin. Update to GWT 1.7.0.
 Update module files to properly include Plugins.gwt.xml module. Disabled
 tests for now (JUnitShell not launching properly from new plugin). Fixed
 unbound deferred bindings.

---
 gwtquery-core/pom.xml                         | 29 ++++++++
 .../java/com/google/gwt/query/Query.gwt.xml   | 10 +++
 plugins/pom.xml                               | 10 +++
 pom.xml                                       |  8 +--
 samples/pom.xml                               | 70 +++++--------------
 .../gwtquery/samples/GwtQueryBench.gwt.xml    |  1 +
 .../gwtquery/samples/GwtQueryDemo.gwt.xml     |  3 +-
 .../gwtquery/samples/GwtQueryEffects.gwt.xml  |  3 +-
 .../gwtquery/samples/GwtQueryPlugin.gwt.xml   |  8 +--
 .../gwtquery/samples/GwtQuerySample.gwt.xml   |  7 +-
 .../samples/client/GwtQuerySampleModule.java  |  3 -
 11 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml
index 647b3a4d..8052f6cb 100644
--- a/gwtquery-core/pom.xml
+++ b/gwtquery-core/pom.xml
@@ -84,7 +84,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                    <additionalClasspathElements>
+
+                        <additionalClasspathElement>
+                            ${project.build.sourceDirectory}
+                        </additionalClasspathElement>
 
+                        <additionalClasspathElement>
+                            ${project.build.testSourceDirectory}
+                        </additionalClasspathElement>
+                    </additionalClasspathElements>
+
+                    <useSystemClassLoader>true</useSystemClassLoader>
+
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
+                    <forkMode>always</forkMode>
+                    <systemProperties>
+                        <property>
+                            <name>gwt.args</name>
+                            <value>-out target/www</value>
+                        </property>
+                    </systemProperties>
+                    <argLine>-Xmx1024m</argLine>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/Query.gwt.xml b/gwtquery-core/src/main/java/com/google/gwt/query/Query.gwt.xml
index 3ff4c508..818cc07e 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/Query.gwt.xml
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/Query.gwt.xml
@@ -20,6 +20,11 @@
         <when-type-assignable class="com.google.gwt.query.client.Lazy"/>
     </generate-with>
 
+    <generate-with class="com.google.gwt.query.rebind.SelectorGeneratorJS">
+        <when-type-assignable class="com.google.gwt.query.client.Selectors"/>
+    </generate-with>
+
+
     <generate-with class="com.google.gwt.query.rebind.SelectorGeneratorJS">
         <when-type-assignable class="com.google.gwt.query.client.Selectors"/>
         <any>
@@ -58,6 +63,11 @@
     </replace-with>
 
 
+    <replace-with class="com.google.gwt.query.client.impl.SelectorEngineJS">
+        <when-type-assignable
+                class="com.google.gwt.query.client.impl.SelectorEngineImpl"/>
+    </replace-with>
+
     <replace-with class="com.google.gwt.query.client.impl.SelectorEngineJS">
         <when-type-assignable
                 class="com.google.gwt.query.client.impl.SelectorEngineImpl"/>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0a670559..78fb5f36 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -19,4 +19,14 @@
             <type>jar</type>
         </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/java</directory>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index d6142aad..5585b406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,12 +130,10 @@
             </activation>
 
             <properties>
-                <gwtversion>1.6.4</gwtversion>
-                <gwt.loglevel>ERROR</gwt.loglevel>
+                <gwtversion>1.7.0</gwtversion>
+                <gwt.loglevel>INFO</gwt.loglevel>
                 <gwt.outputstyle>PRETTY</gwt.outputstyle>
                 <gwt.modulesuffix></gwt.modulesuffix>
-                <gwt.localRepository>${user.home}/.m2/repository
-                </gwt.localRepository>
                 <!--            <maven.test.skip>true</maven.test.skip> -->
             </properties>
         </profile>
@@ -195,7 +193,7 @@
         <profile>
             <id>prod</id>
             <properties>
-                <gwtversion>1.6.4</gwtversion>
+                <gwtversion>1.7.0</gwtversion>
                 <gwt.loglevel>ERROR</gwt.loglevel>
                 <gwt.outputstyle>OBF</gwt.outputstyle>
                 <gwt.modulesuffix></gwt.modulesuffix>
diff --git a/samples/pom.xml b/samples/pom.xml
index 9b343be3..e0c94656 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -29,77 +29,43 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.google.gwt</groupId>
-                                    <artifactId>gwt-dev</artifactId>
-                                    <version>${gwtversion}</version>
-                                    <classifier>${gwtplatform}-libs</classifier>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${settings.localRepository}/com/google/gwt/gwt-dev/${gwtversion}
-                                    </outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.totsp.gwt</groupId>
-                <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
-                <version>2.0-beta24</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>gwt-maven-plugin</artifactId>
+                <version>1.1</version>
                 <configuration>
                     <logLevel>${gwt.loglevel}</logLevel>
                     <style>${gwt.outputstyle}</style>
                     <gwtVersion>${gwtversion}</gwtVersion>
-
-                    <logLevel>WARN</logLevel>
-                    <runTarget>
-                        gwtquery.samples.GwtQueryDemo/index.html
-                    </runTarget>
-                    <compileTargets>
-                        <compileTarget>
+                    <modules>
+                        <module>
                             gwtquery.samples.GwtQueryDemo
-                        </compileTarget>
-                        <compileTarget>
+                        </module>
+                        <module>
                             gwtquery.samples.GwtQueryBench
-                        </compileTarget>
-                        <compileTarget>
+                        </module>
+                        <module>
                             gwtquery.samples.GwtQuerySample
-                        </compileTarget>
-                        <compileTarget>
+                        </module>
+                        <module>
                             gwtquery.samples.GwtQueryPlugin
-                        </compileTarget>
-                        <compileTarget>
+                        </module>
+                        <module>
                             gwtquery.samples.GwtQueryWidgets
-                        </compileTarget>
-                        <compileTarget>
+                        </module>
+                        <module>
                             gwtquery.samples.GwtQueryEffects
-                        </compileTarget>
-
-                    </compileTargets>
+                        </module>
+                    </modules>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>compilegwt</id>
                         <goals>
                             <goal>compile</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
 
diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml
index 921732a7..66ea7a44 100644
--- a/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml
+++ b/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml
@@ -1,5 +1,6 @@
 <module>
     <inherits name='com.google.gwt.query.Query'/>
+    <inherits name='gwtquery.Plugins'/>
     <entry-point class='gwtquery.samples.client.GwtQueryBenchModule'/>
 </module>
     
diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml
index cfb48547..e367b228 100644
--- a/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml
+++ b/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml
@@ -1,7 +1,6 @@
 <module>
     <inherits name='com.google.gwt.query.Query'/>
+    <inherits name='gwtquery.Plugins'/>
     <entry-point class='gwtquery.samples.client.GwtQueryDemoModule'/>
-
-
 </module>
     
diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryEffects.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryEffects.gwt.xml
index a07f2320..0ce4dcad 100644
--- a/samples/src/main/java/gwtquery/samples/GwtQueryEffects.gwt.xml
+++ b/samples/src/main/java/gwtquery/samples/GwtQueryEffects.gwt.xml
@@ -1,7 +1,6 @@
 <module>
     <inherits name='com.google.gwt.query.Query'/>
+    <inherits name='gwtquery.Plugins'/>
     <entry-point class='gwtquery.samples.client.GwtQueryEffectsModule'/>
-
-
 </module>
     
diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryPlugin.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryPlugin.gwt.xml
index cdadc03a..352c5c66 100644
--- a/samples/src/main/java/gwtquery/samples/GwtQueryPlugin.gwt.xml
+++ b/samples/src/main/java/gwtquery/samples/GwtQueryPlugin.gwt.xml
@@ -1,10 +1,6 @@
 <module>
-    <!--<inherits name='com.google.gwt.query.Query'/>-->
-    <!--<inherits name='gwtquery.Plugins'/>-->
-    <inherits name='com.google.gwt.user.User'/>
-
+    <inherits name='com.google.gwt.query.Query'/>
+    <inherits name='gwtquery.Plugins'/>
     <entry-point class='gwtquery.samples.client.GwtQueryPluginModule'/>
-
-
 </module>
     
diff --git a/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml
index 0bcebf32..86077f47 100644
--- a/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml
+++ b/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml
@@ -1,10 +1,7 @@
 <module>
-    <!--<inherits name='com.google.gwt.query.Query'/>-->
-    <inherits name='com.google.gwt.user.User'/>
-    <add-linker name="xs"/>
+    <inherits name='com.google.gwt.query.Query'/>
+    <inherits name='gwtquery.Plugins'/>
     <set-property name="user.agent" value="gecko1_8"/>
     <entry-point class='gwtquery.samples.client.GwtQuerySampleModule'/>
-
-
 </module>
     
diff --git a/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java
index 93fe3687..3bfaa077 100644
--- a/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java
+++ b/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java
@@ -3,11 +3,8 @@ package gwtquery.samples.client;
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.query.client.GQuery;
-import static com.google.gwt.query.client.GQuery.$;
 import com.google.gwt.query.client.Selector;
 import com.google.gwt.query.client.Selectors;
-import static com.google.gwt.query.client.css.CSS.TOP;
-import static com.google.gwt.query.client.css.CSS.VERTICAL_ALIGN;
 
 
 public class GwtQuerySampleModule implements EntryPoint {
-- 
2.39.5