Refactoring for 0.2 release

45 files changed, 366 insertions, 101 deletions

diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml
new file mode 100644
index 00000000..449aaebd
--- /dev/null
+++ b/gwtquery-core/pom.xml
@@ -0,0 +1,52 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>gwtquery</groupId>
+    <artifactId>gwtquery-project</artifactId>
+    <version>0.2-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>gwtquery</artifactId>
+  <packaging>jar</packaging>
+  <name>GwtQuery Core API</name>
+  <url>http://gwtquery.com</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <type>jar</type>
+    </dependency>
+
+    <!--  stuff that is NOT war bundled -->
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>${gwtversion}</version>
+      <type>jar</type>
+      <!--<scope>provided</scope>-->
+    </dependency>
+
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/src/test/java</directory>
+      </testResource>
+      <testResource>
+        <directory>${basedir}/src/test/resources</directory>
+      </testResource>
+
+    </testResources>
+
+  </build>
+
+</project>
diff --git a/gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml b/gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml
deleted file mode 100644
index 4b3f4d69..00000000
--- a/gwtquery-core/src/main/java/gquery/GQueryBench.gwt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<module>
-    <inherits name='gquery.GQuery'/>
-    <entry-point class='gquery.client.GQueryBenchModule'/>
-</module>
-    
diff --git a/gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml b/gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml
deleted file mode 100644
index 41dfe995..00000000
--- a/gwtquery-core/src/main/java/gquery/GQueryDemo.gwt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<module>
-    <inherits name='gquery.GQuery'/>
-    <entry-point class='gquery.client.GQueryDemoModule'/>
-</module>
-    
diff --git a/gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml b/gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml
deleted file mode 100644
index 7be01766..00000000
--- a/gwtquery-core/src/main/java/gquery/GQuerySample.gwt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<module>
-    <inherits name='gquery.GQuery'/>
-    <entry-point class='gquery.client.GQuerySampleModule'/>
-</module>
-    
diff --git a/gwtquery-core/src/main/java/gquery/GQuery.gwt.xml b/gwtquery-core/src/main/java/gwtquery/GwtQuery.gwt.xml
index 27ea989d..4153d1a9 100644
--- a/gwtquery-core/src/main/java/gquery/GQuery.gwt.xml
+++ b/gwtquery-core/src/main/java/gwtquery/GwtQuery.gwt.xml
@@ -16,8 +16,8 @@
      ]]>

     </property-provider>

 

-    <generate-with class="gquery.rebind.SelectorGeneratorJS">

-        <when-type-assignable class="gquery.client.Selectors"/>

+    <generate-with class="gwtquery.rebind.SelectorGeneratorJS">

+        <when-type-assignable class="gwtquery.client.Selectors"/>

         <any>

            <when-property-is name="user.agent" value="gecko"/>

             <when-property-is name="user.agent" value="ie6"/>

@@ -25,8 +25,8 @@
 

     </generate-with>

 

-    <generate-with class="gquery.rebind.SelectorGeneratorXPath">

-        <when-type-assignable class="gquery.client.Selectors"/>

+    <generate-with class="gwtquery.rebind.SelectorGeneratorXPath">

+        <when-type-assignable class="gwtquery.client.Selectors"/>

         <any>

             <when-property-is name="user.agent" value="gecko1_8"/>

             <when-property-is name="user.agent" value="opera"/>

@@ -37,8 +37,8 @@
         </any>

     </generate-with>

 

-    <generate-with class="gquery.rebind.gebcn.SelectorGeneratorNativeGEBCN">

-        <when-type-assignable class="gquery.client.Selectors"/>

+    <generate-with class="gwtquery.rebind.gebcn.SelectorGeneratorNativeGEBCN">

+        <when-type-assignable class="gwtquery.client.Selectors"/>

         <all>

           <when-property-is name="selectorCapability" value="native"/>

           <when-property-is name="user.agent" value="safari"/>

@@ -46,33 +46,33 @@
     </generate-with>

 

     <!--versions which handle native getElementsByClassName -->

-    <!--<generate-with class="gquery.rebind.gebcn.SelectorGeneratorJSGEBCN">-->

-    <!--<when-type-assignable class="gquery.client.Selectors"/>-->

