From 692adc47f448002099ff6d5960abc24d474a0365 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Mon, 1 Dec 2014 16:46:51 -0800
Subject: [PATCH] Move our GWT stuff around.

This avoids having it look like normal Java source and then confusing tools
because there are two copies of DefaultCollector.
---
 pom.xml                                              | 12 +++++-------
 .../{java => gwt}/com/samskivert/Mustache.gwt.xml    |  2 +-
 .../com/samskivert/mustache/DefaultCollector.java    |  0
 .../com/samskivert/super}/java/io/Reader.java        |  0
 .../com/samskivert/super}/java/io/StringReader.java  |  0
 .../com/samskivert/super}/java/io/StringWriter.java  |  0
 .../com/samskivert/super}/java/io/Writer.java        |  0
 7 files changed, 6 insertions(+), 8 deletions(-)
 rename src/main/{java => gwt}/com/samskivert/Mustache.gwt.xml (71%)
 rename src/main/{java/com/samskivert/gwt => gwt/com/samskivert/super}/com/samskivert/mustache/DefaultCollector.java (100%)
 rename src/main/{java/com/samskivert/gwt => gwt/com/samskivert/super}/java/io/Reader.java (100%)
 rename src/main/{java/com/samskivert/gwt => gwt/com/samskivert/super}/java/io/StringReader.java (100%)
 rename src/main/{java/com/samskivert/gwt => gwt/com/samskivert/super}/java/io/StringWriter.java (100%)
 rename src/main/{java/com/samskivert/gwt => gwt/com/samskivert/super}/java/io/Writer.java (100%)

diff --git a/pom.xml b/pom.xml
index 7f252ca..99ba251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,14 +69,18 @@
   </dependencies>
 
   <build>
-    <!-- we include the source files in our main jar for use by GWT -->
     <resources>
+      <!-- include the source files in our main jar for use by GWT -->
       <resource>
         <directory>${project.build.sourceDirectory}</directory>
         <excludes>
           <exclude>com/samskivert/mustache/DefaultCollector.java</exclude>
         </excludes>
       </resource>
+      <!-- also include the GWT-specific sources -->
+      <resource>
+        <directory>src/main/gwt</directory>
+      </resource>
     </resources>
 
     <plugins>
@@ -95,9 +99,6 @@
             <arg>-Xlint:-serial</arg>
             <arg>-Xlint:-path</arg>
           </compilerArgs>
-          <excludes>
-            <exclude>com/samskivert/gwt/**</exclude>
-          </excludes>
         </configuration>
       </plugin>
       <plugin>
@@ -152,9 +153,6 @@
         <configuration>
           <quiet>true</quiet>
           <show>public</show>
-          <sourceFileExcludes>
-            <exclude>com/samskivert/gwt/**</exclude>
-          </sourceFileExcludes>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/java/com/samskivert/Mustache.gwt.xml b/src/main/gwt/com/samskivert/Mustache.gwt.xml
similarity index 71%
rename from src/main/java/com/samskivert/Mustache.gwt.xml
rename to src/main/gwt/com/samskivert/Mustache.gwt.xml
index 9945785..9c563a2 100644
--- a/src/main/java/com/samskivert/Mustache.gwt.xml
+++ b/src/main/gwt/com/samskivert/Mustache.gwt.xml
@@ -1,5 +1,5 @@
 <!-- defines our GWT module -->
 <module>
   <source path="mustache"/>
-  <super-source path="gwt"/>
+  <super-source path="super"/>
 </module>
diff --git a/src/main/java/com/samskivert/gwt/com/samskivert/mustache/DefaultCollector.java b/src/main/gwt/com/samskivert/super/com/samskivert/mustache/DefaultCollector.java
similarity index 100%
rename from src/main/java/com/samskivert/gwt/com/samskivert/mustache/DefaultCollector.java
rename to src/main/gwt/com/samskivert/super/com/samskivert/mustache/DefaultCollector.java
diff --git a/src/main/java/com/samskivert/gwt/java/io/Reader.java b/src/main/gwt/com/samskivert/super/java/io/Reader.java
similarity index 100%
rename from src/main/java/com/samskivert/gwt/java/io/Reader.java
rename to src/main/gwt/com/samskivert/super/java/io/Reader.java
diff --git a/src/main/java/com/samskivert/gwt/java/io/StringReader.java b/src/main/gwt/com/samskivert/super/java/io/StringReader.java
similarity index 100%
rename from src/main/java/com/samskivert/gwt/java/io/StringReader.java
rename to src/main/gwt/com/samskivert/super/java/io/StringReader.java
diff --git a/src/main/java/com/samskivert/gwt/java/io/StringWriter.java b/src/main/gwt/com/samskivert/super/java/io/StringWriter.java
similarity index 100%
rename from src/main/java/com/samskivert/gwt/java/io/StringWriter.java
rename to src/main/gwt/com/samskivert/super/java/io/StringWriter.java
diff --git a/src/main/java/com/samskivert/gwt/java/io/Writer.java b/src/main/gwt/com/samskivert/super/java/io/Writer.java
similarity index 100%
rename from src/main/java/com/samskivert/gwt/java/io/Writer.java
rename to src/main/gwt/com/samskivert/super/java/io/Writer.java