Extract gwt-resources-core from gwt-resources

Author: tbroyer

user/gwt-resources-core/pom.xml

@@ -0,0 +1,48 @@
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>gwt-user-parent</artifactId>
+    <groupId>com.google.gwt.user</groupId>
+    <version>2.6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>gwt-resources-core</artifactId>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <!-- embed sources in the JAR -->
+      <resource>
+        <directory>src/main/java</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+      <!-- include sources for the tests -->
+      <testResource>
+        <directory>src/test/java</directory>
+      </testResource>
+    </testResources>
+  </build>
+
+  <dependencies>
+    <!-- SafeUri and UriUtils -->
+    <dependency>
+      <groupId>com.google.gwt.user</groupId>
+      <artifactId>gwt-safehtml-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt.dev</groupId>
+      <artifactId>gwt-dev-ext</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

user/gwt-resources/src/main/java/com/google/gwt/resources/client/ClientBundle.java renamed to user/gwt-resources-core/src/main/java/com/google/gwt/resources/client/ClientBundle.java

@@ -0,0 +1,63 @@
+<!--                                                                        -->
+<!-- Copyright 2008 Google Inc.                                             -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you    -->
+<!-- may not use this file except in compliance with the License. You may   -->
+<!-- may obtain a copy of the License at                                    -->
+<!--                                                                        -->
+<!-- http://www.apache.org/licenses/LICENSE-2.0                             -->
+<!--                                                                        -->
+<!-- Unless required by applicable law or agreed to in writing, software    -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS,      -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        -->
+<!-- implied. License for the specific language governing permissions and   -->
+<!-- limitations under the License.                                         -->
+
+<!-- ClientBundle supports renaming files with strong names at compile time  -->
+<module>
+  <!-- Pull in the necessary base support, including user.agent detection -->
+  <inherits name="com.google.gwt.core.Core" />
+  <inherits name="com.google.gwt.useragent.UserAgent" />
+  <!-- Pull in SafeUri and SafeUriUtils -->
+  <inherits name="com.google.gwt.safehtml.SafeHtml" />
+
+  <!--  This acts as a switch to disable the use of data: URLs -->
+  <define-property name="ClientBundle.enableInlining" values="true,false" />
+  <set-property name="ClientBundle.enableInlining" value="true" />
+
+  <!-- Specify the default behavior which should work on all browsers -->
+  <generate-with
+    class="com.google.gwt.resources.rebind.context.StaticClientBundleGenerator">
+
+    <!-- We have to specify on which types to execute the Generator -->
+    <when-type-assignable
+      class="com.google.gwt.resources.client.ClientBundle" />
+  </generate-with>
+
+  <!-- Last-matches wins, so this will selectively override the previous rule -->
+  <generate-with
+    class="com.google.gwt.resources.rebind.context.InlineClientBundleGenerator">
+
+    <!-- We have a number of conditions that must be satisfied -->
+    <all>
+      <!-- Is inlining enabled? -->
+      <when-property-is name="ClientBundle.enableInlining" value="true" />
+
+      <!-- Again, it's necessary to specify which types the generator runs on -->
+      <when-type-assignable
+        class="com.google.gwt.resources.client.ClientBundle" />
+
+      <!-- Only some browsers support RFC 2397 data: URLs -->
+      <any>
+        <when-property-is name="user.agent" value="safari" />
+        <when-property-is name="user.agent" value="opera" />
+        <when-property-is name="user.agent" value="gecko1_8" />
+        <when-property-is name="user.agent" value="ie8" />
+        <when-property-is name="user.agent" value="ie9" />
+      </any>
+    </all>
+  </generate-with>
+
+  <!-- This can be used to disable the use of strongly-named files -->
+  <define-configuration-property name="ClientBundle.enableRenaming" is-multi-valued="false" />
+  <set-configuration-property name="ClientBundle.enableRenaming" value="true" />
+</module>

user/gwt-resources/src/main/java/com/google/gwt/resources/client/ClientBundleWithLookup.java renamed to user/gwt-resources-core/src/main/java/com/google/gwt/resources/client/ClientBundleWithLookup.java

@@ -33,6 +33,21 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.gwt.user</groupId>
+      <artifactId>gwt-safehtml-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt.user</groupId>
+      <artifactId>gwt-jsonp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt.user</groupId>
+      <artifactId>gwt-i18n-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.gwt.util</groupId>
       <artifactId>gwt-tools-api</artifactId>