+    <!--<generate-with class="gwtquery.rebind.gebcn.SelectorGeneratorJSGEBCN">-->

+    <!--<when-type-assignable class="gwtquery.client.Selectors"/>-->

     <!--<when-property-is name="selectorCapability" value="js_gebcn"/>-->

     <!--</generate-with>-->

 

-    <!--<generate-with class="gquery.rebind.gebcn.SelectorGeneratorXPathGEBCN">-->

-    <!--<when-type-assignable class="gquery.client.Selectors"/>-->

+    <!--<generate-with class="gwtquery.rebind.gebcn.SelectorGeneratorXPathGEBCN">-->

+    <!--<when-type-assignable class="gwtquery.client.Selectors"/>-->

     <!--<when-property-is name="selectorCapability" value="xpath_gebcn"/>-->

     <!--</generate-with>-->

 

-    <!--<generate-with class="gquery.rebind.gebcn.SelectorGeneratorNativeGEBCN">-->

-    <!--<when-type-assignable class="gquery.client.Selectors"/>-->

+    <!--<generate-with class="gwtquery.rebind.gebcn.SelectorGeneratorNativeGEBCN">-->

+    <!--<when-type-assignable class="gwtquery.client.Selectors"/>-->

     <!--<when-property-is name="selectorCapability" value="native_gebcn"/>-->

     <!--</generate-with>-->

 

-    <replace-with class="gquery.client.impl.SelectorEngineJS">

-        <when-type-assignable class="gquery.client.impl.SelectorEngineImpl"/>

+    <replace-with class="gwtquery.client.impl.SelectorEngineJS">

+        <when-type-assignable class="gwtquery.client.impl.SelectorEngineImpl"/>

         <when-property-is name="user.agent" value="gecko"/>

     </replace-with>

 

-    <replace-with class="gquery.client.impl.SelectorEngineJSIE">

-        <when-type-assignable class="gquery.client.impl.SelectorEngineImpl"/>

+    <replace-with class="gwtquery.client.impl.SelectorEngineJSIE">

+        <when-type-assignable class="gwtquery.client.impl.SelectorEngineImpl"/>

         <when-property-is name="user.agent" value="ie6"/>

     </replace-with>

 

-    <replace-with class="gquery.client.impl.SelectorEngineXPath">

-        <when-type-assignable class="gquery.client.impl.SelectorEngineImpl"/>

+    <replace-with class="gwtquery.client.impl.SelectorEngineXPath">

+        <when-type-assignable class="gwtquery.client.impl.SelectorEngineImpl"/>

         <any>

             <when-property-is name="user.agent" value="gecko1_8"/>

             <when-property-is name="user.agent" value="opera"/>

@@ -83,8 +83,8 @@
         </any>

     </replace-with>

 

-    <replace-with class="gquery.client.impl.SelectorEngineNative">

-        <when-type-assignable class="gquery.client.impl.SelectorEngineImpl"/>

+    <replace-with class="gwtquery.client.impl.SelectorEngineNative">

+        <when-type-assignable class="gwtquery.client.impl.SelectorEngineImpl"/>

         <all>

             <when-property-is name="user.agent" value="safari"/>

             <when-property-is name="selectorCapability" value="native"/>

diff --git a/gwtquery-core/src/main/java/gquery/client/DeferredGQuery.java b/gwtquery-core/src/main/java/gwtquery/client/DeferredGQuery.java
index ac6e05e3..fe1165ae 100644
--- a/gwtquery-core/src/main/java/gquery/client/DeferredGQuery.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/DeferredGQuery.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.dom.client.Node;

 import com.google.gwt.dom.client.Element;

diff --git a/gwtquery-core/src/main/java/gquery/client/Effects.java b/gwtquery-core/src/main/java/gwtquery/client/Effects.java
index 8e7fff23..abe6345c 100644
--- a/gwtquery-core/src/main/java/gquery/client/Effects.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Effects.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.dom.client.Element;

 import com.google.gwt.dom.client.NodeList;

