[pkg-eucalyptus-commits] r231 - gwt/trunk/debian/patches
Chris Halls
halls at alioth.debian.org
Wed Jul 4 12:09:20 UTC 2012
Author: halls
Date: 2012-07-04 12:09:19 +0000 (Wed, 04 Jul 2012)
New Revision: 231
Modified:
gwt/trunk/debian/patches/fix-guava-pkg-path
Log:
fix-guava-pkg-path: Fix some user unit test paths
Modified: gwt/trunk/debian/patches/fix-guava-pkg-path
===================================================================
--- gwt/trunk/debian/patches/fix-guava-pkg-path 2012-07-04 12:09:15 UTC (rev 230)
+++ gwt/trunk/debian/patches/fix-guava-pkg-path 2012-07-04 12:09:19 UTC (rev 231)
@@ -1,7 +1,5 @@
-Index: gwt-debian.git/dev/core/src/com/google/gwt/dev/util/StringInterner.java
-===================================================================
---- gwt-debian.git.orig/dev/core/src/com/google/gwt/dev/util/StringInterner.java 2011-09-01 16:14:21.158642633 +0200
-+++ gwt-debian.git/dev/core/src/com/google/gwt/dev/util/StringInterner.java 2011-09-01 16:29:41.794643479 +0200
+--- 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 @@
package com.google.gwt.dev.util;
@@ -13,10 +11,8 @@
/**
* A utility class for reducing String memory waste. Note that this does not use
-Index: gwt-debian.git/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java
-===================================================================
---- gwt-debian.git.orig/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java 2011-09-01 16:14:21.198643075 +0200
-+++ gwt-debian.git/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java 2011-09-01 16:29:41.806641576 +0200
+--- 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 @@
*/
package com.google.gwt.dev.javac;
@@ -26,10 +22,8 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-Index: gwt-debian.git/dev/core/src/com/google/gwt/dev/util/Strings.java
-===================================================================
---- gwt-debian.git.orig/dev/core/src/com/google/gwt/dev/util/Strings.java 2011-09-01 16:14:21.170642875 +0200
-+++ gwt-debian.git/dev/core/src/com/google/gwt/dev/util/Strings.java 2011-09-01 16:29:41.810687441 +0200
+--- 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 @@
*/
package com.google.gwt.dev.util;
@@ -39,10 +33,8 @@
import java.util.ArrayList;
-Index: gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java 2011-09-01 16:34:27.598145122 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java 2011-09-01 16:35:17.590142122 +0200
+--- 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;
@@ -52,10 +44,8 @@
import com.google.gwt.thirdparty.streamhtmlparser.HtmlParser;
import com.google.gwt.thirdparty.streamhtmlparser.HtmlParserFactory;
import com.google.gwt.thirdparty.streamhtmlparser.ParseException;
-Index: gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java 2011-09-01 16:35:42.534142633 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java 2011-09-01 16:35:52.390142207 +0200
+--- 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;
@@ -65,10 +55,8 @@
import java.net.URI;
import java.net.URISyntaxException;
-Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/BeanHelper.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/BeanHelper.java 2011-09-01 16:39:59.534144664 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/BeanHelper.java 2011-09-01 16:40:10.970142194 +0200
+--- a/user/src/com/google/gwt/validation/rebind/BeanHelper.java
++++ b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
@@ -26,7 +26,7 @@
import com.google.gwt.core.ext.typeinfo.JRawType;
import com.google.gwt.core.ext.typeinfo.JType;
@@ -78,10 +66,8 @@
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.impl.GwtSpecificValidator;
-Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java 2011-09-01 16:38:19.474145570 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java 2011-09-01 16:39:02.942142236 +0200
+--- a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
++++ b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
@@ -28,17 +28,17 @@
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
@@ -111,10 +97,8 @@
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.impl.AbstractGwtSpecificValidator;
-Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/Util.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/Util.java 2011-09-01 16:39:17.870143823 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/Util.java 2011-09-01 16:39:43.870142623 +0200
+--- a/user/src/com/google/gwt/validation/rebind/Util.java
++++ b/user/src/com/google/gwt/validation/rebind/Util.java
@@ -15,14 +15,14 @@
*/
package com.google.gwt.validation.rebind;
@@ -138,10 +122,8 @@
import java.util.HashSet;
import java.util.Iterator;
-Index: gwt-debian.git/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
-===================================================================
---- gwt-debian.git.orig/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java 2011-09-01 16:40:25.210144901 +0200
-+++ gwt-debian.git/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java 2011-09-01 16:40:37.642142278 +0200
+--- a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
++++ b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
@@ -20,8 +20,8 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -153,3 +135,58 @@
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.GwtValidation;
+--- a/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
++++ b/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
+@@ -17,8 +17,8 @@
+
+ import static com.google.gwt.validation.rebind.GwtSpecificValidatorCreator.getValidatorForType;
+
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
++import com.google.common.collect.ImmutableList;
++import com.google.common.collect.ImmutableSet;
+ import com.google.gwt.validation.client.constraints.SizeValidatorForCollection;
+ import com.google.gwt.validation.client.constraints.SizeValidatorForString;
+
+--- a/user/test/com/google/gwt/validation/rebind/UtilTest.java
++++ b/user/test/com/google/gwt/validation/rebind/UtilTest.java
+@@ -17,11 +17,11 @@
+
+ import static com.google.gwt.validation.rebind.Util.findBestMatches;
+
+-import com.google.gwt.thirdparty.guava.common.base.Function;
+-import com.google.gwt.thirdparty.guava.common.base.Functions;
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+-import com.google.gwt.thirdparty.guava.common.collect.Iterables;
++import com.google.common.base.Function;
++import com.google.common.base.Functions;
++import com.google.common.collect.ImmutableList;
++import com.google.common.collect.ImmutableSet;
++import com.google.common.collect.Iterables;
+
+ import junit.framework.TestCase;
+
+--- a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
++++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
+@@ -15,14 +15,14 @@
+ */
+ package org.hibernate.jsr303.tck.util;
+
+-import static com.google.gwt.thirdparty.guava.common.base.Predicates.and;
+-import static com.google.gwt.thirdparty.guava.common.base.Predicates.not;
+-import static com.google.gwt.thirdparty.guava.common.base.Predicates.or;
+-import static com.google.gwt.thirdparty.guava.common.collect.ImmutableList.copyOf;
+-import static com.google.gwt.thirdparty.guava.common.collect.Iterables.filter;
++import static com.google.common.base.Predicates.and;
++import static com.google.common.base.Predicates.not;
++import static com.google.common.base.Predicates.or;
++import static com.google.common.collect.ImmutableList.copyOf;
++import static com.google.common.collect.Iterables.filter;
+
+ import com.google.gwt.junit.tools.GWTTestSuite;
+-import com.google.gwt.thirdparty.guava.common.base.Predicate;
++import com.google.common.base.Predicate;
+
+ import junit.framework.Test;
+ import junit.framework.TestCase;
More information about the pkg-eucalyptus-commits
mailing list