user/gwt-resources/src/main/java/com/google/gwt/resources/client/DataResource.java renamed to user/gwt-resources-core/src/main/java/com/google/gwt/resources/client/DataResource.java

@@ -14,58 +14,13 @@
 
 <!-- ClientBundle supports renaming files with strong names at compile time  -->
 <module>
-  <!-- Pull in the necessary base support, including user.agent detection -->
-  <inherits name="com.google.gwt.core.Core" />
-  <inherits name="com.google.gwt.useragent.UserAgent" />
-  <!-- Pull in SafeUri and SafeUriUtils -->
-  <inherits name="com.google.gwt.safehtml.SafeHtml" />
+  <inherits name="com.google.gwt.resources.ResourcesBase" />
   <!-- Pull in StyleInjector for CssResource -->
   <inherits name="com.google.gwt.dom.DOM" />
   <!-- Used by ExternalTextResource -->
   <inherits name="com.google.gwt.http.HTTP" />
   <inherits name="com.google.gwt.jsonp.Jsonp" />
 
-  <!--  This acts as a switch to disable the use of data: URLs -->
-  <define-property name="ClientBundle.enableInlining" values="true,false" />
-  <set-property name="ClientBundle.enableInlining" value="true" />
-
-  <!-- Specify the default behavior which should work on all browsers -->
-  <generate-with
-    class="com.google.gwt.resources.rebind.context.StaticClientBundleGenerator">
-
-    <!-- We have to specify on which types to execute the Generator -->
-    <when-type-assignable
-      class="com.google.gwt.resources.client.ClientBundle" />
-  </generate-with>
-
-  <!-- Last-matches wins, so this will selectively override the previous rule -->
-  <generate-with
-    class="com.google.gwt.resources.rebind.context.InlineClientBundleGenerator">
-
-    <!-- We have a number of conditions that must be satisfied -->
-    <all>
-      <!-- Is inlining enabled? -->
-      <when-property-is name="ClientBundle.enableInlining" value="true" />
-
-      <!-- Again, it's necessary to specify which types the generator runs on -->
-      <when-type-assignable
-        class="com.google.gwt.resources.client.ClientBundle" />
-
-      <!-- Only some browsers support RFC 2397 data: URLs -->
-      <any>
-        <when-property-is name="user.agent" value="safari" />
-        <when-property-is name="user.agent" value="opera" />
-        <when-property-is name="user.agent" value="gecko1_8" />
-        <when-property-is name="user.agent" value="ie8" />
-        <when-property-is name="user.agent" value="ie9" />
-      </any>
-    </all>
-  </generate-with>
-
-  <!-- This can be used to disable the use of strongly-named files -->
-  <define-configuration-property name="ClientBundle.enableRenaming" is-multi-valued="false" />
-  <set-configuration-property name="ClientBundle.enableRenaming" value="true" />
-
   <!-- This allows merging of CSS rules to be disabled. -->
   <define-configuration-property name="CssResource.mergeEnabled" is-multi-valued="false" />
   <set-configuration-property name="CssResource.mergeEnabled" value="true" />

user/gwt-resources/src/main/java/com/google/gwt/resources/client/GwtCreateResource.java renamed to user/gwt-resources-core/src/main/java/com/google/gwt/resources/client/GwtCreateResource.java

@@ -24,7 +24,7 @@
   <inherits name="com.google.gwt.useragent.UserAgent"/>
   <inherits name="com.google.gwt.user.Cookies"/>
   <!-- Needed by WindowImplIE -->
-  <inherits name="com.google.gwt.resources.Resources"/>
+  <inherits name="com.google.gwt.resources.ResourcesBase"/>
 
   <source path="client">
     <include name="BaseListenerWrapper.java"/>

user/gwt-resources/src/main/java/com/google/gwt/resources/client/ResourceCallback.java renamed to user/gwt-resources-core/src/main/java/com/google/gwt/resources/client/ResourceCallback.java

@@ -113,6 +113,7 @@
         <module>gwt-safecss-server</module>
         <module>gwt-safecss-client</module>
         <module>gwt-safehtml-client</module>
+        <module>gwt-resources-core</module>
         <module>gwt-jsonp</module>
         <module>gwt-resources</module>
         <module>gwt-window</module>