diff --git a/gwtquery-core/src/main/java/gquery/client/Function.java b/gwtquery-core/src/main/java/gwtquery/client/Function.java
index d42207f6..a30bd8ea 100644
--- a/gwtquery-core/src/main/java/gquery/client/Function.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Function.java
@@ -1,4 +1,4 @@
-package gquery.client;
+package gwtquery.client;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.Event;
diff --git a/gwtquery-core/src/main/java/gquery/client/GQuery.java b/gwtquery-core/src/main/java/gwtquery/client/GQuery.java
index 388ff81a..1fa9bba3 100644
--- a/gwtquery-core/src/main/java/gquery/client/GQuery.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/GQuery.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.GWT;

 import com.google.gwt.dom.client.ButtonElement;

diff --git a/gwtquery-core/src/main/java/gquery/client/JSArray.java b/gwtquery-core/src/main/java/gwtquery/client/JSArray.java
index f28b3c2c..a8049347 100644
--- a/gwtquery-core/src/main/java/gquery/client/JSArray.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/JSArray.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.JavaScriptObject;

 import com.google.gwt.dom.client.Element;

diff --git a/gwtquery-core/src/main/java/gquery/client/MySelectors.java b/gwtquery-core/src/main/java/gwtquery/client/MySelectors.java
index 067a9d5d..5059893b 100644
--- a/gwtquery-core/src/main/java/gquery/client/MySelectors.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/MySelectors.java
@@ -1,4 +1,4 @@
-package gquery.client;
+package gwtquery.client;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NodeList;
diff --git a/gwtquery-core/src/main/java/gquery/client/Plugin.java b/gwtquery-core/src/main/java/gwtquery/client/Plugin.java
index cc8adfbc..9f7864d2 100644
--- a/gwtquery-core/src/main/java/gquery/client/Plugin.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Plugin.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 /**

  * A GQuery plugin

diff --git a/gwtquery-core/src/main/java/gquery/client/Properties.java b/gwtquery-core/src/main/java/gwtquery/client/Properties.java
index cc558a5d..20030926 100644
--- a/gwtquery-core/src/main/java/gquery/client/Properties.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Properties.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.JavaScriptObject;

 

diff --git a/gwtquery-core/src/main/java/gquery/client/Regexp.java b/gwtquery-core/src/main/java/gwtquery/client/Regexp.java
index 3856fdde..5eae1c1d 100644
--- a/gwtquery-core/src/main/java/gquery/client/Regexp.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Regexp.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.JavaScriptObject;

 

diff --git a/gwtquery-core/src/main/java/gquery/client/Selector.java b/gwtquery-core/src/main/java/gwtquery/client/Selector.java
index 3c6f3ed3..a137faa4 100644
--- a/gwtquery-core/src/main/java/gquery/client/Selector.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Selector.java
@@ -1,14 +1,9 @@
-package gquery.client;

+package gwtquery.client;

 

 import java.lang.annotation.Target;

 import java.lang.annotation.Retention;

 import java.lang.annotation.RetentionPolicy;

-import static java.lang.annotation.ElementType.TYPE;

-import static java.lang.annotation.ElementType.FIELD;

 import static java.lang.annotation.ElementType.METHOD;

-import static java.lang.annotation.ElementType.PARAMETER;

-import static java.lang.annotation.ElementType.CONSTRUCTOR;

-import static java.lang.annotation.ElementType.LOCAL_VARIABLE;

 

 /**

  * Used to pass a CSS Selector to a generator at compile time

diff --git a/gwtquery-core/src/main/java/gquery/client/SelectorEngine.java b/gwtquery-core/src/main/java/gwtquery/client/SelectorEngine.java
index fcf994d7..63c246ec 100644
--- a/gwtquery-core/src/main/java/gquery/client/SelectorEngine.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/SelectorEngine.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.GWT;

 import com.google.gwt.core.client.JavaScriptObject;

@@ -7,7 +7,7 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;

 import com.google.gwt.dom.client.NodeList;

 

-import gquery.client.impl.SelectorEngineImpl;

+import gwtquery.client.impl.SelectorEngineImpl;

 

 /**

  *

diff --git a/gwtquery-core/src/main/java/gquery/client/Selectors.java b/gwtquery-core/src/main/java/gwtquery/client/Selectors.java
index 8a697a6c..6ebd5018 100644
--- a/gwtquery-core/src/main/java/gquery/client/Selectors.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/Selectors.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 /**

  */

diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineImpl.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineImpl.java
index 674072ef..18774d0c 100644
--- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineImpl.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineImpl.java
@@ -1,8 +1,8 @@
-package gquery.client.impl;

+package gwtquery.client.impl;

 

-import gquery.client.Regexp;

-import gquery.client.JSArray;

-import gquery.client.SelectorEngine;

+import gwtquery.client.Regexp;

+import gwtquery.client.JSArray;

+import gwtquery.client.SelectorEngine;

 import com.google.gwt.dom.client.*;

 

 /**

diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJS.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJS.java
index d854c4ac..a65e1cdc 100644
--- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJS.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJS.java
@@ -1,13 +1,13 @@
-package gquery.client.impl;

+package gwtquery.client.impl;

 

 import com.google.gwt.dom.client.Document;

 import com.google.gwt.dom.client.Element;

 import com.google.gwt.dom.client.Node;

 import com.google.gwt.dom.client.NodeList;

 

-import gquery.client.JSArray;

-import gquery.client.Regexp;

-import gquery.client.SelectorEngine;

+import gwtquery.client.JSArray;

+import gwtquery.client.Regexp;

+import gwtquery.client.SelectorEngine;

 

 /**

  * Copyright 2007 Timepedia.org Licensed under the Apache License, Version 2.0

diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJSIE.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJSIE.java
index f680c7f9..e7aad623 100644
--- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineJSIE.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineJSIE.java
@@ -1,4 +1,4 @@
-package gquery.client.impl;

+package gwtquery.client.impl;

 

 import com.google.gwt.dom.client.Element;

 

diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineNative.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineNative.java
index aaa7635c..b9e96bd8 100644
--- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineNative.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineNative.java
@@ -1,10 +1,10 @@
-package gquery.client.impl;
+package gwtquery.client.impl;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.dom.client.Node;
 
-import gquery.client.SelectorEngine;
+import gwtquery.client.SelectorEngine;
 
 /**
  *
diff --git a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineXPath.java b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineXPath.java
index 1eed30ee..cbc2ca3b 100644
--- a/gwtquery-core/src/main/java/gquery/client/impl/SelectorEngineXPath.java
+++ b/gwtquery-core/src/main/java/gwtquery/client/impl/SelectorEngineXPath.java
@@ -1,15 +1,15 @@
-package gquery.client.impl;

+package gwtquery.client.impl;

 

 import com.google.gwt.core.client.GWT;

 import com.google.gwt.dom.client.Element;

 import com.google.gwt.dom.client.Node;

 import com.google.gwt.dom.client.NodeList;

 

-import gquery.client.JSArray;

-import gquery.client.Regexp;

-import gquery.client.SelectorEngine;

-import static gquery.client.SelectorEngine.eq;

-import static gquery.client.SelectorEngine.truth;

+import gwtquery.client.JSArray;

+import gwtquery.client.Regexp;

+import gwtquery.client.SelectorEngine;

+import static gwtquery.client.SelectorEngine.eq;

+import static gwtquery.client.SelectorEngine.truth;

 

 /**

  * Copyright 2007 Timepedia.org Licensed under the Apache License, Version 2.0

@@ -225,13 +225,13 @@ public class SelectorEngineXPath extends SelectorEngineImpl {
         if(!allAttr) return "";

         return allAttr.replace(/(\w+)(\^|\$|\*|\||~)?=?([\w\u00C0-\uFFFF\s\-_\.]+)?/g, 

             function(a,b,c,d) {

-              return @gquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(a,b || "",c || "",d || "");

+              return @gwtquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)(a,b || "",c || "",d || "");

             });

             

     }-*/;

 

     private native String replaceAttr2(String allAttr) /*-{

         if(!allAttr) return "";

-        return allAttr.replace(/\[(\w+)(\^|\$|\*|\||~)?=?([\w\u00C0-\uFFFF\s\-_\.]+)?\]/g, @gquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;));

+        return allAttr.replace(/\[(\w+)(\^|\$|\*|\||~)?=?([\w\u00C0-\uFFFF\s\-_\.]+)?\]/g, @gwtquery.client.impl.SelectorEngineXPath::attrToXPath(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;));

     }-*/;

 }
