[pkg-eucalyptus-commits] r293 - gwt/trunk/debian/patches
Charles Plessy
plessy at alioth.debian.org
Sat Nov 3 10:59:34 UTC 2012
Author: plessy
Date: 2012-11-03 10:59:34 +0000 (Sat, 03 Nov 2012)
New Revision: 293
Modified:
gwt/trunk/debian/patches/fix-guava-pkg-path
Log:
find . -name '*.java' | xargs sed -i -e 's/.gwt.thirdparty.guava//
Modified: gwt/trunk/debian/patches/fix-guava-pkg-path
===================================================================
--- gwt/trunk/debian/patches/fix-guava-pkg-path 2012-11-03 09:47:38 UTC (rev 292)
+++ gwt/trunk/debian/patches/fix-guava-pkg-path 2012-11-03 10:59:34 UTC (rev 293)
@@ -1,16 +1,46 @@
---- a/dev/core/src/com/google/gwt/dev/util/StringInterner.java
-+++ b/dev/core/src/com/google/gwt/dev/util/StringInterner.java
-@@ -16,8 +16,8 @@
+diff --git a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
+index 556a6d7..86d9998 100644
+--- a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
++++ b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
+@@ -36,8 +36,8 @@ import com.google.gwt.dev.About;
+ import com.google.gwt.dev.js.JsToStringGenerationVisitor;
+ import com.google.gwt.dev.util.DefaultTextOutput;
+ import com.google.gwt.dev.util.TextOutput;
+-import com.google.gwt.thirdparty.guava.common.base.Joiner;
+-import com.google.gwt.thirdparty.guava.common.base.Splitter;
++import com.google.common.base.Joiner;
++import com.google.common.base.Splitter;
+ import com.google.gwt.util.tools.Utility;
- package com.google.gwt.dev.util;
+ import java.io.IOException;
+diff --git a/dev/core/src/com/google/gwt/dev/CompileModule.java b/dev/core/src/com/google/gwt/dev/CompileModule.java
+index f9df91a..4b1cb43 100644
+--- a/dev/core/src/com/google/gwt/dev/CompileModule.java
++++ b/dev/core/src/com/google/gwt/dev/CompileModule.java
+@@ -34,7 +34,7 @@ import com.google.gwt.dev.util.arg.OptionOutDir;
+ import com.google.gwt.dev.util.arg.OptionStrict;
+ import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+-import com.google.gwt.thirdparty.guava.common.collect.Sets;
++import com.google.common.collect.Sets;
--import com.google.gwt.thirdparty.guava.common.collect.Interner;
--import com.google.gwt.thirdparty.guava.common.collect.Interners;
-+import com.google.common.collect.Interner;
-+import com.google.common.collect.Interners;
+ import java.io.File;
+ import java.io.IOException;
+diff --git a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
+index 166723b..8170400 100644
+--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
++++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
+@@ -22,7 +22,7 @@ import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+ import com.google.gwt.dev.util.xml.ReflectiveParser;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+ import com.google.gwt.util.tools.Utility;
- /**
- * A utility class for reducing String memory waste. Note that this does not use
+ import java.io.File;
+diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java
+index 8de15f4..fd265de 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java
@@ -15,7 +15,7 @@
@@ -22,6 +52,216 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+diff --git a/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java b/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java
+index 875ce26..f9457ec 100644
+--- a/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java
++++ b/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java
+@@ -16,7 +16,7 @@
+ package com.google.gwt.dev.javac;
+
+ import com.google.gwt.core.ext.TreeLogger;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+
+ import java.util.Map;
+
+diff --git a/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java b/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
+index de16ed7..e1da051 100644
+--- a/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
++++ b/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
+@@ -28,7 +28,7 @@ import com.google.gwt.dev.resource.Resource;
+ import com.google.gwt.dev.util.Name;
+ import com.google.gwt.dev.util.collect.HashMap;
+ import com.google.gwt.dev.util.collect.IdentityHashMap;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+
+ import java.lang.annotation.Annotation;
+ import java.util.ArrayList;
+diff --git a/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java b/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
+index 8e13492..9d5f726 100644
+--- a/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
++++ b/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
+@@ -21,7 +21,7 @@ import com.google.gwt.dev.jjs.ast.JDeclaredType;
+ import com.google.gwt.dev.jjs.ast.JField;
+ import com.google.gwt.dev.jjs.ast.JMethod;
+ import com.google.gwt.dev.jjs.ast.JType;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+
+ import java.io.Serializable;
+ import java.util.EnumMap;
+diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+index 042e145..c0232d0 100644
+--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
++++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+@@ -149,7 +149,7 @@ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+ import com.google.gwt.soyc.SoycDashboard;
+ import com.google.gwt.soyc.io.ArtifactsOutputDirectory;
+-import com.google.gwt.thirdparty.guava.common.collect.Multimap;
++import com.google.common.collect.Multimap;
+
+ import org.xml.sax.SAXException;
+
+diff --git a/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java b/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
+index fd44cd1..892284a 100644
+--- a/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
++++ b/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
+@@ -30,12 +30,12 @@ import com.google.gwt.dev.jjs.ast.JVisitor;
+ import com.google.gwt.dev.jjs.ast.js.JsniMethodBody;
+ import com.google.gwt.dev.js.ast.JsContext;
+ import com.google.gwt.dev.js.ast.JsExpression;
+-import com.google.gwt.thirdparty.guava.common.base.Charsets;
+-import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+-import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+-import com.google.gwt.thirdparty.guava.common.collect.Sets;
+-import com.google.gwt.thirdparty.guava.common.io.Files;
++import com.google.common.base.Charsets;
++import com.google.common.collect.HashMultimap;
++import com.google.common.collect.ImmutableSet;
++import com.google.common.collect.Multimap;
++import com.google.common.collect.Sets;
++import com.google.common.io.Files;
+
+ import java.io.File;
+ import java.io.IOException;
+diff --git a/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java b/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java
+index 0a437b0..7ee4ef0 100644
+--- a/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java
++++ b/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java
+@@ -14,7 +14,7 @@
+
+ package com.google.gwt.dev.js;
+
+-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
++import com.google.common.base.Preconditions;
+ import com.google.gwt.thirdparty.javascript.jscomp.AbstractCompiler;
+ import com.google.gwt.thirdparty.javascript.jscomp.SourceAst;
+ import com.google.gwt.thirdparty.javascript.jscomp.SourceFile;
+diff --git a/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java b/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java
+index f52370e..a6e8466 100644
+--- a/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java
++++ b/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java
+@@ -69,8 +69,8 @@ import com.google.gwt.dev.js.ast.JsVars;
+ import com.google.gwt.dev.js.ast.JsVars.JsVar;
+ import com.google.gwt.dev.js.ast.JsWhile;
+ import com.google.gwt.dev.js.ast.NodeKind;
+-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+-import com.google.gwt.thirdparty.guava.common.collect.Sets;
++import com.google.common.base.Preconditions;
++import com.google.common.collect.Sets;
+ import com.google.gwt.thirdparty.javascript.jscomp.AstValidator;
+ import com.google.gwt.thirdparty.javascript.rhino.IR;
+ import com.google.gwt.thirdparty.javascript.rhino.InputId;
+diff --git a/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java b/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java
+index b14c8a1..6afe949 100644
+--- a/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java
++++ b/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java
+@@ -19,13 +19,13 @@ import com.google.gwt.dev.jjs.ast.JProgram;
+ import com.google.gwt.dev.jjs.impl.CodeSplitter2.FragmentPartitioningResult;
+ import com.google.gwt.dev.js.ast.JsProgram;
+ import com.google.gwt.dev.js.ast.JsProgramFragment;
+-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+-import com.google.gwt.thirdparty.guava.common.base.Throwables;
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+-import com.google.gwt.thirdparty.guava.common.collect.Lists;
+-import com.google.gwt.thirdparty.guava.common.collect.Maps;
+-import com.google.gwt.thirdparty.guava.common.collect.Sets;
+-import com.google.gwt.thirdparty.guava.common.io.LimitInputStream;
++import com.google.common.base.Preconditions;
++import com.google.common.base.Throwables;
++import com.google.common.collect.ImmutableList;
++import com.google.common.collect.Lists;
++import com.google.common.collect.Maps;
++import com.google.common.collect.Sets;
++import com.google.common.io.LimitInputStream;
+ import com.google.gwt.thirdparty.javascript.jscomp.CheckLevel;
+ import com.google.gwt.thirdparty.javascript.jscomp.Compiler;
+ import com.google.gwt.thirdparty.javascript.jscomp.CompilerInput;
+diff --git a/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java b/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java
+index 8ab3ea0..557485c 100644
+--- a/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java
++++ b/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java
+@@ -29,8 +29,8 @@ import com.google.gwt.dev.js.ast.JsObjectLiteral;
+ import com.google.gwt.dev.js.ast.JsProgram;
+ import com.google.gwt.dev.js.ast.JsPropertyInitializer;
+ import com.google.gwt.dev.js.ast.JsStringLiteral;
+-import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+-import com.google.gwt.thirdparty.guava.common.collect.Multimap;
++import com.google.common.annotations.VisibleForTesting;
++import com.google.common.collect.Multimap;
+
+ import java.util.List;
+
+diff --git a/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java b/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
+index 29d0bbb..d6f4155 100644
+--- a/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
++++ b/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
+@@ -29,7 +29,7 @@ import com.google.gwt.dev.js.ast.JsPostfixOperation;
+ import com.google.gwt.dev.js.ast.JsPrefixOperation;
+ import com.google.gwt.dev.js.ast.JsUnaryOperator;
+ import com.google.gwt.dev.js.ast.JsWhile;
+-import com.google.gwt.thirdparty.guava.common.collect.Sets;
++import com.google.common.collect.Sets;
+
+ import java.util.Set;
+
+diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
+index daaffc5..0d12f4a 100644
+--- a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
++++ b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
+@@ -25,7 +25,7 @@ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+ import com.google.gwt.dev.util.msg.Message0;
+ import com.google.gwt.dev.util.msg.Message1String;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+
+ import java.io.File;
+ import java.io.IOException;
+diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java b/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java
+index 110de6a..130cada 100644
+--- a/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java
++++ b/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java
+@@ -21,7 +21,7 @@ import com.google.gwt.dev.util.collect.IdentityHashSet;
+ import com.google.gwt.dev.util.collect.IdentityMaps;
+ import com.google.gwt.dev.util.collect.Sets;
+ import com.google.gwt.dev.util.msg.Message1String;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+
+ import java.io.File;
+ import java.io.IOException;
+diff --git a/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java b/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java
+index dd13008..3b1ec36 100644
+--- a/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java
++++ b/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java
+@@ -45,7 +45,7 @@ import com.google.gwt.dev.util.collect.Lists;
+ import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+ import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+ import com.google.gwt.util.tools.Utility;
+
+ import java.beans.Beans;
+diff --git a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
+index 9e7ead7..4795118 100644
+--- a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
++++ b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
+@@ -27,7 +27,7 @@ import com.google.gwt.dev.resource.Resource;
+ import com.google.gwt.dev.shell.log.ServletContextTreeLogger;
+ import com.google.gwt.dev.util.HttpHeaders;
+ import com.google.gwt.dev.util.Util;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+ import com.google.gwt.util.tools.Utility;
+
+ import java.io.File;
+diff --git a/dev/core/src/com/google/gwt/dev/util/Strings.java b/dev/core/src/com/google/gwt/dev/util/Strings.java
+index 322d497..d8a0042 100644
--- a/dev/core/src/com/google/gwt/dev/util/Strings.java
+++ b/dev/core/src/com/google/gwt/dev/util/Strings.java
@@ -15,7 +15,7 @@
@@ -33,44 +273,125 @@
import java.util.ArrayList;
+diff --git a/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java b/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java
+index 759bf3d..439fcd2 100644
+--- a/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java
++++ b/dev/core/test/com/google/gwt/dev/javac/TypeOracleMediatorTestBase.java
+@@ -64,7 +64,7 @@ import com.google.gwt.dev.resource.Resource;
+ import com.google.gwt.dev.util.Util;
+ import com.google.gwt.dev.util.log.AbstractTreeLogger;
+ import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+-import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
++import com.google.common.collect.MapMaker;
+
+ import junit.framework.TestCase;
+
+diff --git a/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java b/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
+index d1ba72a..7dcaf80 100644
+--- a/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
++++ b/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
+@@ -26,11 +26,11 @@ import com.google.gwt.dev.js.ast.JsName;
+ import com.google.gwt.dev.js.ast.JsObjectLiteral;
+ import com.google.gwt.dev.js.ast.JsProgram;
+ import com.google.gwt.dev.js.ast.JsStatement;
+-import com.google.gwt.thirdparty.guava.common.base.Splitter;
+-import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+-import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultimap;
+-import com.google.gwt.thirdparty.guava.common.collect.Maps;
+-import com.google.gwt.thirdparty.guava.common.collect.Multimap;
++import com.google.common.base.Splitter;
++import com.google.common.collect.HashMultimap;
++import com.google.common.collect.LinkedHashMultimap;
++import com.google.common.collect.Maps;
++import com.google.common.collect.Multimap;
+
+ import junit.framework.TestCase;
+
+diff --git a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
+index fcf5571..0b2fa51 100644
+--- a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
++++ b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
+@@ -17,7 +17,7 @@ package com.google.gwt.junit;
+
+ import com.google.gwt.core.ext.TreeLogger;
+ import com.google.gwt.dev.shell.HostedModePluginObject;
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
++import com.google.common.collect.ImmutableSet;
+
+ import com.gargoylesoftware.htmlunit.AlertHandler;
+ import com.gargoylesoftware.htmlunit.BrowserVersion;
+diff --git a/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java b/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java
+index 0fe7c04..49ec028 100644
+--- a/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java
++++ b/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java
+@@ -71,7 +71,7 @@ import com.google.gwt.resources.ext.ClientBundleRequirements;
+ import com.google.gwt.resources.ext.ResourceContext;
+ import com.google.gwt.resources.ext.ResourceGeneratorUtil;
+ import com.google.gwt.resources.ext.SupportsGeneratorResultCaching;
+-import com.google.gwt.thirdparty.guava.common.base.Joiner;
++import com.google.common.base.Joiner;
+ import com.google.gwt.user.rebind.SourceWriter;
+ import com.google.gwt.user.rebind.StringSourceWriter;
+
+diff --git a/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java b/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
+index 4aaadae..e794494 100644
+--- a/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
++++ b/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
+@@ -16,7 +16,7 @@
+ package com.google.gwt.safecss.shared;
+
+ import com.google.gwt.core.shared.GWT;
+-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
++import com.google.common.base.Preconditions;
+
+ import java.util.HashMap;
+ import java.util.Stack;
+diff --git a/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java b/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
+index 04b3def..06811cb 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
@@ -16,7 +16,7 @@
package com.google.gwt.safehtml.shared;
- import com.google.gwt.core.client.GWT;
+ import com.google.gwt.core.shared.GWT;
-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import com.google.gwt.thirdparty.streamhtmlparser.HtmlParser;
import com.google.gwt.thirdparty.streamhtmlparser.HtmlParserFactory;
import com.google.gwt.thirdparty.streamhtmlparser.ParseException;
+diff --git a/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java b/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
+index 6b52143..0d990bd 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
@@ -16,7 +16,7 @@
package com.google.gwt.safehtml.shared;
- import com.google.gwt.core.client.GWT;
+ import com.google.gwt.core.shared.GWT;
-import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import java.net.URI;
import java.net.URISyntaxException;
+diff --git a/user/src/com/google/gwt/validation/rebind/BeanHelper.java b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
+index 4e5134f..a9e0263 100644
--- a/user/src/com/google/gwt/validation/rebind/BeanHelper.java
+++ b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
-@@ -26,7 +26,7 @@
+@@ -22,7 +22,7 @@ import com.google.gwt.core.ext.typeinfo.JParameterizedType;
import com.google.gwt.core.ext.typeinfo.JRawType;
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
-import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.common.base.Function;
- import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
- import com.google.gwt.user.rebind.SourceWriter;
- import com.google.gwt.validation.client.impl.GwtSpecificValidator;
+
+ import javax.validation.metadata.BeanDescriptor;
+ import javax.validation.metadata.PropertyDescriptor;
+diff --git a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
+index dfcd5a7..19daab7 100644
--- a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
-@@ -28,17 +28,17 @@
+@@ -27,17 +27,17 @@ import com.google.gwt.core.ext.typeinfo.JMethod;
+ import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
import com.google.gwt.core.ext.typeinfo.JType;
- import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.jjs.ast.JProgram;
-import com.google.gwt.thirdparty.guava.common.base.Function;
-import com.google.gwt.thirdparty.guava.common.base.Functions;
@@ -97,6 +418,8 @@
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.impl.AbstractGwtSpecificValidator;
+diff --git a/user/src/com/google/gwt/validation/rebind/Util.java b/user/src/com/google/gwt/validation/rebind/Util.java
+index f24b653..3b73b3a 100644
--- a/user/src/com/google/gwt/validation/rebind/Util.java
+++ b/user/src/com/google/gwt/validation/rebind/Util.java
@@ -15,14 +15,14 @@
@@ -122,9 +445,11 @@
import java.util.HashSet;
import java.util.Iterator;
+diff --git a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
+index 3944e19..6d9f794 100644
--- a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
-@@ -20,8 +20,8 @@
+@@ -20,8 +20,8 @@ import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JClassType;
@@ -135,9 +460,11 @@
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.GwtValidation;
+diff --git a/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java b/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
+index aa9399b..e5dcab1 100644
--- a/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
+++ b/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
-@@ -17,8 +17,8 @@
+@@ -17,8 +17,8 @@ package com.google.gwt.validation.rebind;
import static com.google.gwt.validation.rebind.GwtSpecificValidatorCreator.getValidatorForType;
@@ -148,9 +475,11 @@
import com.google.gwt.validation.client.constraints.SizeValidatorForCollection;
import com.google.gwt.validation.client.constraints.SizeValidatorForString;
+diff --git a/user/test/com/google/gwt/validation/rebind/UtilTest.java b/user/test/com/google/gwt/validation/rebind/UtilTest.java
+index 1e42976..1fbe9ed 100644
--- a/user/test/com/google/gwt/validation/rebind/UtilTest.java
+++ b/user/test/com/google/gwt/validation/rebind/UtilTest.java
-@@ -17,11 +17,11 @@
+@@ -17,11 +17,11 @@ package com.google.gwt.validation.rebind;
import static com.google.gwt.validation.rebind.Util.findBestMatches;
@@ -167,6 +496,8 @@
import junit.framework.TestCase;
+diff --git a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
+index e58710e..a7ac765 100644
--- a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
+++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
@@ -15,14 +15,14 @@
More information about the pkg-eucalyptus-commits
mailing list