Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5291C18126 for ; Fri, 29 Jan 2016 01:16:34 +0000 (UTC) Received: (qmail 32912 invoked by uid 500); 29 Jan 2016 01:16:29 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 32876 invoked by uid 500); 29 Jan 2016 01:16:29 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 32864 invoked by uid 99); 29 Jan 2016 01:16:29 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jan 2016 01:16:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id C25BE18052A for ; Fri, 29 Jan 2016 01:16:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id L-SbKoJyOwv6 for ; Fri, 29 Jan 2016 01:16:21 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 5633F31AF8 for ; Fri, 29 Jan 2016 01:16:19 +0000 (UTC) Received: (qmail 31930 invoked by uid 99); 29 Jan 2016 01:16:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jan 2016 01:16:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 17C86E0BB6; Fri, 29 Jan 2016 01:16:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.incubator.apache.org Date: Fri, 29 Jan 2016 01:16:31 -0000 Message-Id: <791f5492f0594e39bae3896c11351528@git.apache.org> In-Reply-To: <7953555325cd412f9d6803766f987267@git.apache.org> References: <7953555325cd412f9d6803766f987267@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/52] [abbrv] incubator-geode git commit: GEODE-819: Fix merge conflicts that were somehow undone GEODE-819: Fix merge conflicts that were somehow undone Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3e762a9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3e762a9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3e762a9e Branch: refs/heads/feature/GEODE-831 Commit: 3e762a9ea082d4a7c3d2245baa1388c1d6c4cc36 Parents: d89038d Author: Kirk Lund Authored: Mon Jan 25 10:53:34 2016 -0800 Committer: Kirk Lund Committed: Mon Jan 25 10:53:34 2016 -0800 ---------------------------------------------------------------------- .../gemfire/cache30/CacheXml41DUnitTest.java | 34 ++++++++++++++------ .../gemfire/cache30/CacheXml57DUnitTest.java | 11 ++----- .../gemfire/cache30/CacheXml60DUnitTest.java | 15 +++------ 3 files changed, 31 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e762a9e/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java index f6a0aa2..bc1f7e4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java @@ -16,19 +16,33 @@ */ package com.gemstone.gemfire.cache30; -import com.gemstone.gemfire.cache.*; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.internal.cache.xmlcache.*; -import com.gemstone.gemfire.test.dunit.DistributedTestCase; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; -import java.io.*; +import org.xml.sax.SAXException; -<<<<<<< HEAD +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.CacheException; +import com.gemstone.gemfire.cache.CacheXmlException; +import com.gemstone.gemfire.cache.DynamicRegionFactory; +import com.gemstone.gemfire.cache.ExpirationAction; +import com.gemstone.gemfire.cache.ExpirationAttributes; +import com.gemstone.gemfire.cache.MirrorType; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.RegionExistsException; +import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.server.CacheServer; +import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; +import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; +import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; +import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import dunit.DistributedTestCase; -======= ->>>>>>> f764f8d... GEODE-819: Move dunit to com.gemstone.gemfire.test.dunit -import org.xml.sax.SAXException; +import com.gemstone.gemfire.test.dunit.DistributedTestCase; /** * Tests the declarative caching functionality introduced in GemFire 4.1. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e762a9e/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java index 06ae560..be78e26 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java @@ -33,9 +33,9 @@ import com.gemstone.gemfire.cache.ExpirationAttributes; import com.gemstone.gemfire.cache.InterestPolicy; import com.gemstone.gemfire.cache.MirrorType; import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.Region.Entry; import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.cache.Region.Entry; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; @@ -52,19 +52,12 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2; import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation; -<<<<<<< HEAD - import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import dunit.Host; -import dunit.SerializableCallable; -import dunit.VM; -======= import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; ->>>>>>> f764f8d... GEODE-819: Move dunit to com.gemstone.gemfire.test.dunit -import junit.framework.*; +import junit.framework.Assert; /** * Tests 5.7 cache.xml features. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e762a9e/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java index c54af3d..3a20c07 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java @@ -16,6 +16,11 @@ */ package com.gemstone.gemfire.cache30; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.Serializable; + import com.gemstone.gemfire.DataSerializable; import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.cache.Cache; @@ -31,18 +36,8 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation; import com.gemstone.gemfire.internal.cache.xmlcache.SerializerCreation; -<<<<<<< HEAD - import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import dunit.DistributedTestCase; -======= import com.gemstone.gemfire.test.dunit.DistributedTestCase; ->>>>>>> f764f8d... GEODE-819: Move dunit to com.gemstone.gemfire.test.dunit - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.Serializable; /** * Tests 6.0 cache.xml features.