\ No newline at end of file
diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorBase.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorBase.java
index 2d1dba80..21630d1d 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorBase.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorBase.java
@@ -1,4 +1,4 @@
-package gquery.rebind;

+package gwtquery.rebind;

 

 import com.google.gwt.core.ext.Generator;

 import com.google.gwt.core.ext.GeneratorContext;

@@ -13,7 +13,7 @@ import com.google.gwt.user.rebind.SourceWriter;
 

 import java.io.PrintWriter;

 

-import gquery.client.Selector;

+import gwtquery.client.Selector;

 

 /**

  *

@@ -148,10 +148,10 @@ public abstract class SelectorGeneratorBase extends Generator {
     }

     ClassSourceFileComposerFactory composerFactory

         = new ClassSourceFileComposerFactory(packageName, className);

-    composerFactory.setSuperclass("gquery.client.SelectorEngine");

+    composerFactory.setSuperclass("gwtquery.client.SelectorEngine");

     composerFactory.addImport("com.google.gwt.core.client.GWT");

-    composerFactory.addImport("gquery.client.GQuery");

-    composerFactory.addImport("gquery.client.JSArray");

+    composerFactory.addImport("gwtquery.client.GQuery");

+    composerFactory.addImport("gwtquery.client.JSArray");

 

     composerFactory.addImport("com.google.gwt.dom.client.*");

     for (String interfaceName : interfaceNames) {

diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorJS.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorJS.java
index e316a84b..8917f4c9 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorJS.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorJS.java
@@ -1,4 +1,4 @@
-package gquery.rebind;

+package gwtquery.rebind;

 

 import com.google.gwt.core.ext.TreeLogger;

 import com.google.gwt.core.ext.UnableToCompleteException;

@@ -7,7 +7,7 @@ import com.google.gwt.user.rebind.SourceWriter;
 

 import java.util.regex.Pattern;

 

-import gquery.client.Selector;

+import gwtquery.client.Selector;

 

 /**

  *

diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorNative.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorNative.java
index a00de220..e7db5da7 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorNative.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorNative.java
@@ -1,11 +1,11 @@
-package gquery.rebind;

+package gwtquery.rebind;

 

 import com.google.gwt.core.ext.TreeLogger;

 import com.google.gwt.core.ext.UnableToCompleteException;

 import com.google.gwt.core.ext.typeinfo.JMethod;

 import com.google.gwt.user.rebind.SourceWriter;

 

-import gquery.client.Selector;

+import gwtquery.client.Selector;

 

 /**

  *

diff --git a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorXPath.java b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorXPath.java
index ab4ca185..d43cfd3e 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/SelectorGeneratorXPath.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/SelectorGeneratorXPath.java
@@ -1,4 +1,4 @@
-package gquery.rebind;

+package gwtquery.rebind;

 

 import com.google.gwt.core.ext.TreeLogger;

 import com.google.gwt.core.ext.UnableToCompleteException;

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

-import gquery.client.Selector;

+import gwtquery.client.Selector;

 

 /**

  *

diff --git a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java
index 447ddf64..a287303a 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorJSGEBCN.java
@@ -1,6 +1,6 @@
-package gquery.rebind.gebcn;
+package gwtquery.rebind.gebcn;
 
-import gquery.rebind.SelectorGeneratorJS;
+import gwtquery.rebind.SelectorGeneratorJS;
 
 /**
  */
diff --git a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java
index eb1efe36..04226dbd 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorNativeGEBCN.java
@@ -1,6 +1,6 @@
-package gquery.rebind.gebcn;
+package gwtquery.rebind.gebcn;
 
-import gquery.rebind.SelectorGeneratorNative;
+import gwtquery.rebind.SelectorGeneratorNative;
 
 /**
  * 
diff --git a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java
index 36f7f138..9bcce9ce 100644
--- a/gwtquery-core/src/main/java/gquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java
+++ b/gwtquery-core/src/main/java/gwtquery/rebind/gebcn/SelectorGeneratorXPathGEBCN.java
@@ -1,6 +1,6 @@
-package gquery.rebind.gebcn;
+package gwtquery.rebind.gebcn;
 
-import gquery.rebind.SelectorGeneratorXPath;
+import gwtquery.rebind.SelectorGeneratorXPath;
 
 /**
  */
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..c89c4d5e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,153 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gwtquery</groupId>
+  <artifactId>gwtquery-project</artifactId>
+  <packaging>pom</packaging>
+  <version>0.2-SNAPSHOT</version>
+  <name>GwtQuery Project</name>
+  <url>http://gwtquery.com</url>
+  <description>GwtQuery is a jQuery clone written in GWT.</description>
+  <issueManagement>
+    <system>Google Code</system>
+    <url>http://code.google.com/p/gwtquery/issues/list</url>
+  </issueManagement>
+
+  <developers>
+    <developer>
+      <id>ray</id>
+      <name>Ray Cromwell</name>
+      <email>ray@timefire.com</email>
+      <roles>
+        <role>Project Manager</role>
+        <role>Architect</role>
+      </roles>
+      <organization>Timepedia.org</organization>
+      <timezone>-8</timezone>
+    </developer>
+  </developers>
+
+  <scm>
+    <connection>scm:svn:http://gwtquery.googlecode.com/svn/trunk</connection>
+    <developerConnection>scm:svn:https://gwtquery.googlecode.com/svn/trunk</developerConnection>
+    <url>http://code.google.com/p/gwtquery/source/browse/trunk</url>
+  </scm>
+
+  <modules>
+    <module>gwtquery-core</module>
+    <module>samples</module> 
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <tagBase>
+            https://gwtquery.googlecode.com/svn/tags
+          </tagBase>
+           <preparationGoals>clean install</preparationGoals>        
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>changelog-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>gwt-maven</id>
+      <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <repositories>
+    <repository>
+      <id>gwt-maven</id>
+      <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+    </repository>
+    <repository>
+      <id>timepedia</id>
+      <url>http://gwt-chronoscope.googlecode.com/svn/mavenrepo/</url>
+    </repository>
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <jdk>1</jdk>
+      </activation>
+
+      <properties>
+        <gwtversion>1.5.0</gwtversion>
+        <!--		<maven.test.skip>true</maven.test.skip> -->
+      </properties>
+    </profile>
+
+
+    <profile>
+      <id>linux</id>
+      <activation>
+        <os>
+          <name>linux</name>
+        </os>
+      </activation>
+      <properties>
+        <gwtplatform>linux</gwtplatform>
+      </properties>
+    </profile>
+
+      <profile>
+      <id>windows</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <gwtplatform>windows</gwtplatform>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>macosx</id>
+      <activation>
+        <os>
+          <name>mac os x</name>
+        </os>
+      </activation>
+      <properties>
+        <gwtplatform>mac</gwtplatform>
+        <!--                <google.webtoolkit.extrajvmargs>-XstartOnFirstThread</google.webtoolkit.extrajvmargs> -->
+        <google.webtoolkit.extrajvmargs>-Xmx512m -XstartOnFirstThread</google.webtoolkit.extrajvmargs>
+      </properties>
+    </profile>
+
+  </profiles>
+</project>
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 00000000..0859ac53
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,65 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>gwtquery</groupId>
+    <artifactId>gwtquery-project</artifactId>
+    <version>0.2-SNAPSHOT</version>
+  </parent>
+
+  <name>GwtQuery Samples</name>
+  <artifactId>gwtquery-samples</artifactId>
+  <packaging>jar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>gwtquery</artifactId>
+      <version>${version}</version>
+      <type>jar</type>
+    </dependency>
+
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.totsp.gwt</groupId>
+        <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+        <configuration>
+          <gwtVersion>${gwtversion}</gwtVersion>
+          <logLevel>INFO</logLevel>
+          <runTarget>
+            gwtquery.samples.GQueryDemo/index.html
+          </runTarget>
+          <compileTargets>
+            <compileTarget>
+              gwtquery.samples.GQueryDemo
+            </compileTarget>
+            <compileTarget>
+              gwtquery.samples.GQueryBench
+            </compileTarget>
+            <compileTarget>
+              gwtquery.samples.GQuerySample
+            </compileTarget>
+          </compileTargets>
+          <style>OBF</style>
+        </configuration>
+        <executions>
+          <execution>
+            <id>setupgwt</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>setup</goal>
+              <goal>extractGwt</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>compilegwt</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml
new file mode 100644
index 00000000..e1b9159d
--- /dev/null
+++ b/samples/src/main/java/gwtquery/samples/GwtQueryBench.gwt.xml
@@ -0,0 +1,5 @@
+<module>
+    <inherits name='gwtquery.GQuery'/>
+    <entry-point class='gwtquery.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
new file mode 100644
index 00000000..00b219af
--- /dev/null
+++ b/samples/src/main/java/gwtquery/samples/GwtQueryDemo.gwt.xml
@@ -0,0 +1,5 @@
+<module>
+    <inherits name='gwtquery.GQuery'/>
+    <entry-point class='gwtquery.client.GwtQueryDemoModule'/>
+</module>
+    
diff --git a/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml b/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml
new file mode 100644
index 00000000..be8b1706
--- /dev/null
+++ b/samples/src/main/java/gwtquery/samples/GwtQuerySample.gwt.xml
@@ -0,0 +1,5 @@
+<module>
+    <inherits name='gwtquery.GQuery'/>
+    <entry-point class='gwtquery.client.GwtQuerySampleModule'/>
+</module>
+    
diff --git a/gwtquery-core/src/main/java/gquery/client/GQueryBenchModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java
index b7b73560..0d09afa0 100644
--- a/gwtquery-core/src/main/java/gquery/client/GQueryBenchModule.java
+++ b/samples/src/main/java/gwtquery/samples/client/GwtQueryBenchModule.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.EntryPoint;

 import com.google.gwt.core.client.GWT;

@@ -6,9 +6,9 @@ import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;

 import com.google.gwt.user.client.DeferredCommand;

 import com.google.gwt.user.client.IncrementalCommand;

-import static gquery.client.GQuery.$;

+import static gwtquery.client.GQuery.$;

 

-public class GQueryBenchModule implements EntryPoint {

+public class GwtQueryBenchModule implements EntryPoint {

 

     private StringBuffer log = new StringBuffer();

 

diff --git a/gwtquery-core/src/main/java/gquery/client/GQueryDemoModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQueryDemoModule.java
index 5190c21d..b72d0530 100644
--- a/gwtquery-core/src/main/java/gquery/client/GQueryDemoModule.java
+++ b/samples/src/main/java/gwtquery/samples/client/GwtQueryDemoModule.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.EntryPoint;

 import com.google.gwt.core.client.GWT;

@@ -8,13 +8,13 @@ import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Node;

 import com.google.gwt.user.client.Event;

 

-import static gquery.client.GQuery.$;

-import static gquery.client.Effects.Effects;

+import static gwtquery.client.GQuery.$;

+import static gwtquery.client.Effects.Effects;

 

 /**

  * 

  */

-public class GQueryDemoModule implements EntryPoint {

+public class GwtQueryDemoModule implements EntryPoint {

     // Compile-time Selectors!

     interface Slide extends Selectors {

         // find all LI elements in DIV.slide elements

diff --git a/gwtquery-core/src/main/java/gquery/client/GQuerySampleModule.java b/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java
index 2382070f..f14ab702 100644
--- a/gwtquery-core/src/main/java/gquery/client/GQuerySampleModule.java
+++ b/samples/src/main/java/gwtquery/samples/client/GwtQuerySampleModule.java
@@ -1,4 +1,4 @@
-package gquery.client;

+package gwtquery.client;

 

 import com.google.gwt.core.client.EntryPoint;

 import com.google.gwt.core.client.GWT;

@@ -19,7 +19,7 @@ import com.google.gwt.user.client.Window;
  *

  * @author Ray Cromwell <ray@timepedia.log>

  */

-public class GQuerySampleModule implements EntryPoint {

+public class GwtQuerySampleModule implements EntryPoint {

     interface Sample extends Selectors {

       @Selector(".note")

       GQuery allNotes();

diff --git a/gwtquery-core/src/main/java/gquery/public/DOMAssistantComplete-2.7.js b/samples/src/main/java/gwtquery/samples/public/DOMAssistantComplete-2.7.js
index 4f3683a7..4f3683a7 100644
--- a/gwtquery-core/src/main/java/gquery/public/DOMAssistantComplete-2.7.js
+++ b/samples/src/main/java/gwtquery/samples/public/DOMAssistantComplete-2.7.js
diff --git a/gwtquery-core/src/main/java/gquery/public/GQueryBench.html b/samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html
index f2615e16..523616e1 100644
--- a/gwtquery-core/src/main/java/gquery/public/GQueryBench.html
+++ b/samples/src/main/java/gwtquery/samples/public/GwtQueryBench.html
@@ -5,7 +5,7 @@
   <!--<script type="text/javascript" src="ext-base.js"></script>-->

   <!--<script type="text/javascript" src="ext-all.js"></script>-->

   <script type="text/javascript" src="DOMAssistantComplete-2.7.js"></script>

-  <script language="javascript" src="gquery.GQueryBench.nocache.js"></script>

+  <script language="javascript" src="gwtquery.GQueryBench.nocache.js"></script>

   <!--<script language="javascript" src="http://dev.jquery.com/~john/speed/js/jquery.js"></script>-->

   <!--<script type="text/javascript">-->

   <!--$(document).ready(function() {-->

diff --git a/gwtquery-core/src/main/java/gquery/public/GQueryDemo.html b/samples/src/main/java/gwtquery/samples/public/GwtQueryDemo.html
index 03323360..8a79c863 100644
--- a/gwtquery-core/src/main/java/gquery/public/GQueryDemo.html
+++ b/samples/src/main/java/gwtquery/samples/public/GwtQueryDemo.html
@@ -1,7 +1,7 @@
 <html>

 <head>

   <title>GQuery Demo</title>

-  <script language="javascript" src="gquery.GQueryDemo.nocache.js"></script>

+  <script language="javascript" src="gwtquery.GQueryDemo.nocache.js"></script>

   <style type="text/css">

       .slide { border: 1px solid black; width: 800px; height: 600px; display: none}

       .slide { font-size: 200%; }

diff --git a/gwtquery-core/src/main/java/gquery/public/GQuerySample.html b/samples/src/main/java/gwtquery/samples/public/GwtQuerySample.html
index 32e9772a..d86fb503 100644
--- a/gwtquery-core/src/main/java/gquery/public/GQuerySample.html
+++ b/samples/src/main/java/gwtquery/samples/public/GwtQuerySample.html
@@ -1,7 +1,7 @@
 <html>

 <head>

   <title>GQuery Demo</title>

-  <script language="javascript" src="gquery.GQuerySample.nocache.js"></script>

+  <script language="javascript" src="gwtquery.GQuerySample.nocache.js"></script>

 </head>

 <body>

 <div>Foo <span class="note">bar</span> baz</div>

diff --git a/gwtquery-core/src/main/java/gquery/public/ext-all.js b/samples/src/main/java/gwtquery/samples/public/ext-all.js
index 862e75f3..862e75f3 100644
--- a/gwtquery-core/src/main/java/gquery/public/ext-all.js
+++ b/samples/src/main/java/gwtquery/samples/public/ext-all.js
diff --git a/gwtquery-core/src/main/java/gquery/public/ext-base.js b/samples/src/main/java/gwtquery/samples/public/ext-base.js
index fe67cb85..fe67cb85 100644
--- a/gwtquery-core/src/main/java/gquery/public/ext-base.js
+++ b/samples/src/main/java/gwtquery/samples/public/ext-base.js
diff --git a/gwtquery-core/src/main/java/gquery/public/ext-core.js b/samples/src/main/java/gwtquery/samples/public/ext-core.js
index 749d9240..749d9240 100644
--- a/gwtquery-core/src/main/java/gquery/public/ext-core.js
+++ b/samples/src/main/java/gwtquery/samples/public/ext-core.js
diff --git a/gwtquery-core/src/main/java/gquery/public/jquery-1.2.3.js b/samples/src/main/java/gwtquery/samples/public/jquery-1.2.3.js
index ff25a2e1..ff25a2e1 100644
--- a/gwtquery-core/src/main/java/gquery/public/jquery-1.2.3.js
+++ b/samples/src/main/java/gwtquery/samples/public/jquery-1.2.3.js