incubator-geode git commit: GEODE-37 fixed unit test
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-37_2 7c4250ea2 -> 7d5d6e153 GEODE-37 fixed unit test Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d5d6e15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d5d6e15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d5d6e15 Branch: refs/heads/feature/GEODE-37_2 Commit: 7d5d6e153396deb774762f7d39708fb36a5be117 Parents: 7c4250e Author: Hitesh KhamesraAuthored: Tue Sep 13 16:44:49 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:44:49 2016 -0700 -- .../test/java/org/apache/geode/internal/ClassPathLoaderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d5d6e15/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java index aaeab36..26b3a91 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java @@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) public class ClassPathLoaderTest { - private static final int GENERATED_CLASS_BYTES_COUNT = 362; + private static final int GENERATED_CLASS_BYTES_COUNT = 354; @Rule public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
incubator-geode git commit: GEODE-37 fixed unit test
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-37_2 06384849c -> 7c4250ea2 GEODE-37 fixed unit test Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7c4250ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7c4250ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7c4250ea Branch: refs/heads/feature/GEODE-37_2 Commit: 7c4250ea2f7f315d22dd1a3bcca4b1c3729fef49 Parents: 0638484 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:35:42 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:35:42 2016 -0700 -- .../java/org/apache/geode/internal/PdxRenameDUnitTest.java | 8 .../java/org/apache/geode/internal/PdxRenameJUnitTest.java | 8 .../geode/internal/cache/EvictionObjectSizerDUnitTest.java | 8 .../internal/cli/commands/DiskStoreCommandsDUnitTest.java| 6 +++--- .../java/org/apache/geode/pdx/AutoSerializableJUnitTest.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c4250ea/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java index 7759e9e..7b3173c 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java @@ -122,16 +122,16 @@ public class PdxRenameDUnitTest extends JUnit4CacheTestCase{ vm1.invoke(new SerializableCallable() { public Object call() throws Exception { -Collection renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "gemstone", "pivotal"); +Collection renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "apache", "pivotal"); assertEquals(2, renameResults.size()); for(Object o : renameResults) { if(o instanceof PdxType) { PdxType t = (PdxType)o; - assertEquals("com.pivotal.gemfire.internal.PdxRenameDUnitTest$PdxValue", t.getClassName()); + assertEquals("org.pivotal.geode.internal.PdxRenameDUnitTest$PdxValue", t.getClassName()); } else { EnumInfo ei = (EnumInfo) o; - assertEquals("com.pivotal.gemfire.internal.PdxRenameDUnitTest$Day", ei.getClassName()); +assertEquals("org.pivotal.geode.internal.PdxRenameDUnitTest$Day", ei.getClassName()); } } return null; @@ -166,7 +166,7 @@ public class PdxRenameDUnitTest extends JUnit4CacheTestCase{ Region region1 = rf1.create("region1"); PdxInstance v = (PdxInstance) region1.get("key1"); assertNotNull(v); - assertEquals("com.pivotal.gemfire.internal.PdxRenameDUnitTest$PdxValue", ((PdxInstanceImpl)v).getClassName()); +assertEquals("org.pivotal.geode.internal.PdxRenameDUnitTest$PdxValue", ((PdxInstanceImpl)v).getClassName()); cache.close(); return null; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c4250ea/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java index 87a79d7..642b8aa 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java @@ -91,21 +91,21 @@ public class PdxRenameJUnitTest { region1.put("key1", new PdxValue(1)); cache.close(); -Collection renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "gemstone", "pivotal"); +Collection renameResults = DiskStoreImpl.pdxRename(DS_NAME, new File[]{f}, "apache", "pivotal"); assertEquals(2, renameResults.size()); for(Object o : renameResults) { if(o instanceof PdxType) { PdxType t = (PdxType)o; - assertEquals("com.pivotal.gemfire.internal.PdxRenameJUnitTest$PdxValue", t.getClassName()); + assertEquals("org.pivotal.geode.internal.PdxRenameJUnitTest$PdxValue", t.getClassName()); } else { EnumInfo ei = (EnumInfo) o; - assertEquals("com.pivotal.gemfire.internal.PdxRenameJUnitTest$Day", ei.getClassName()); +
[3/3] incubator-geode git commit: GEODE-37 Renamed some test directory. And fixed JGroupsMessengerJUnitTest unittest
GEODE-37 Renamed some test directory. And fixed JGroupsMessengerJUnitTest unittest Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/06384849 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/06384849 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/06384849 Branch: refs/heads/feature/GEODE-37_2 Commit: 06384849c9f5c2ae4bac34d060f1c508886222c0 Parents: 9278d53 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:20:52 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:20:52 2016 -0700 -- .../com/gemstone/persistence/admin/Logger.java | 277 - .../gemstone/persistence/logging/Formatter.java | 41 -- .../gemstone/persistence/logging/Handler.java | 98 .../com/gemstone/persistence/logging/Level.java | 128 - .../gemstone/persistence/logging/LogRecord.java | 185 -- .../gemstone/persistence/logging/Logger.java| 566 --- .../persistence/logging/SimpleFormatter.java| 77 --- .../persistence/logging/StreamHandler.java | 61 -- .../test/java/com/gemstone/sequence/Arrow.java | 124 .../java/com/gemstone/sequence/Lifeline.java| 98 .../com/gemstone/sequence/LifelineState.java| 114 .../java/com/gemstone/sequence/LineMapper.java | 35 -- .../com/gemstone/sequence/SequenceDiagram.java | 315 --- .../com/gemstone/sequence/SequencePanel.java| 83 --- .../com/gemstone/sequence/StateColorMap.java| 66 --- .../java/com/gemstone/sequence/TimeAxis.java| 122 .../com/gemstone/sequence/ZoomingPanel.java | 188 -- .../sequence/gemfire/DefaultLineMapper.java | 41 -- .../gemfire/GemfireSequenceDisplay.java | 335 --- .../sequence/gemfire/HydraLineMapper.java | 134 - .../sequence/gemfire/SelectGraphDialog.java | 155 - .../messenger/JGroupsMessengerJUnitTest.java| 2 +- .../org/apache/persistence/admin/Logger.java| 277 + .../apache/persistence/logging/Formatter.java | 41 ++ .../org/apache/persistence/logging/Handler.java | 98 .../org/apache/persistence/logging/Level.java | 128 + .../apache/persistence/logging/LogRecord.java | 185 ++ .../org/apache/persistence/logging/Logger.java | 566 +++ .../persistence/logging/SimpleFormatter.java| 77 +++ .../persistence/logging/StreamHandler.java | 61 ++ .../test/java/org/apache/sequence/Arrow.java| 124 .../test/java/org/apache/sequence/Lifeline.java | 98 .../java/org/apache/sequence/LifelineState.java | 114 .../java/org/apache/sequence/LineMapper.java| 35 ++ .../org/apache/sequence/SequenceDiagram.java| 315 +++ .../java/org/apache/sequence/SequencePanel.java | 83 +++ .../java/org/apache/sequence/StateColorMap.java | 66 +++ .../test/java/org/apache/sequence/TimeAxis.java | 122 .../java/org/apache/sequence/ZoomingPanel.java | 188 ++ .../sequence/gemfire/DefaultLineMapper.java | 41 ++ .../gemfire/GemfireSequenceDisplay.java | 335 +++ .../sequence/gemfire/HydraLineMapper.java | 134 + .../sequence/gemfire/SelectGraphDialog.java | 155 + 43 files changed, 3244 insertions(+), 3244 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/06384849/geode-core/src/test/java/com/gemstone/persistence/admin/Logger.java -- diff --git a/geode-core/src/test/java/com/gemstone/persistence/admin/Logger.java b/geode-core/src/test/java/com/gemstone/persistence/admin/Logger.java deleted file mode 100644 index c0a6de9..000 --- a/geode-core/src/test/java/com/gemstone/persistence/admin/Logger.java +++ /dev/null @@ -1,277 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.persistence.admin; - -import java.util.*; -import java.io.PrintWriter; -import java.text.*; - -/** - * Provides single point for all
[2/3] incubator-geode git commit: GEODE-37 Renamed some test directory. And fixed JGroupsMessengerJUnitTest unittest
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/06384849/geode-core/src/test/java/com/gemstone/sequence/ZoomingPanel.java -- diff --git a/geode-core/src/test/java/com/gemstone/sequence/ZoomingPanel.java b/geode-core/src/test/java/com/gemstone/sequence/ZoomingPanel.java deleted file mode 100644 index 782ee7b..000 --- a/geode-core/src/test/java/com/gemstone/sequence/ZoomingPanel.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sequence; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; - -/** - * Created by IntelliJ IDEA. - * User: dan - * Date: Oct 28, 2010 - * Time: 10:30:40 PM - * To change this template use File | Settings | File Templates. - */ -public class ZoomingPanel extends JPanel { -private int zoomBoxStartX; -private int zoomBoxStartY; -private int zoomBoxWidth; -private int zoomBoxHeight; -private SequenceDiagram child; - - -public ZoomingPanel() { -super(); -addMouseListener(new MouseAdapter() { -@Override -public void mousePressed(MouseEvent e) { -startBox(e.getX(), e.getY()); -} - -@Override -public void mouseReleased(MouseEvent e) { -endBox(e.getX(), e.getY()); -} - -@Override -public void mouseClicked(MouseEvent e) { -if (e.getButton() != MouseEvent.BUTTON1) { -unzoom(); -} else { - child.selectState(e.getX(), e.getY()); -} - -} -}); - -addMouseMotionListener(new MouseMotionAdapter() { -@Override -public void mouseDragged(MouseEvent e) { -Rectangle r = new Rectangle(e.getX(), e.getY(), 1, 1); -((JPanel)e.getSource()).scrollRectToVisible(r); -showBox(e.getX(), e.getY()); -} - -@Override -public void mouseMoved(MouseEvent e) { - int popupX = ZoomingPanel.this.getLocationOnScreen().x + e.getX(); - int popupY = ZoomingPanel.this.getLocationOnScreen().y + e.getY(); - child.showPopupText(e.getX(), e.getY(), popupX, popupY); -} -}); -BorderLayout layout = new BorderLayout(); -layout.setHgap(0); -layout.setVgap(0); -this.setLayout(layout); -} - -private void unzoom() { -resizeMe(0, 0, getWidth(), getHeight()); -} - -void resizeMe(int zoomBoxX, int zoomBoxY, int zoomBoxWidth, int zoomBoxHeight) { -Dimension viewSize = getParent().getSize(); -double windowWidth = viewSize.getWidth(); -double windowHeight = viewSize.getHeight(); -double scaleX = getWidth() / ((double) zoomBoxWidth); -double scaleY = getHeight() / ((double) zoomBoxHeight); -int oldWidth = getWidth(); -int oldHeight = getHeight(); -int width = (int) (scaleX * windowWidth); -int height = (int) (scaleY * windowHeight); -//this.setPreferredSize(new Dimension(width, height)); -child.resizeMe(width, height); -//TODO not sure this one is needed -this.revalidate(); - -//scroll to the new rectangle -//int scrollX = (int) (zoomBoxX * scaleX); -//int scrollY = (int) (zoomBoxY * scaleY); -//int scrollWidth= (int) (zoomBoxWidth * scaleX); -//int scrollHeight = (int) (zoomBoxHeight * scaleY); -int scrollX = (int) (zoomBoxX * (width / (double) oldWidth)); -int scrollY = (int) (zoomBoxY * (height / (double) oldHeight)); -int scrollWidth= (int) (zoomBoxWidth * (width / (double) oldWidth)); -int scrollHeight = (int) (zoomBoxHeight * (height / (double) oldHeight)); -Rectangle r = new Rectangle(scrollX, scrollY, scrollWidth, scrollHeight); -((JViewport)getParent()).scrollRectToVisible(r); -repaint(); - -} - -public
[1/3] incubator-geode git commit: GEODE-37 Renamed some test directory. And fixed JGroupsMessengerJUnitTest unittest
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-37_2 9278d532b -> 06384849c http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/06384849/geode-core/src/test/java/org/apache/sequence/LifelineState.java -- diff --git a/geode-core/src/test/java/org/apache/sequence/LifelineState.java b/geode-core/src/test/java/org/apache/sequence/LifelineState.java new file mode 100644 index 000..2f39c46 --- /dev/null +++ b/geode-core/src/test/java/org/apache/sequence/LifelineState.java @@ -0,0 +1,114 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sequence; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +import javax.swing.JLabel; + +/** + * Created by IntelliJ IDEA. + * User: dsmith + * Date: Oct 29, 2010 + * Time: 3:45:07 PM + * To change this template use File | Settings | File Templates. + */ +public class LifelineState { +private final long startTime; +private final long endTime; +private final String stateName; +private int startY; +private int height; +private final Lifeline line; +private final Set inboundArrows = new HashSet(); +private static final int ARC_SIZE = 10; + +public int getStartY() { +return startY; +} + +public int getHeight() { +return height; +} + + +public LifelineState(Lifeline line, String stateName, long startTime, long endTime) { +this.line = line; +this.stateName = stateName; +this.startTime = startTime; +this.endTime = endTime; +} + +public void paint(Graphics2D g, StateColorMap colorMap) { +Rectangle bounds = g.getClipBounds(); +if(startY > bounds.getMaxY() || startY+heightbounds.getMaxY() || startY+height
[41/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/Region.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java b/geode-core/src/main/java/org/apache/geode/cache/Region.java index f70e5de..72333a1 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/Region.java +++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.cache; +package org.apache.geode.cache; import java.io.IOException; import java.io.InputStream; @@ -27,17 +27,17 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.Lock; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException; -import com.gemstone.gemfire.cache.query.FunctionDomainException; -import com.gemstone.gemfire.cache.query.NameResolutionException; -import com.gemstone.gemfire.cache.query.QueryInvalidException; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.TypeMismatchException; -import com.gemstone.gemfire.cache.snapshot.RegionSnapshotService; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.SubscriptionNotEnabledException; +import org.apache.geode.cache.query.FunctionDomainException; +import org.apache.geode.cache.query.NameResolutionException; +import org.apache.geode.cache.query.QueryInvalidException; +import org.apache.geode.cache.query.QueryInvocationTargetException; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.TypeMismatchException; +import org.apache.geode.cache.snapshot.RegionSnapshotService; /** Manages subregions and cached data. Each region * can contain multiple subregions and entries for data. @@ -49,10 +49,10 @@ import com.gemstone.gemfire.cache.snapshot.RegionSnapshotService; * The Region interface basically contains two set of APIs: Region management * APIs; and (potentially) distributed operations on entries. Non-distributed * operations on entries - * are provided by the inner interface, {@link com.gemstone.gemfire.cache.Region.Entry}. + * are provided by the inner interface, {@link org.apache.geode.cache.Region.Entry}. * * - * Each {@link com.gemstone.gemfire.cache.Cache} defines a single top region called the root region. + * Each {@link org.apache.geode.cache.Cache} defines a single top region called the root region. * User applications can use the root region to create subregions * for isolated name space and object grouping. * @@ -241,7 +241,7 @@ public interface Regionextends ConcurrentMap { * * Does not update any CacheStatistics. * - * @throws com.gemstone.gemfire.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL + * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL * @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL * @see CacheListener#afterRegionInvalidate */ @@ -257,7 +257,7 @@ public interface Region extends ConcurrentMap { * Does not update any CacheStatistics. * @param aCallbackArgument a user-defined parameter to pass to callback events *triggered by this method. Can be null. Should be serializable. - * @throws com.gemstone.gemfire.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL + * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL * @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL * @throws IllegalArgumentException if aCallbackArgument is not serializable * @see CacheListener#afterRegionInvalidate @@ -313,7 +313,7 @@ public interface Region extends ConcurrentMap { * * @throws CacheWriterException if a CacheWriter aborts the operation; if this * occurs some subregions may have already been successfully destroyed. - * @throws com.gemstone.gemfire.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL + * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL * @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL * @see CacheListener#afterRegionDestroy * @see CacheWriter#beforeRegionDestroy @@
[38/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java index 22e58f6..e387a69 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueStateImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.client.internal; +package org.apache.geode.cache.client.internal; import java.util.ArrayList; import java.util.Iterator; @@ -28,18 +28,18 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.client.internal.PoolImpl.PoolTask; -import com.gemstone.gemfire.internal.cache.ClientServerObserver; -import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder; -import com.gemstone.gemfire.internal.cache.EventID; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.SystemFailure; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionDestroyedException; +import org.apache.geode.cache.client.internal.PoolImpl.PoolTask; +import org.apache.geode.internal.cache.ClientServerObserver; +import org.apache.geode.internal.cache.ClientServerObserverHolder; +import org.apache.geode.internal.cache.EventID; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.LocalRegion; +import org.apache.geode.internal.cache.ha.ThreadIdentifier; +import org.apache.geode.internal.logging.LogService; public class QueueStateImpl implements QueueState { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java index b516fd7..a2983e2 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ReadyForEventsOp.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.client.internal; +package org.apache.geode.cache.client.internal; -import com.gemstone.gemfire.internal.cache.tier.MessageType; -import com.gemstone.gemfire.internal.cache.tier.sockets.Message; +import org.apache.geode.internal.cache.tier.MessageType; +import org.apache.geode.internal.cache.tier.sockets.Message; /** * Tells the server we are ready to receive server-to-client events @@ -43,7 +43,7 @@ public class ReadyForEventsOp { private static class ReadyForEventsOpImpl extends AbstractOp { /** - * @throws com.gemstone.gemfire.SerializationException if serialization fails + * @throws org.apache.geode.SerializationException if serialization fails */ public ReadyForEventsOpImpl() { super(MessageType.CLIENT_READY, 1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterDataSerializersOp.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterDataSerializersOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterDataSerializersOp.java index 869ad64..72b8b1b 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterDataSerializersOp.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/RegisterDataSerializersOp.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.client.internal; +package org.apache.geode.cache.client.internal; import
[7/8] incubator-geode git commit: GEODE-37 change file name from (./geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener) to
GEODE-37 change file name from (./geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener) to (./geode-wan/src/main/resources/META-INF/services/org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8880bb59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8880bb59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8880bb59 Branch: refs/heads/feature/GEODE-37_2 Commit: 8880bb59bc0075a07ff296f8c52a90bef10d7558 Parents: 7061213 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:03:16 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:03:16 2016 -0700 -- ...nt.internal.locator.wan.LocatorMembershipListener | 15 --- ...nt.internal.locator.wan.LocatorMembershipListener | 15 +++ 2 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8880bb59/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener -- diff --git a/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener b/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener deleted file mode 100644 index be534b0..000 --- a/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You 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. -# See the License for the specific language governing permissions and -# limitations under the License. -org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListenerImpl http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8880bb59/geode-wan/src/main/resources/META-INF/services/org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener -- diff --git a/geode-wan/src/main/resources/META-INF/services/org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener b/geode-wan/src/main/resources/META-INF/services/org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener new file mode 100644 index 000..be534b0 --- /dev/null +++ b/geode-wan/src/main/resources/META-INF/services/org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener @@ -0,0 +1,15 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You 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. +# See the License for the specific language governing permissions and +# limitations under the License. +org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListenerImpl
[8/8] incubator-geode git commit: GEODE-37 change file name from (./geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService) to (./geode-lucene/src/main/reso
GEODE-37 change file name from (./geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService) to (./geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/53f66189 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/53f66189 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/53f66189 Branch: refs/heads/feature/GEODE-37_2 Commit: 53f6618956cc785983be9a34d9c544797aced21a Parents: a2e047a Author: Hitesh KhamesraAuthored: Tue Sep 13 16:03:16 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:03:16 2016 -0700 -- .../services/com.gemstone.gemfire.internal.cache.CacheService | 1 - .../META-INF/services/org.apache.geode.internal.cache.CacheService | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53f66189/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService -- diff --git a/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService b/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService deleted file mode 100644 index a3a5339..000 --- a/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.CacheService +++ /dev/null @@ -1 +0,0 @@ -org.apache.geode.cache.lucene.internal.LuceneServiceImpl \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53f66189/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService -- diff --git a/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService b/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService new file mode 100644 index 000..a3a5339 --- /dev/null +++ b/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService @@ -0,0 +1 @@ +org.apache.geode.cache.lucene.internal.LuceneServiceImpl \ No newline at end of file
[4/8] incubator-geode git commit: GEODE-37 change file name from (./geode-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser) to (./geode-core/src/test/re
GEODE-37 change file name from (./geode-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser) to (./geode-core/src/test/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/626aef11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/626aef11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/626aef11 Branch: refs/heads/feature/GEODE-37_2 Commit: 626aef11902e1568b07d72749e8acaeedd6dfd3a Parents: 264dd87 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:03:16 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:03:16 2016 -0700 -- .../com.gemstone.gemfire.internal.cache.xmlcache.XmlParser | 5 - .../services/org.apache.geode.internal.cache.xmlcache.XmlParser | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/626aef11/geode-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser -- diff --git a/geode-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser b/geode-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser deleted file mode 100644 index 119f25b..000 --- a/geode-core/src/test/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser +++ /dev/null @@ -1,5 +0,0 @@ -# org.apache.geode.internal.cache.xmlcache.CacheXmlParserJUnitTest.testGetDelegate XmlParser -org.apache.geode.internal.cache.xmlcache.CacheXmlParserJUnitTest$MockXmlParser - -# Mock Extension XmlParser -org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/626aef11/geode-core/src/test/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser -- diff --git a/geode-core/src/test/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser b/geode-core/src/test/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser new file mode 100644 index 000..119f25b --- /dev/null +++ b/geode-core/src/test/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser @@ -0,0 +1,5 @@ +# org.apache.geode.internal.cache.xmlcache.CacheXmlParserJUnitTest.testGetDelegate XmlParser +org.apache.geode.internal.cache.xmlcache.CacheXmlParserJUnitTest$MockXmlParser + +# Mock Extension XmlParser +org.apache.geode.internal.cache.extension.mock.MockExtensionXmlParser \ No newline at end of file
[2/8] incubator-geode git commit: GEODE-37 change file name from (./geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser) to (./geode-lucene/src/mai
GEODE-37 change file name from (./geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser) to (./geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/70612139 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/70612139 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/70612139 Branch: refs/heads/feature/GEODE-37_2 Commit: 70612139e5421e0a29e1341adba38ed15fde4a52 Parents: 53f6618 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:03:16 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:03:16 2016 -0700 -- .../services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser | 1 - .../services/org.apache.geode.internal.cache.xmlcache.XmlParser | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612139/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser -- diff --git a/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser b/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser deleted file mode 100644 index 2de3ccd..000 --- a/geode-lucene/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser +++ /dev/null @@ -1 +0,0 @@ -org.apache.geode.cache.lucene.internal.xml.LuceneXmlParser \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612139/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser -- diff --git a/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser b/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser new file mode 100644 index 000..2de3ccd --- /dev/null +++ b/geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.cache.xmlcache.XmlParser @@ -0,0 +1 @@ +org.apache.geode.cache.lucene.internal.xml.LuceneXmlParser \ No newline at end of file
[1/8] incubator-geode git commit: GEODE-37 change file name from (./geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory) to (./geode-wan/src/main/reso
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-37_2 7171cec4a -> 9278d532b GEODE-37 change file name from (./geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory) to (./geode-wan/src/main/resources/META-INF/services/org.apache.geode.internal.cache.wan.spi.WANFactory) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9278d532 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9278d532 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9278d532 Branch: refs/heads/feature/GEODE-37_2 Commit: 9278d532b9054f6bc4fcf40b810d9ba87046 Parents: 8880bb5 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:03:16 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:03:16 2016 -0700 -- ...emstone.gemfire.internal.cache.wan.spi.WANFactory | 15 --- ...rg.apache.geode.internal.cache.wan.spi.WANFactory | 15 +++ 2 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9278d532/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory -- diff --git a/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory b/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory deleted file mode 100644 index ec9bdc9..000 --- a/geode-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You 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. -# See the License for the specific language governing permissions and -# limitations under the License. -org.apache.geode.cache.client.internal.locator.wan.WANFactoryImpl http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9278d532/geode-wan/src/main/resources/META-INF/services/org.apache.geode.internal.cache.wan.spi.WANFactory -- diff --git a/geode-wan/src/main/resources/META-INF/services/org.apache.geode.internal.cache.wan.spi.WANFactory b/geode-wan/src/main/resources/META-INF/services/org.apache.geode.internal.cache.wan.spi.WANFactory new file mode 100644 index 000..ec9bdc9 --- /dev/null +++ b/geode-wan/src/main/resources/META-INF/services/org.apache.geode.internal.cache.wan.spi.WANFactory @@ -0,0 +1,15 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You 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. +# See the License for the specific language governing permissions and +# limitations under the License. +org.apache.geode.cache.client.internal.locator.wan.WANFactoryImpl
[29/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java index 2ed3ea6..b8620e2 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java +++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventFilter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.wan; +package org.apache.geode.cache.wan; -import com.gemstone.gemfire.cache.CacheCallback; +import org.apache.geode.cache.CacheCallback; /** * Callback for users to filter out events before dispatching to remote http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java index 7e37310..0ec894a 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java +++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayEventSubstitutionFilter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.wan; +package org.apache.geode.cache.wan; -import com.gemstone.gemfire.cache.CacheCallback; -import com.gemstone.gemfire.cache.EntryEvent; +import org.apache.geode.cache.CacheCallback; +import org.apache.geode.cache.EntryEvent; /** * Interface GatewayEventSubstitutionFilter provides a way to http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java index 07d92c9..8d9a8aa 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java +++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayQueueEvent.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.wan; +package org.apache.geode.cache.wan; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; /** * Represents Cache events going through http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java index a80fbd4..55021d1 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java +++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.wan; +package org.apache.geode.cache.wan; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.distributed.internal.DistributionConfig; import java.io.IOException; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java index 38e0316..4a6a7a8 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java +++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiverFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.cache.wan;
[6/8] incubator-geode git commit: GEODE-37 change file name from (./geode-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory) to (./geode-cq/src/
GEODE-37 change file name from (./geode-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory) to (./geode-cq/src/main/resources/META-INF/services/org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a2e047ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a2e047ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a2e047ad Branch: refs/heads/feature/GEODE-37_2 Commit: a2e047adcff15e86717a3e456db2ebce84550585 Parents: 626aef1 Author: Hitesh KhamesraAuthored: Tue Sep 13 16:03:16 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 16:03:16 2016 -0700 -- ...fire.cache.query.internal.cq.spi.CqServiceFactory | 15 --- ...eode.cache.query.internal.cq.spi.CqServiceFactory | 15 +++ 2 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a2e047ad/geode-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory -- diff --git a/geode-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory b/geode-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory deleted file mode 100644 index 0e1f928..000 --- a/geode-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You 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. -# See the License for the specific language governing permissions and -# limitations under the License. -org.apache.geode.cache.query.internal.cq.CqServiceFactoryImpl http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a2e047ad/geode-cq/src/main/resources/META-INF/services/org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory -- diff --git a/geode-cq/src/main/resources/META-INF/services/org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory b/geode-cq/src/main/resources/META-INF/services/org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory new file mode 100644 index 000..0e1f928 --- /dev/null +++ b/geode-cq/src/main/resources/META-INF/services/org.apache.geode.cache.query.internal.cq.spi.CqServiceFactory @@ -0,0 +1,15 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You 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. +# See the License for the specific language governing permissions and +# limitations under the License. +org.apache.geode.cache.query.internal.cq.CqServiceFactoryImpl
[33/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java index 50eb07b..abed999 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/CountPRQueryNode.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal.aggregate; +package org.apache.geode.cache.query.internal.aggregate; -import com.gemstone.gemfire.cache.query.Aggregator; +import org.apache.geode.cache.query.Aggregator; /** * Computes the count of the rows on the PR query node http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java index 2720897..8cd84b5 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/DistinctAggregator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal.aggregate; +package org.apache.geode.cache.query.internal.aggregate; import java.util.HashSet; import java.util.Set; -import com.gemstone.gemfire.cache.query.QueryService; +import org.apache.geode.cache.query.QueryService; /** * The class used to hold the distinct values. This will get instantiated on the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java index b643c9c..ee98649 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/MaxMin.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal.aggregate; +package org.apache.geode.cache.query.internal.aggregate; -import com.gemstone.gemfire.cache.query.Aggregator; -import com.gemstone.gemfire.cache.query.QueryService; +import org.apache.geode.cache.query.Aggregator; +import org.apache.geode.cache.query.QueryService; /** * Computes the Max or Min http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java index 96f80b8..387929a 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/Sum.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal.aggregate; +package org.apache.geode.cache.query.internal.aggregate; -import com.gemstone.gemfire.cache.query.QueryService; +import org.apache.geode.cache.query.QueryService; /** * Computes the sum for replicated & PR based queries. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinct.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinct.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinct.java index 57c2a9a..b166170 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/aggregate/SumDistinct.java
[30/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g index caf0ec0..a743752 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g @@ -23,9 +23,9 @@ */ header { -package com.gemstone.gemfire.cache.query.internal.parse; +package org.apache.geode.cache.query.internal.parse; import java.util.*; -import com.gemstone.gemfire.cache.query.internal.types.*; +import org.apache.geode.cache.query.internal.types.*; } options { @@ -311,7 +311,7 @@ ML_COMMENT /* OQL PARSER */ class OQLParser -extends Parser("com.gemstone.gemfire.cache.query.internal.parse.UtilParser"); +extends Parser("org.apache.geode.cache.query.internal.parse.UtilParser"); options { buildAST = true; @@ -356,14 +356,14 @@ queryProgram : EOF! { #queryProgram = #([QUERY_PROGRAM, "queryProgram", -"com.gemstone.gemfire.cache.query.internal.parse.GemFireAST"], +"org.apache.geode.cache.query.internal.parse.GemFireAST"], #queryProgram); } ; traceCommand: ( TOK_LT! -
[28/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java index d96e7c3..b759b2e 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DSClock.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; - -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.internal.SystemTimer; -import com.gemstone.gemfire.internal.SystemTimer.SystemTimerTask; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.DateFormatter; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; +package org.apache.geode.distributed.internal; + +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.SystemTimer; +import org.apache.geode.internal.SystemTimer.SystemTimerTask; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.DateFormatter; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; import org.apache.logging.log4j.Logger; import java.util.Date; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/DefaultServerLauncherCacheProvider.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DefaultServerLauncherCacheProvider.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DefaultServerLauncherCacheProvider.java index 6f155ad..7b4ca94 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DefaultServerLauncherCacheProvider.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DefaultServerLauncherCacheProvider.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.util.Properties; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.distributed.ServerLauncher; -import com.gemstone.gemfire.distributed.ServerLauncherCacheProvider; -import com.gemstone.gemfire.internal.cache.CacheConfig; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.distributed.ServerLauncher; +import org.apache.geode.distributed.ServerLauncherCacheProvider; +import org.apache.geode.internal.cache.CacheConfig; public class DefaultServerLauncherCacheProvider implements ServerLauncherCacheProvider { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java index fa06c4e..6fcb080 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DirectReplyProcessor.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.util.Collection; import java.util.Collections; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.CancelCriterion; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; /** * A reply processor optimized for direct ack responses (It skips synchronization, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisee.java -- diff --git
[46/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java -- diff --git a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java index 2df1cd6..487106a 100755 --- a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java +++ b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.annotations; +package org.apache.geode.annotations; import static org.assertj.core.api.Assertions.*; @@ -23,9 +23,9 @@ import java.lang.reflect.AnnotatedElement; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.gemstone.gemfire.annotations.experimentalpackage.ClassInExperimentalPackage; -import com.gemstone.gemfire.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage; -import com.gemstone.gemfire.test.junit.categories.UnitTest; +import org.apache.geode.annotations.experimentalpackage.ClassInExperimentalPackage; +import org.apache.geode.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage; +import org.apache.geode.test.junit.categories.UnitTest; /** * Unit tests for the Experimental annotation. Verifies that the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java -- diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java index cd080ce..3b6e7d2 100755 --- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java +++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.annotations.experimentalpackage; +package org.apache.geode.annotations.experimentalpackage; /** * Used by ExperimentalJUnitTest. This is a class in an * Experimental package. * - * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest + * @see org.apache.geode.annotations.ExperimentalJUnitTest */ public class ClassInExperimentalPackage { } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java -- diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java index 3db93ff..288e9aa 100755 --- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java +++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java @@ -18,9 +18,9 @@ * Used by ExperimentalJUnitTest. This is an Experimental * package. * - * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest + * @see org.apache.geode.annotations.ExperimentalJUnitTest */ @Experimental("This is an experimental package") -package com.gemstone.gemfire.annotations.experimentalpackage; +package org.apache.geode.annotations.experimentalpackage; -import com.gemstone.gemfire.annotations.Experimental; +import org.apache.geode.annotations.Experimental; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java -- diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java index 26499a6..10f6072 100755 --- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java +++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package
[18/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java index 44e17f1..c73f1f0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheClientStatus.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; +import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; import java.io.Serializable; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java index 4035645..60034ff 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.util.List; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheServerCreation; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.pdx.PdxSerializer; -import com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer; -import com.gemstone.gemfire.pdx.internal.AutoSerializableManager; +import org.apache.geode.internal.cache.xmlcache.CacheServerCreation; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.pdx.PdxSerializer; +import org.apache.geode.pdx.ReflectionBasedAutoSerializer; +import org.apache.geode.pdx.internal.AutoSerializableManager; /** * This is helper class used by CacheFactory to pass the cache configuration http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java index 3163c32..0975421 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisee; -import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor.CacheProfile; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.distributed.internal.DistributionAdvisee; +import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile; /** * Distributed cache object (typically a Region) which uses http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java index fff9bab..6370aed 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.io.DataInput; import java.io.DataOutput; @@ -31,27 +31,27 @@ import java.util.Set; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.CacheEvent; -import com.gemstone.gemfire.cache.DataPolicy; -import
[22/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java b/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java index aba9f97..93423f7 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/MigrationServer.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; -import com.gemstone.gemfire.admin.internal.InetAddressUtil; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.admin.internal.InetAddressUtil; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.i18n.LocalizedStrings; import java.io.*; import java.net.*; @@ -34,8 +34,8 @@ import java.util.Enumeration; import java.util.Iterator; import java.util.Properties; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; /** * MigrationServer creates a cache using a supplied cache.xml and then @@ -60,7 +60,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_POR * For example, * * java -cp $MYCLASSES:migration.jar:$GEMFIRE/lib/geode-dependencies.jar \ - * com.gemstone.gemfire.internal.MigrationServer cacheDescription.xml + * org.apache.geode.internal.MigrationServer cacheDescription.xml * * Where the cacheDescription.xml file might look like this: * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java index 110c53d..e8c1145 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; /** * A timer class that reports current or elapsed time in nanonseconds. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java index 153ae82..1d9ac01 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java +++ b/geode-core/src/main/java/org/apache/geode/internal/NullDataOutputStream.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.io.*; -import com.gemstone.gemfire.DataSerializer; +import org.apache.geode.DataSerializer; /** NullDataOutputStream is an OutputStream that also implements DataOutput * and does not store any data written to it. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
[37/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/control/package.html -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/control/package.html b/geode-core/src/main/java/org/apache/geode/cache/control/package.html index 74c0aa0..4cc3920 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/control/package.html +++ b/geode-core/src/main/java/org/apache/geode/cache/control/package.html @@ -17,7 +17,7 @@ limitations under the License. -Controls the resources used by the local GemFire Cache. The {@linkplain com.gemstone.gemfire.cache.control.ResourceManager} exposes options affecting how the resources are controlled. Additionally, Cache resources can also be rebalanced across the GemFire distributed system. +Controls the resources used by the local GemFire Cache. The {@linkplain org.apache.geode.cache.control.ResourceManager} exposes options affecting how the resources are controlled. Additionally, Cache resources can also be rebalanced across the GemFire distributed system. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java b/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java index ddb49b3..bdafb89 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/EmptyRegionFunctionException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.execute; +package org.apache.geode.cache.execute; -import com.gemstone.gemfire.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedMember; /** * Exception to indicate that Region is empty for data aware functions. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java index 41b1097..50a312d 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Execution.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.execute; +package org.apache.geode.cache.execute; import java.util.Set; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.LowMemoryException; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.LowMemoryException; /** * Provides methods to build the context for the execution of a {@link Function} @@ -49,7 +49,7 @@ public interface Execution { * if filter passed is null. * @throws UnsupportedOperationException * if not called after - * {@link FunctionService#onRegion(com.gemstone.gemfire.cache.Region)} + * {@link FunctionService#onRegion(org.apache.geode.cache.Region)} * @since GemFire 6.0 */ public Execution withFilter(Set filter); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java index 79364a9..14b0f9a 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java +++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.execute; +package org.apache.geode.cache.execute; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.lang.Identifiable; +import org.apache.geode.cache.Region; +import org.apache.geode.lang.Identifiable; /** * Defines the interface a user defined function implements. @@ -84,15 +84,15 @@ public interface Function extends Identifiable { /** * Return true to indicate to GemFire the method - * requires optimization for writing the targeted {@link FunctionService#onRegion(com.gemstone.gemfire.cache.Region)} and any +
[25/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java index 0f84549..775fa24 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.cache.UnsupportedVersionException; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.Role; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.ProfileId; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.internal.*; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.net.SocketCreator; +package org.apache.geode.distributed.internal.membership; + +import org.apache.geode.DataSerializer; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.cache.UnsupportedVersionException; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DurableClientAttributes; +import org.apache.geode.distributed.Role; +import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.internal.*; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.net.SocketCreator; import java.io.*; import java.net.Inet4Address; @@ -98,7 +98,7 @@ public class InternalDistributedMember /** * The name of this member's distributed system connection. - * @see com.gemstone.gemfire.distributed.DistributedSystem#getName + * @see org.apache.geode.distributed.DistributedSystem#getName */ private String name = null; @@ -329,7 +329,7 @@ public class InternalDistributedMember public InternalDistributedMember(String host, int p, String n, String u, int vmKind, String[] groups, DurableClientAttributes attr) throws UnknownHostException { MemberAttributes mattr = new MemberAttributes(p, -com.gemstone.gemfire.internal.OSProcess.getId(), +org.apache.geode.internal.OSProcess.getId(), vmKind, -1, n, groups, attr); @@ -432,8 +432,8 @@ public class InternalDistributedMember * [GemStone] Returns the kind of VM that hosts the distribution manager with * this address. * - * @see com.gemstone.gemfire.distributed.internal.DistributionManager#getDMType() - * @see com.gemstone.gemfire.distributed.internal.DistributionManager#NORMAL_DM_TYPE + * @see org.apache.geode.distributed.internal.DistributionManager#getDMType() + * @see org.apache.geode.distributed.internal.DistributionManager#NORMAL_DM_TYPE */ public int getVmKind() { @@ -538,7 +538,7 @@ public class InternalDistributedMember /** * Returns the name of this member's distributed system connection or null * if no name was specified. - * @see com.gemstone.gemfire.distributed.DistributedSystem#getName + * @see org.apache.geode.distributed.DistributedSystem#getName */ public String getName() { String result = this.name; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java index 62ba859..f52e4f7 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and *
[34/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java index f7b6311..3877bd0 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedResultSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal; +package org.apache.geode.cache.query.internal; @@ -30,15 +30,15 @@ import java.util.List; import java.util.Set; import java.util.SortedSet; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl; -import com.gemstone.gemfire.cache.query.types.CollectionType; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.cache.query.types.StructType; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.DataSerializer; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.internal.types.CollectionTypeImpl; +import org.apache.geode.cache.query.types.CollectionType; +import org.apache.geode.cache.query.types.ObjectType; +import org.apache.geode.cache.query.types.StructType; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.i18n.LocalizedStrings; public class LinkedResultSet extends java.util.LinkedHashSet implements Ordered, SelectResults, DataSerializableFixedID { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java index 3cfa738..5c3f964 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/LinkedStructSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal; +package org.apache.geode.cache.query.internal; import java.io.DataInput; import java.io.DataOutput; @@ -28,17 +28,17 @@ import java.util.List; import java.util.Set; import java.util.SortedSet; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Struct; - -import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl; -import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; -import com.gemstone.gemfire.cache.query.types.CollectionType; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.DataSerializer; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.Struct; + +import org.apache.geode.cache.query.internal.types.CollectionTypeImpl; +import org.apache.geode.cache.query.internal.types.StructTypeImpl; +import org.apache.geode.cache.query.types.CollectionType; +import org.apache.geode.cache.query.types.ObjectType; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.i18n.LocalizedStrings; public class LinkedStructSet extends LinkedHashSet implements SelectResults, Ordered, DataSerializableFixedID { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/MapIndexable.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/MapIndexable.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/MapIndexable.java index 4cc3fa0..b6eafd4 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/MapIndexable.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/MapIndexable.java @@ -14,7
[50/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/README.md -- diff --git a/README.md b/README.md index bf6dfb4..5521f1b 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ Write a client application: _HelloWorld.java_ import java.util.Map; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.*; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.*; public class HelloWorld { public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/conf/cache-peer.xml -- diff --git a/extensions/geode-modules-assembly/release/conf/cache-peer.xml b/extensions/geode-modules-assembly/release/conf/cache-peer.xml index 84fb67a..0480dca 100755 --- a/extensions/geode-modules-assembly/release/conf/cache-peer.xml +++ b/extensions/geode-modules-assembly/release/conf/cache-peer.xml @@ -37,7 +37,7 @@ - com.gemstone.gemfire.modules.util.SessionCustomExpiry + org.apache.geode.modules.util.SessionCustomExpiry http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/conf/cache-server.xml -- diff --git a/extensions/geode-modules-assembly/release/conf/cache-server.xml b/extensions/geode-modules-assembly/release/conf/cache-server.xml index 67ccbd1..d67b456 100755 --- a/extensions/geode-modules-assembly/release/conf/cache-server.xml +++ b/extensions/geode-modules-assembly/release/conf/cache-server.xml @@ -60,7 +60,7 @@ - com.gemstone.gemfire.modules.util.SessionCustomExpiry + org.apache.geode.modules.util.SessionCustomExpiry http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml -- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml index 72faee2..b7ad94e 100644 --- a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-7/context-fragment.xml @@ -1,9 +1,9 @@ - + -http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml -- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml index 72faee2..b7ad94e 100644 --- a/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs-tomcat-8/context-fragment.xml @@ -1,9 +1,9 @@ - + -http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml -- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml index fac3044..5b1f233 100644 --- a/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs/context-fragment.xml @@ -1,7 +1,7 @@ -http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml -- diff --git a/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml b/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml index c4adc66..2ffccf6 100644 --- a/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml +++ b/extensions/geode-modules-assembly/release/tcserver/geode-cs/server-fragment.xml @@ -1,7 +1,7 @@ -http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-assembly/release/tcserver/geode-p2p-tomcat-7/context-fragment.xml -- diff --git
[35/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java index cbe7e24..be8bb6b 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java @@ -18,15 +18,15 @@ * Abstract Super class of the Group or Range Junction. The common functionality * of Group or Range Junction is present in this class. */ -package com.gemstone.gemfire.cache.query.internal; +package org.apache.geode.cache.query.internal; -import com.gemstone.gemfire.cache.query.*; -import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes; -import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.cache.query.*; +import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes; +import org.apache.geode.cache.query.internal.types.StructTypeImpl; +import org.apache.geode.cache.query.types.ObjectType; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.i18n.LocalizedStrings; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java index 7b64af7..eae4796 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AllGroupJunction.java @@ -17,18 +17,18 @@ /* * Created on Oct 25, 2005 */ -package com.gemstone.gemfire.cache.query.internal; +package org.apache.geode.cache.query.internal; import java.util.*; -import com.gemstone.gemfire.cache.query.FunctionDomainException; -import com.gemstone.gemfire.cache.query.NameResolutionException; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.TypeMismatchException; -import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes; -import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.cache.query.types.StructType; +import org.apache.geode.cache.query.FunctionDomainException; +import org.apache.geode.cache.query.NameResolutionException; +import org.apache.geode.cache.query.QueryInvocationTargetException; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.TypeMismatchException; +import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes; +import org.apache.geode.cache.query.internal.types.StructTypeImpl; +import org.apache.geode.cache.query.types.ObjectType; +import org.apache.geode.cache.query.types.StructType; /** * An object of this class gets created during the organization of operands in a http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java index 7016075..80b01b9 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.cache.query.internal; +package org.apache.geode.cache.query.internal; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; @@ -30,17 +30,17 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.gemstone.gemfire.cache.EntryDestroyedException; -import com.gemstone.gemfire.cache.query.NameNotFoundException;
[20/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java index 414bc59..a227ee4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.admin.remote; +package org.apache.geode.internal.admin.remote; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Set; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.cache.persistence.RevokeFailedException; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberManager; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberPattern; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.CancelException; +import org.apache.geode.cache.persistence.RevokeFailedException; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.persistence.PersistentMemberManager; +import org.apache.geode.internal.cache.persistence.PersistentMemberPattern; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * An instruction to all members that they should forget http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java index 3d2ecd5..975e3d7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.admin.remote; +package org.apache.geode.internal.admin.remote; -import com.gemstone.gemfire.distributed.internal.*; +import org.apache.geode.distributed.internal.*; import java.io.*; /** * A message that is sent to a particular distribution manager to get its - * current {@link com.gemstone.gemfire.admin.GemFireMemberStatus} + * current {@link org.apache.geode.admin.GemFireMemberStatus} * */ public class RefreshMemberSnapshotRequest extends AdminRequest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java index f77dd0f..b942560 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.admin.remote; +package org.apache.geode.internal.admin.remote; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.admin.GemFireMemberStatus; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import
[48/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java -- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java index 3019cae..461a982 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina; +package org.apache.geode.modules.session.catalina; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.modules.session.catalina.internal.DeltaSessionStatistics; -import com.gemstone.gemfire.modules.util.RegionConfiguration; -import com.gemstone.gemfire.modules.util.SessionCustomExpiry; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.cache.Region; +import org.apache.geode.modules.session.catalina.internal.DeltaSessionStatistics; +import org.apache.geode.modules.util.RegionConfiguration; +import org.apache.geode.modules.util.SessionCustomExpiry; import org.apache.catalina.Session; import javax.servlet.http.HttpSession; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java -- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java index ba66fa2..ffed8ca 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina; +package org.apache.geode.modules.session.catalina; -import com.gemstone.gemfire.modules.session.bootstrap.ClientServerCache; +import org.apache.geode.modules.session.bootstrap.ClientServerCache; public class ClientServerCacheLifecycleListener extends AbstractCacheLifecycleListener { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java -- diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java index 2de43b4..333b355 100644 --- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java +++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.modules.session.catalina; - -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.modules.session.catalina.callback.SessionExpirationCacheListener; -import com.gemstone.gemfire.modules.util.BootstrappingFunction; -import com.gemstone.gemfire.modules.util.CreateRegionFunction; -import com.gemstone.gemfire.modules.util.RegionConfiguration; -import com.gemstone.gemfire.modules.util.RegionSizeFunction; -import com.gemstone.gemfire.modules.util.RegionStatus; -import
[45/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java -- diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java index 17600bc..67f8c7c 100755 --- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java +++ b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.admin; +package org.apache.geode.admin; -import com.gemstone.gemfire.admin.internal.InetAddressUtil; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import org.apache.geode.admin.internal.InetAddressUtil; +import org.apache.geode.distributed.internal.DistributionConfig; import java.util.Properties; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; /** @@ -37,7 +37,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; * * Detailed descriptions of many of these configuration attributes can * be found in the {@link - * com.gemstone.gemfire.distributed.DistributedSystem + * org.apache.geode.distributed.DistributedSystem * DistributedSystem} class. Note that the default values of these * configuration attributes can be specified using Java system * properties. @@ -57,7 +57,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; * the {@link #clone} method. * * @since GemFire 3.5 - * @deprecated as of 7.0 use the management package instead + * @deprecated as of 7.0 use the management package instead */ public interface DistributedSystemConfig extends Cloneable { @@ -267,7 +267,7 @@ public interface DistributedSystemConfig extends Cloneable { /** * Returns the name of the XML file that specifies the configuration - * of the {@linkplain com.gemstone.gemfire.admin.ManagedEntity + * of the {@linkplain org.apache.geode.admin.ManagedEntity * managed entities} administered by the * DistributedSystem. The XML file must conform to a * dtd. @@ -483,7 +483,7 @@ public interface DistributedSystemConfig extends Cloneable { * Returns the name of the log file to which informational messages * are written. * - * @see com.gemstone.gemfire.i18n.LogWriterI18n + * @see org.apache.geode.i18n.LogWriterI18n */ public String getLogFile(); @@ -491,7 +491,7 @@ public interface DistributedSystemConfig extends Cloneable { * Sets the name of the log file to which informational messages * are written. * - * @see com.gemstone.gemfire.i18n.LogWriterI18n + * @see org.apache.geode.i18n.LogWriterI18n */ public void setLogFile(String logFile); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java -- diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java index 5ece6cd..d9416ce 100644 --- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java +++ b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.admin; +package org.apache.geode.admin; /** * Provides configuration information relating to the health of an @@ -48,7 +48,7 @@ package com.gemstone.gemfire.admin; * * * @since GemFire 3.5 - * @deprecated as of 7.0 use the management package instead + * @deprecated as of 7.0 use the management package instead * */ public interface DistributedSystemHealthConfig { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java -- diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java index 541a3e2..da8864c 100755 --- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java +++ b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.admin; +package org.apache.geode.admin; /** * Represents a single distribution locator server, of which a @@
[17/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java index 014fd6f..7d9c0ad 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegionStats.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; - -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; +package org.apache.geode.internal.cache; + +import org.apache.geode.StatisticDescriptor; +import org.apache.geode.Statistics; +import org.apache.geode.StatisticsFactory; +import org.apache.geode.StatisticsType; +import org.apache.geode.StatisticsTypeFactory; +import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl; /** * GemFire statistics about a {@link DiskRegion}. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java index 451a907..ea2a35d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java @@ -17,14 +17,14 @@ /** * */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.io.File; import java.io.Serializable; import java.util.UUID; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.DiskStoreFactory; /** * Creates an attribute object for DiskStore. @@ -73,28 +73,28 @@ public class DiskStoreAttributes implements Serializable, DiskStore { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getAllowForceCompaction() + * @see org.apache.geode.cache.DiskStore#getAllowForceCompaction() */ public boolean getAllowForceCompaction() { return this.allowForceCompaction; } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getAutoCompact() + * @see org.apache.geode.cache.DiskStore#getAutoCompact() */ public boolean getAutoCompact() { return this.autoCompact; } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getCompactionThreshold() + * @see org.apache.geode.cache.DiskStore#getCompactionThreshold() */ public int getCompactionThreshold() { return this.compactionThreshold; } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getDiskDirSizes() + * @see org.apache.geode.cache.DiskStore#getDiskDirSizes() */ public int[] getDiskDirSizes() { int[] result = new int[this.diskDirSizes.length]; @@ -103,7 +103,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getDiskDirs() + * @see org.apache.geode.cache.DiskStore#getDiskDirs() */ public File[] getDiskDirs() { File[] result = new File[this.diskDirs.length]; @@ -112,7 +112,7 @@ public class DiskStoreAttributes implements Serializable, DiskStore { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getMaxOplogSize() + * @see org.apache.geode.cache.DiskStore#getMaxOplogSize() */ public long getMaxOplogSize() { // TODO Auto-generated method stub @@ -127,28 +127,28 @@ public class DiskStoreAttributes implements Serializable, DiskStore { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getName() + * @see org.apache.geode.cache.DiskStore#getName() */ public String getName() { return this.name; } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getQueueSize() + * @see org.apache.geode.cache.DiskStore#getQueueSize() */ public int getQueueSize() { return this.queueSize; } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStore#getTimeInterval() + * @see org.apache.geode.cache.DiskStore#getTimeInterval() */ public long getTimeInterval() { return
[49/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java -- diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java index 8cc9866..85723ec 100644 --- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java +++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.gemstone.gemfire.modules.session.internal.filter.attributes; +package org.apache.geode.modules.session.internal.filter.attributes; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java -- diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java index 15936ba..15dd522 100644 --- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java +++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.gemstone.gemfire.modules.session.internal.filter.attributes; +package org.apache.geode.modules.session.internal.filter.attributes; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java -- diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java index 8d20b43..e1aeb0b 100644 --- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java +++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.gemstone.gemfire.modules.session.internal.filter.attributes; +package org.apache.geode.modules.session.internal.filter.attributes; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java -- diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java index b3b0cef..a882712 100644 --- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java +++
[43/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java -- diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java index 7d880ad..37e7eea 100644 --- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java +++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.admin.jmx.internal; +package org.apache.geode.admin.jmx.internal; import java.io.File; import java.io.IOException; @@ -48,31 +48,31 @@ import mx4j.tools.adaptor.http.HttpAdaptor; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.admin.AdminDistributedSystem; -import com.gemstone.gemfire.admin.AdminException; -import com.gemstone.gemfire.admin.jmx.Agent; -import com.gemstone.gemfire.admin.jmx.AgentConfig; -import com.gemstone.gemfire.admin.jmx.AgentFactory; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.Banner; -import com.gemstone.gemfire.internal.GemFireVersion; -import com.gemstone.gemfire.internal.admin.remote.TailLogResponse; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogConfig; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.LogWriterFactory; -import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; +import org.apache.geode.GemFireException; +import org.apache.geode.GemFireIOException; +import org.apache.geode.LogWriter; +import org.apache.geode.SystemFailure; +import org.apache.geode.admin.AdminDistributedSystem; +import org.apache.geode.admin.AdminException; +import org.apache.geode.admin.jmx.Agent; +import org.apache.geode.admin.jmx.AgentConfig; +import org.apache.geode.admin.jmx.AgentFactory; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.i18n.StringId; +import org.apache.geode.internal.Banner; +import org.apache.geode.internal.GemFireVersion; +import org.apache.geode.internal.admin.remote.TailLogResponse; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.InternalLogWriter; +import org.apache.geode.internal.logging.LogConfig; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.LogWriterFactory; +import org.apache.geode.internal.logging.LoggingThreadGroup; +import org.apache.geode.internal.logging.log4j.AlertAppender; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.logging.log4j.LogMarker; +import org.apache.geode.internal.logging.log4j.LogWriterAppender; +import org.apache.geode.internal.logging.log4j.LogWriterAppenders; /** * The GemFire JMX Agent provides the ability to administrate one GemFire @@ -81,8 +81,8 @@ import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; * @since GemFire 3.5 */ public class AgentImpl -implements com.gemstone.gemfire.admin.jmx.Agent, - com.gemstone.gemfire.admin.jmx.internal.ManagedResource { +implements org.apache.geode.admin.jmx.Agent, + org.apache.geode.admin.jmx.internal.ManagedResource { private static final Logger logger = LogService.getLogger(); @@ -185,7 +185,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent, * Constructs a new Agent using the specified configuration. * * @param agentConfig instance of configuration for Agent - * @throws com.gemstone.gemfire.admin.AdminException TODO-javadocs + * @throws org.apache.geode.admin.AdminException TODO-javadocs * @throws IllegalArgumentException if agentConfig is null */ public AgentImpl(AgentConfigImpl agentConfig) @@ -861,13 +861,13 @@ implements com.gemstone.gemfire.admin.jmx.Agent, * Adds a ShutdownHook to the Agent for cleaning up any resources */ private void addShutdownHook() { -if( ! Boolean.getBoolean(
[23/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java index ab76d5c..d8c0223 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.*; +import org.apache.geode.distributed.internal.membership.gms.messages.*; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import java.io.DataInput; @@ -29,388 +29,388 @@ import java.io.NotSerializableException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.admin.internal.FinishBackupRequest; -import com.gemstone.gemfire.admin.internal.FinishBackupResponse; -import com.gemstone.gemfire.admin.internal.FlushToDiskRequest; -import com.gemstone.gemfire.admin.internal.FlushToDiskResponse; -import com.gemstone.gemfire.admin.internal.PrepareBackupRequest; -import com.gemstone.gemfire.admin.internal.PrepareBackupResponse; -import com.gemstone.gemfire.admin.internal.SystemMemberCacheEventProcessor; -import com.gemstone.gemfire.admin.jmx.internal.StatAlertNotification; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.client.internal.CacheServerLoadMessage; -import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionRequest; -import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionResponse; -import com.gemstone.gemfire.cache.client.internal.locator.ClientReplacementRequest; -import com.gemstone.gemfire.cache.client.internal.locator.GetAllServersRequest; -import com.gemstone.gemfire.cache.client.internal.locator.GetAllServersResponse; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorListRequest; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorListResponse; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusRequest; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse; -import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionRequest; -import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionResponse; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.internal.CqEntry; -import com.gemstone.gemfire.cache.query.internal.CumulativeNonDistinctResults; -import com.gemstone.gemfire.cache.query.internal.LinkedResultSet; -import com.gemstone.gemfire.cache.query.internal.LinkedStructSet; -import com.gemstone.gemfire.cache.query.internal.NWayMergeResults; -import com.gemstone.gemfire.cache.query.internal.NullToken; -import com.gemstone.gemfire.cache.query.internal.PRQueryTraceInfo; -import com.gemstone.gemfire.cache.query.internal.ResultsBag; -import com.gemstone.gemfire.cache.query.internal.ResultsCollectionWrapper; -import com.gemstone.gemfire.cache.query.internal.ResultsSet; -import com.gemstone.gemfire.cache.query.internal.SortedResultSet; -import com.gemstone.gemfire.cache.query.internal.SortedStructSet; -import com.gemstone.gemfire.cache.query.internal.StructBag; -import com.gemstone.gemfire.cache.query.internal.StructImpl; -import com.gemstone.gemfire.cache.query.internal.StructSet; -import com.gemstone.gemfire.cache.query.internal.Undefined; -import com.gemstone.gemfire.cache.query.internal.index.IndexCreationData; -import com.gemstone.gemfire.cache.query.internal.index.IndexManager; -import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl; -import com.gemstone.gemfire.cache.query.internal.types.MapTypeImpl; -import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl; -import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor; -import com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.SerialAckedMessage; -import com.gemstone.gemfire.distributed.internal.ShutdownMessage; -import com.gemstone.gemfire.distributed.internal.StartupMessage; -import com.gemstone.gemfire.distributed.internal.StartupResponseMessage; -import com.gemstone.gemfire.distributed.internal.StartupResponseWithVersionMessage; -import
[42/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/Cache.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/Cache.java b/geode-core/src/main/java/org/apache/geode/cache/Cache.java index a17fdd2..773654b 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/Cache.java +++ b/geode-core/src/main/java/org/apache/geode/cache/Cache.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package com.gemstone.gemfire.cache; +package org.apache.geode.cache; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.i18n.LogWriterI18n; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.snapshot.CacheSnapshotService; +import org.apache.geode.cache.util.GatewayConflictResolver; +import org.apache.geode.cache.wan.GatewayReceiver; +import org.apache.geode.cache.wan.GatewayReceiverFactory; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySenderFactory; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.i18n.LogWriterI18n; /** @@ -84,7 +84,7 @@ public interface Cache extends GemFireCache { * @return the region object * @throws RegionExistsException if a region is already in * this cache - * @throws com.gemstone.gemfire.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL + * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL * @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL * @throws CacheClosedException if the cache is closed * @throws IllegalStateException If the supplied RegionAttributes violate the @@ -103,7 +103,7 @@ public interface Cache extends GemFireCache { * @param aRegionAttributes the attributes of the root region * @return the region object * @throws RegionExistsException if a region is already in this cache - * @throws com.gemstone.gemfire.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL + * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL * @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL * @throws CacheClosedException if the cache is closed * @throws IllegalStateException If the supplied RegionAttributes violate the @@ -224,7 +224,7 @@ public interface Cache extends GemFireCache { /** * Gets the number of seconds a cache - * {@link com.gemstone.gemfire.cache.Region#get(Object) get} operation + * {@link org.apache.geode.cache.Region#get(Object) get} operation * can spend searching for a value before it times out. * The search includes any time spent loading the object. * When the search times out it causes the get to fail by throwing @@ -245,9 +245,9 @@ public interface Cache extends GemFireCache { * Creates a new cache server, with the default configuration, * that will allow clients to access this cache. * For the default configuration see the constants in - * {@link com.gemstone.gemfire.cache.server.CacheServer}. + * {@link org.apache.geode.cache.server.CacheServer}. * - * @see com.gemstone.gemfire.cache.server.CacheServer + * @see org.apache.geode.cache.server.CacheServer * * @since GemFire 5.7 */ @@ -286,7 +286,7 @@ public interface Cache extends GemFireCache { * Sets whether or not this Cache resides in a * long-running "cache server" VM. A cache server may be an * application VM or may be a stand-along VM launched using {@linkplain - * com.gemstone.gemfire.admin.AdminDistributedSystem#addCacheServer + *
[26/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java index 23513d6..2c70418 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.BufferedInputStream; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java index 362300f..c470a97 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java index 0c67bb8..a6c8dd7 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.Collection; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey; -import com.gemstone.gemfire.internal.util.PluckStacks; +import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey; +import org.apache.geode.internal.util.PluckStacks; /** * This class holds a graph of dependencies between objects http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java index 6a40596..ee72bd3 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java index cbd3a8c..95c5eca 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java +++
[40/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java index eebc36f..388ff4a 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientNotReadyException.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.gemstone.gemfire.cache.client; +package org.apache.geode.cache.client; -import com.gemstone.gemfire.cache.OperationAbortedException; +import org.apache.geode.cache.OperationAbortedException; /** * A ClientNotReadyException indicates a client attempted to invoke - * the {@link com.gemstone.gemfire.cache.Cache#readyForEvents} + * the {@link org.apache.geode.cache.Cache#readyForEvents} * method, but failed. * This exception was moved from the util package in 5.7. * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java index 3141d47..d57ac05 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.client; +package org.apache.geode.cache.client; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.compression.Compressor; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionDestroyedException; +import org.apache.geode.cache.RegionExistsException; +import org.apache.geode.compression.Compressor; /** * A factory for constructing {@link ClientCache client cache} {@link Region http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java index cb04d74..415bd1b 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/ClientRegionShortcut.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.cache.client; +package org.apache.geode.cache.client; -import com.gemstone.gemfire.cache.*; +import org.apache.geode.cache.*; /** * Each enum represents a predefined {@link RegionAttributes} in a {@link ClientCache}. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java b/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java index 0967a8c..7397f17 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/NoAvailableLocatorsException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.cache.client; +package org.apache.geode.cache.client; /**
[36/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/package.html -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/package.html b/geode-core/src/main/java/org/apache/geode/cache/package.html index 84a071b..5e0cd92 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/package.html +++ b/geode-core/src/main/java/org/apache/geode/cache/package.html @@ -46,16 +46,16 @@ the programmer's guide for performance guidelines. Top Function execution facilitates movement of behavior in the form of -{@linkplain com.gemstone.gemfire.cache.execute.Function}s executed using the -{@linkplain com.gemstone.gemfire.cache.execute.FunctionService +{@linkplain org.apache.geode.cache.execute.Function}s executed using the +{@linkplain org.apache.geode.cache.execute.FunctionService Function Execution Service}. A Function may generate results from -parallel execution on many {@linkplain com.gemstone.gemfire.cache.execute.FunctionService#onMembers(String...) members} -, or several {@linkplain com.gemstone.gemfire.cache.execute.FunctionService#onServers(Pool) +parallel execution on many {@linkplain org.apache.geode.cache.execute.FunctionService#onMembers(String...) members} +, or several {@linkplain org.apache.geode.cache.execute.FunctionService#onServers(Pool) Cache Servers}, or perhaps evaluating {@link -com.gemstone.gemfire.cache.execute.FunctionService#onRegion(Region) Region} data. A {@linkplain -com.gemstone.gemfire.cache.execute.ResultCollector} collects and +org.apache.geode.cache.execute.FunctionService#onRegion(Region) Region} data. A {@linkplain +org.apache.geode.cache.execute.ResultCollector} collects and possibly processes those results for consumption. For more information look to the -com.gemstone.gemfire.cache.execute package. +org.apache.geode.cache.execute package. Distributed CachingBack to Top @@ -68,41 +68,41 @@ efficiently shared among multiple threads in a VM, multiple VMs running on the same physical machine, and multiple VMs running on multiple machines. Cached data resides in "regions" whose contents are stored in a VM's heap. -The {@link com.gemstone.gemfire.cache.CacheFactory} class provides +The {@link org.apache.geode.cache.CacheFactory} class provides the entry point to the caching API. A CacheFactory is -configured to create a {@linkplain com.gemstone.gemfire.cache.Cache +configured to create a {@linkplain org.apache.geode.cache.Cache "cache instance"} that resides in the VM. The cache factory also allows -the {@link com.gemstone.gemfire.distributed.DistributedSystem} to be configured. +the {@link org.apache.geode.distributed.DistributedSystem} to be configured. Cache RegionsBack to Top Application data is cached in a {@linkplain -com.gemstone.gemfire.cache.Region "region"}. The {@link -com.gemstone.gemfire.cache.RegionFactory} class provides the simpliest -entry point into the {@linkplain com.gemstone.gemfire.cache.Region} -API. A {@link com.gemstone.gemfire.cache.Region} implements {@link java.util.Map}, +org.apache.geode.cache.Region "region"}. The {@link +org.apache.geode.cache.RegionFactory} class provides the simpliest +entry point into the {@linkplain org.apache.geode.cache.Region} +API. A {@link org.apache.geode.cache.Region} implements {@link java.util.Map}, however, it also provides caching behavior such as data loading, eviction control, and distribution. Every region has a name and regions may be nested to provide a cache-naming hierarchy ("parent regions" with "subregions"). The root regions of the naming hierarchy (that is, the regions with no parent) are obtained with the {@link -com.gemstone.gemfire.cache.Cache#rootRegions} method. +org.apache.geode.cache.Cache#rootRegions} method. Any region may be obtained with the {@link -com.gemstone.gemfire.cache.Cache#getRegion} method. +org.apache.geode.cache.Cache#getRegion} method. Region properties such as the region's cache loader, data policy, and storage model are specified by an instance of {@link -com.gemstone.gemfire.cache.RegionAttributes}. A region +org.apache.geode.cache.RegionAttributes}. A region RegionAttributes object can be specified when {@linkplain -com.gemstone.gemfire.cache.Region#createSubregion creating} a +org.apache.geode.cache.Region#createSubregion creating} a region. Partitioned RegionsBack to Top Region data can be partitioned across many distributed system members to create one large logical heap. -The data policy must be set to {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION} -or {@link com.gemstone.gemfire.cache.DataPolicy#PERSISTENT_PARTITION}. -{@link com.gemstone.gemfire.cache.PartitionAttributes} are used to configure +The data policy must be set to {@link org.apache.geode.cache.DataPolicy#PARTITION} +or {@link org.apache.geode.cache.DataPolicy#PERSISTENT_PARTITION}. +{@link
[32/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java index 718a2c4..ab3da53 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java @@ -19,7 +19,7 @@ * * Created on March 20, 2005, 6:47 PM */ -package com.gemstone.gemfire.cache.query.internal.index; +package org.apache.geode.cache.query.internal.index; import java.util.Collection; import java.util.Iterator; @@ -27,31 +27,31 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.FunctionDomainException; -import com.gemstone.gemfire.cache.query.IndexStatistics; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.NameResolutionException; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.TypeMismatchException; -import com.gemstone.gemfire.cache.query.internal.CompiledValue; -import com.gemstone.gemfire.cache.query.internal.ExecutionContext; -import com.gemstone.gemfire.cache.query.internal.QueryMonitor; -import com.gemstone.gemfire.cache.query.internal.QueryObserver; -import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder; -import com.gemstone.gemfire.cache.query.internal.QueryUtils; -import com.gemstone.gemfire.cache.query.internal.RuntimeIterator; -import com.gemstone.gemfire.cache.query.internal.Support; -import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes; -import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.pdx.internal.PdxString; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.FunctionDomainException; +import org.apache.geode.cache.query.IndexStatistics; +import org.apache.geode.cache.query.IndexType; +import org.apache.geode.cache.query.NameResolutionException; +import org.apache.geode.cache.query.QueryException; +import org.apache.geode.cache.query.QueryInvocationTargetException; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.TypeMismatchException; +import org.apache.geode.cache.query.internal.CompiledValue; +import org.apache.geode.cache.query.internal.ExecutionContext; +import org.apache.geode.cache.query.internal.QueryMonitor; +import org.apache.geode.cache.query.internal.QueryObserver; +import org.apache.geode.cache.query.internal.QueryObserverHolder; +import org.apache.geode.cache.query.internal.QueryUtils; +import org.apache.geode.cache.query.internal.RuntimeIterator; +import org.apache.geode.cache.query.internal.Support; +import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes; +import org.apache.geode.cache.query.internal.types.ObjectTypeImpl; +import org.apache.geode.cache.query.types.ObjectType; +import org.apache.geode.internal.cache.LocalRegion; +import org.apache.geode.internal.cache.RegionEntry; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.pdx.internal.PdxString; /** * @@ -351,7 +351,7 @@ public class PrimaryKeyIndex extends AbstractIndex { /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.query.internal.index.AbstractIndex#lockedQuery(java.lang.Object, + * @see org.apache.geode.cache.query.internal.index.AbstractIndex#lockedQuery(java.lang.Object, * int, java.lang.Object, int, java.util.Collection, java.util.Set) */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java index 8f1d116..c4696e8 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java +++
[03/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java index 1171c17..54517d4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache.execute; +package org.apache.geode.internal.cache.execute; import java.util.HashSet; import java.util.Set; -import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException; -import com.gemstone.gemfire.distributed.DistributedMember; +import org.apache.geode.cache.execute.FunctionInvocationTargetException; +import org.apache.geode.distributed.DistributedMember; public class InternalFunctionInvocationTargetException extends FunctionInvocationTargetException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java index f0ed757..1374636 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache.execute; +package org.apache.geode.internal.cache.execute; import java.util.Set; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.internal.FunctionServiceManager; -import com.gemstone.gemfire.internal.cache.AbstractRegion; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.internal.FunctionServiceManager; +import org.apache.geode.internal.cache.AbstractRegion; +import org.apache.geode.internal.cache.LocalRegion; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java index 90ad79c..2bf8e15 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache.execute; +package org.apache.geode.internal.cache.execute; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; -import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; -import com.gemstone.gemfire.internal.cache.LocalDataSet; +import org.apache.geode.cache.PartitionAttributesFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.RegionFunctionContext; +import
[14/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java index 4cbcbd0..a6951de 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; -import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.*; +import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.*; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -54,164 +54,164 @@ import java.util.regex.Pattern; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.CopyHelper; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.DeltaSerializationException; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.admin.internal.SystemMemberCacheEventProcessor; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheEvent; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheRuntimeException; -import com.gemstone.gemfire.cache.CacheStatistics; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.DiskWriteAttributes; -import com.gemstone.gemfire.cache.DiskWriteAttributesFactory; -import com.gemstone.gemfire.cache.EntryDestroyedException; -import com.gemstone.gemfire.cache.EntryExistsException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.FailedSynchronizationException; -import com.gemstone.gemfire.cache.InterestRegistrationEvent; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.LowMemoryException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.PartitionedRegionStorageException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.RegionMembershipListener; -import com.gemstone.gemfire.cache.RegionReinitializedException; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.StatisticsDisabledException; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.TransactionException; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.ServerOperationException; -import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException; -import com.gemstone.gemfire.cache.client.internal.Connection; -import com.gemstone.gemfire.cache.client.internal.Endpoint; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy; -import com.gemstone.gemfire.cache.control.ResourceManager; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; -import com.gemstone.gemfire.cache.query.FunctionDomainException; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexMaintenanceException; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.MultiIndexCreationException; -import com.gemstone.gemfire.cache.query.NameResolutionException; -import
[02/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java index cc8e6bc..6b12022 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache.locks; +package org.apache.geode.internal.cache.locks; import java.io.DataInput; import java.io.DataOutput; @@ -26,20 +26,20 @@ import java.util.concurrent.RejectedExecutionException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.MessageWithReply; -import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.locks.DLockGrantor; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.TXCommitMessage; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.MessageWithReply; +import org.apache.geode.distributed.internal.PooledDistributionMessage; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.distributed.internal.ReplyMessage; +import org.apache.geode.distributed.internal.ReplyProcessor21; +import org.apache.geode.distributed.internal.locks.DLockGrantor; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.TXCommitMessage; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; /** * Sends TXOriginatorRecoveryMessage to all participants of @@ -173,7 +173,7 @@ public class TXOriginatorRecoveryProcessor extends ReplyProcessor21 { // when the grantor receives reply it will release txLock... /* TODO: implement waitToReleaseTXLockId here testTXOriginatorRecoveryProcessor in - com.gemstone.gemfire.internal.cache.locks.TXLockServiceTest + org.apache.geode.internal.cache.locks.TXLockServiceTest should be expanded upon also... */ } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java index 2d116a3..f90e4eb 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache.locks; +package org.apache.geode.internal.cache.locks; import java.util.concurrent.RejectedExecutionException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.locks.DLockRecoverGrantorProcessor; -import com.gemstone.gemfire.distributed.internal.locks.DLockRemoteToken; -import com.gemstone.gemfire.distributed.internal.locks.DLockService; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.cache.TXCommitMessage; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import
[12/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java index cce0b73..ebb2627 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.util.Collection; import java.util.List; import java.util.Set; -import com.gemstone.gemfire.cache.CacheCallback; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.internal.cache.AbstractRegionMap.ARMLockTestHook; -import com.gemstone.gemfire.internal.cache.lru.LRUMapCallbacks; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector; -import com.gemstone.gemfire.internal.cache.versions.VersionHolder; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; +import org.apache.geode.cache.CacheCallback; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.TimeoutException; +import org.apache.geode.cache.TransactionId; +import org.apache.geode.internal.cache.AbstractRegionMap.ARMLockTestHook; +import org.apache.geode.internal.cache.lru.LRUMapCallbacks; +import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.versions.RegionVersionVector; +import org.apache.geode.internal.cache.versions.VersionHolder; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionTag; /** * Internal interface used by {@link LocalRegion} to access the map that holds http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java index cfbe4e6..305bfd7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMapFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java index 44e03bd..50b0296 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; -import com.gemstone.gemfire.cache.*; +import org.apache.geode.cache.*; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java index ed6c7e5..97b6296 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueueException.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; -import
[31/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLParser.java -- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLParser.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLParser.java index bb70b05..a9c05cc 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLParser.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLParser.java @@ -1,8 +1,8 @@ // $ANTLR 2.7.4: "oql.g" -> "OQLParser.java"$ -package com.gemstone.gemfire.cache.query.internal.parse; +package org.apache.geode.cache.query.internal.parse; import java.util.*; -import com.gemstone.gemfire.cache.query.internal.types.*; +import org.apache.geode.cache.query.internal.types.*; import antlr.TokenBuffer; import antlr.TokenStreamException; @@ -24,7 +24,7 @@ import antlr.ASTPair; import antlr.collections.impl.ASTArray; /* OQL PARSER */ -public class OQLParser extends com.gemstone.gemfire.cache.query.internal.parse.UtilParser implements OQLLexerTokenTypes +public class OQLParser extends org.apache.geode.cache.query.internal.parse.UtilParser implements OQLLexerTokenTypes { protected OQLParser(TokenBuffer tokenBuf, int k) { @@ -135,7 +135,7 @@ public OQLParser(ParserSharedInputState state) { if ( inputState.guessing==0 ) { queryProgram_AST = (AST)currentAST.root; queryProgram_AST = - (AST)astFactory.make( (new ASTArray(2)).add((AST)astFactory.create(QUERY_PROGRAM,"queryProgram","com.gemstone.gemfire.cache.query.internal.parse.GemFireAST")).add(queryProgram_AST)); + (AST)astFactory.make( (new ASTArray(2)).add((AST)astFactory.create(QUERY_PROGRAM,"queryProgram","org.apache.geode.cache.query.internal.parse.GemFireAST")).add(queryProgram_AST)); currentAST.root = queryProgram_AST; currentAST.child = queryProgram_AST!=null &_AST.getFirstChild()!=null ? queryProgram_AST.getFirstChild() : queryProgram_AST; @@ -153,8 +153,8 @@ public OQLParser(ParserSharedInputState state) { { match(TOK_LT); - com.gemstone.gemfire.cache.query.internal.parse.ASTTrace tmp7_AST = null; - tmp7_AST = (com.gemstone.gemfire.cache.query.internal.parse.ASTTrace)astFactory.create(LT(1),"com.gemstone.gemfire.cache.query.internal.parse.ASTTrace"); + org.apache.geode.cache.query.internal.parse.ASTTrace tmp7_AST = null; + tmp7_AST = (org.apache.geode.cache.query.internal.parse.ASTTrace)astFactory.create(LT(1),"org.apache.geode.cache.query.internal.parse.ASTTrace"); astFactory.makeASTRoot(currentAST, tmp7_AST); match(LITERAL_trace); match(TOK_GT); @@ -256,7 +256,7 @@ public OQLParser(ParserSharedInputState state) { if ( inputState.guessing==0 ) { loneFromClause_AST = (AST)currentAST.root; loneFromClause_AST = - (AST)astFactory.make( (new ASTArray(2)).add((AST)astFactory.create(LITERAL_from,"from","com.gemstone.gemfire.cache.query.internal.parse.ASTCombination")).add(loneFromClause_AST)); + (AST)astFactory.make( (new ASTArray(2)).add((AST)astFactory.create(LITERAL_from,"from","org.apache.geode.cache.query.internal.parse.ASTCombination")).add(loneFromClause_AST)); currentAST.root = loneFromClause_AST; currentAST.child = loneFromClause_AST!=null &_AST.getFirstChild()!=null ? loneFromClause_AST.getFirstChild() : loneFromClause_AST; @@ -316,7 +316,7 @@ public OQLParser(ParserSharedInputState state) { } if ( inputState.guessing==0 ) { iteratorDef_AST = (AST)currentAST.root; - iteratorDef_AST = (AST)astFactory.make( (new ASTArray(4)).add((AST)astFactory.create(ITERATOR_DEF,"iterDef","com.gemstone.gemfire.cache.query.internal.parse.ASTIteratorDef")).add(ex1_AST).add(id1_AST).add(t1_AST)); + iteratorDef_AST = (AST)astFactory.make( (new ASTArray(4)).add((AST)astFactory.create(ITERATOR_DEF,"iterDef","org.apache.geode.cache.query.internal.parse.ASTIteratorDef")).add(ex1_AST).add(id1_AST).add(t1_AST)); currentAST.root = iteratorDef_AST; currentAST.child = iteratorDef_AST!=null &_AST.getFirstChild()!=null ? iteratorDef_AST.getFirstChild() : iteratorDef_AST;
[27/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java -- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index b741015..17303c1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; import java.io.File; import java.io.IOException; @@ -42,73 +42,73 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.admin.AlertLevel; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.execute.internal.FunctionServiceManager; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.internal.locks.GrantorRequestProcessor; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.InternalInstantiator; -import com.gemstone.gemfire.internal.SystemTimer; -import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; -import com.gemstone.gemfire.internal.cache.CacheConfig; -import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.EventID; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.execute.FunctionServiceStats; -import com.gemstone.gemfire.internal.cache.execute.FunctionStats; -import com.gemstone.gemfire.internal.cache.tier.sockets.HandShake; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheServerCreation; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.LogWriterFactory; -import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; -import com.gemstone.gemfire.internal.net.SocketCreatorFactory; -import com.gemstone.gemfire.internal.offheap.MemoryAllocator; -import com.gemstone.gemfire.internal.offheap.OffHeapStorage; -import com.gemstone.gemfire.internal.statistics.DummyStatisticsImpl; -import com.gemstone.gemfire.internal.statistics.GemFireStatSampler; -import com.gemstone.gemfire.internal.statistics.platform.LinuxProcFsStatistics; -import com.gemstone.gemfire.internal.statistics.LocalStatisticsImpl; -import com.gemstone.gemfire.internal.statistics.platform.OsStatisticsFactory; -import com.gemstone.gemfire.internal.statistics.StatisticsImpl; -import com.gemstone.gemfire.internal.statistics.StatisticsManager; -import
[09/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java index dfffd73..b730528 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.internal.cache.lru.EnableLRU; +import org.apache.geode.internal.cache.persistence.DiskRecoveryStore; +import org.apache.geode.internal.InternalStatisticsDisabledException; +import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; // macros whose definition changes this class: // disk: DISK // lru: LRU http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java index 3125dc7..21535b6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.internal.cache.lru.EnableLRU; +import org.apache.geode.internal.cache.persistence.DiskRecoveryStore; +import org.apache.geode.internal.InternalStatisticsDisabledException; +import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; // macros whose definition changes this class: // disk: DISK // lru: LRU http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java index 34597bc..c9c25ed 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import
[11/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java index c3ff698..4802fba 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXCommitMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.io.DataInput; import java.io.DataOutput; @@ -33,49 +33,49 @@ import java.util.Set; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheRuntimeException; -import com.gemstone.gemfire.cache.CommitDistributionException; -import com.gemstone.gemfire.cache.CommitIncompleteException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionDistributionException; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.cache.TransactionListener; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.MembershipListener; -import com.gemstone.gemfire.distributed.internal.MessageWithReply; -import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage; -import com.gemstone.gemfire.distributed.internal.ReliableReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.cache.locks.TXLockId; -import com.gemstone.gemfire.internal.cache.locks.TXLockIdImpl; -import com.gemstone.gemfire.internal.cache.locks.TXLockService; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberID; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.offheap.annotations.Released; +import org.apache.geode.CancelException; +import org.apache.geode.DataSerializer; +import org.apache.geode.SystemFailure; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.CacheRuntimeException; +import org.apache.geode.cache.CommitDistributionException; +import org.apache.geode.cache.CommitIncompleteException; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.RegionDestroyedException; +import org.apache.geode.cache.RegionDistributionException; +import org.apache.geode.cache.TransactionId; +import org.apache.geode.cache.TransactionListener; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.MembershipListener; +import org.apache.geode.distributed.internal.MessageWithReply; +import org.apache.geode.distributed.internal.PooledDistributionMessage; +import org.apache.geode.distributed.internal.ReliableReplyProcessor21; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.distributed.internal.ReplyMessage; +import org.apache.geode.distributed.internal.ReplyProcessor21; +import
[15/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java index 1364b3e..93a9c3b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -76,161 +76,161 @@ import com.sun.jna.Platform; import org.apache.geode.redis.GeodeRedisServer; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireCacheException; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.admin.internal.SystemMemberCacheEventProcessor; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheExistsException; -import com.gemstone.gemfire.cache.CacheRuntimeException; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.CacheXmlException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.DynamicRegionFactory; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.GatewayException; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl; -import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.internal.ClientMetadataService; -import com.gemstone.gemfire.cache.client.internal.ClientRegionFactoryImpl; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.internal.DefaultQuery; -import com.gemstone.gemfire.cache.query.internal.DefaultQueryService; -import com.gemstone.gemfire.cache.query.internal.QueryMonitor; -import com.gemstone.gemfire.cache.query.internal.cq.CqService; -import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.distributed.DistributedLockService; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.CacheTime; -import com.gemstone.gemfire.distributed.internal.DM; -import
[06/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java index d151694..d490d82 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.cache.lru.LRUClockNode; -import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.internal.cache.lru.EnableLRU; +import org.apache.geode.internal.InternalStatisticsDisabledException; +import org.apache.geode.internal.cache.lru.LRUClockNode; +import org.apache.geode.internal.cache.lru.NewLRUClockHand; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionStamp; +import org.apache.geode.internal.cache.versions.VersionTag; +import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; // macros whose definition changes this class: // disk: DISK // lru: LRU http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java index ea55bc9..0759341 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.cache.lru.LRUClockNode; -import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.internal.cache.lru.EnableLRU; +import org.apache.geode.internal.InternalStatisticsDisabledException; +import org.apache.geode.internal.cache.lru.LRUClockNode; +import org.apache.geode.internal.cache.lru.NewLRUClockHand; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionStamp; +import org.apache.geode.internal.cache.versions.VersionTag; +import
[07/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java index edf3316..e0499d2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ValidatingDiskRegion.java @@ -14,32 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.internal.ByteArrayDataInput; -import com.gemstone.gemfire.internal.InternalStatisticsDisabledException; -import com.gemstone.gemfire.internal.cache.DistributedRegion.DiskPosition; -import com.gemstone.gemfire.internal.cache.InitialImageOperation.Entry; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; -import com.gemstone.gemfire.internal.cache.persistence.DiskExceptionHandler; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.cache.persistence.DiskRegionView; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.CancelCriterion; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.DiskAccessException; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.cache.TimeoutException; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.internal.ByteArrayDataInput; +import org.apache.geode.internal.InternalStatisticsDisabledException; +import org.apache.geode.internal.cache.DistributedRegion.DiskPosition; +import org.apache.geode.internal.cache.InitialImageOperation.Entry; +import org.apache.geode.internal.cache.lru.EnableLRU; +import org.apache.geode.internal.cache.lru.NewLRUClockHand; +import org.apache.geode.internal.cache.persistence.DiskExceptionHandler; +import org.apache.geode.internal.cache.persistence.DiskRecoveryStore; +import org.apache.geode.internal.cache.persistence.DiskRegionView; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionStamp; +import org.apache.geode.internal.cache.versions.VersionTag; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * A disk region that is created when doing offline validation. @@ -205,7 +205,7 @@ public class ValidatingDiskRegion extends DiskRegion implements DiskRecoveryStor throw new IllegalStateException("should never be called"); } /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.DiskEntry#getVersionStamp() + * @see org.apache.geode.internal.cache.DiskEntry#getVersionStamp() */ @Override public VersionStamp getVersionStamp() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java index 36242ba..5629174 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; /** * A wrapper class for the operation which has been recovered to be recovered by
[10/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java index 0b226e0..197111a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateStub.java @@ -17,7 +17,7 @@ /** * File comment */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.util.Collection; import java.util.HashMap; @@ -26,24 +26,24 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.SynchronizationCommitConflictException; -import com.gemstone.gemfire.cache.TransactionDataNodeHasDepartedException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.TransactionException; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.cache.UnsupportedOperationInTransactionException; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.ReliableReplyException; -import com.gemstone.gemfire.distributed.internal.ReliableReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; -import com.gemstone.gemfire.internal.cache.tier.sockets.VersionedObjectList; -import com.gemstone.gemfire.internal.cache.tx.TXRegionStub; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CommitConflictException; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.cache.Region.Entry; +import org.apache.geode.cache.SynchronizationCommitConflictException; +import org.apache.geode.cache.TransactionDataNodeHasDepartedException; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.TransactionException; +import org.apache.geode.cache.TransactionId; +import org.apache.geode.cache.UnsupportedOperationInTransactionException; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.ReliableReplyException; +import org.apache.geode.distributed.internal.ReliableReplyProcessor21; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; +import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList; +import org.apache.geode.internal.cache.tx.TXRegionStub; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * TXStateStub lives on the accessor node when we are remoting @@ -146,7 +146,7 @@ public abstract class TXStateStub implements TXStateInterface { /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.TXStateInterface#destroyExistingEntry(com.gemstone.gemfire.internal.cache.EntryEventImpl, boolean, java.lang.Object) + * @see org.apache.geode.internal.cache.TXStateInterface#destroyExistingEntry(org.apache.geode.internal.cache.EntryEventImpl, boolean, java.lang.Object) */ public void destroyExistingEntry(EntryEventImpl event, boolean cacheWrite, Object expectedOldValue) throws EntryNotFoundException { @@ -159,7 +159,7 @@ public abstract class TXStateStub implements TXStateInterface { } /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.TXStateInterface#getBeginTime() + * @see org.apache.geode.internal.cache.TXStateInterface#getBeginTime() */ public long getBeginTime() { // TODO Auto-generated method stub @@ -167,14 +167,14 @@ public abstract class TXStateStub implements TXStateInterface { } /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.TXStateInterface#getCache() + * @see org.apache.geode.internal.cache.TXStateInterface#getCache() */ public Cache getCache() { return this.proxy.getTxMgr().getCache(); } /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.TXStateInterface#getChanges() + * @see org.apache.geode.internal.cache.TXStateInterface#getChanges() */ public int getChanges() { // TODO Auto-generated method stub @@ -182,7 +182,7 @@ public abstract class TXStateStub implements TXStateInterface { } /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.TXStateInterface#getDeserializedValue(java.lang.Object, com.gemstone.gemfire.internal.cache.LocalRegion, boolean) + * @see
[13/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java index b3ca5e5..bb14576 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.util.ArrayList; import java.util.HashSet; @@ -24,18 +24,18 @@ import java.util.Set; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DuplicatePrimaryPartitionException; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.FixedPartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.DuplicatePrimaryPartitionException; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.FixedPartitionAttributes; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java index 175a284..6e4fcd5 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java @@ -15,98 +15,98 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; - -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.*; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; -import com.gemstone.gemfire.cache.client.internal.*; -import com.gemstone.gemfire.cache.execute.*; -import com.gemstone.gemfire.cache.partition.PartitionListener; -import com.gemstone.gemfire.cache.partition.PartitionNotAvailableException; -import com.gemstone.gemfire.cache.query.*; -import com.gemstone.gemfire.cache.query.internal.*; -import com.gemstone.gemfire.cache.query.internal.index.*; -import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.distributed.DistributedLockService; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.LockServiceDestroyedException; -import com.gemstone.gemfire.distributed.internal.*; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.DisconnectListener; -import com.gemstone.gemfire.distributed.internal.locks.DLockRemoteToken; -import com.gemstone.gemfire.distributed.internal.locks.DLockService; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; -import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.NanoTimer; -import com.gemstone.gemfire.internal.SetUtils; -import com.gemstone.gemfire.internal.Version; -import
[04/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java index 0c926dd..07f7d1b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryHeapUUIDKey.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.UUID; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionStamp; +import org.apache.geode.internal.cache.versions.VersionTag; +import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; // macros whose definition changes this class: // disk: DISK // lru: LRU http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java index b9c5a5c..d3c41cc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; import java.util.UUID; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java index d7e55f7..05138de 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinRegionEntryOffHeapIntKey.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; -import com.gemstone.gemfire.internal.offheap.annotations.Released; -import com.gemstone.gemfire.internal.offheap.annotations.Retained; -import com.gemstone.gemfire.internal.offheap.annotations.Unretained; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionStamp; +import org.apache.geode.internal.cache.versions.VersionTag; +import
[05/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java index 6761aa0..3b58c7a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.cache.lru.LRUClockNode; -import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; -import com.gemstone.gemfire.internal.offheap.annotations.Released; -import com.gemstone.gemfire.internal.offheap.annotations.Retained; -import com.gemstone.gemfire.internal.offheap.annotations.Unretained; -import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.internal.cache.lru.EnableLRU; +import org.apache.geode.internal.cache.persistence.DiskRecoveryStore; +import org.apache.geode.internal.cache.lru.LRUClockNode; +import org.apache.geode.internal.cache.lru.NewLRUClockHand; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.cache.versions.VersionStamp; +import org.apache.geode.internal.cache.versions.VersionTag; +import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper; +import org.apache.geode.internal.offheap.annotations.Released; +import org.apache.geode.internal.offheap.annotations.Retained; +import org.apache.geode.internal.offheap.annotations.Unretained; +import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; // macros whose definition changes this class: // disk: DISK // lru: LRU http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java -- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java index 4948373..e2da09b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal.cache; +package org.apache.geode.internal.cache; // DO NOT modify this class. It was generated from LeafRegionEntry.cpp import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.internal.cache.lru.EnableLRU; -import com.gemstone.gemfire.internal.cache.persistence.DiskRecoveryStore; -import com.gemstone.gemfire.internal.cache.lru.LRUClockNode; -import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.internal.cache.versions.VersionTag; -import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; -import
[02/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthenticator.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthenticator.java b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthenticator.java new file mode 100755 index 000..ac5939d --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSAuthenticator.java @@ -0,0 +1,158 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.security.templates; + +import java.io.FileInputStream; +import java.security.KeyStore; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.security.Signature; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import java.security.spec.InvalidKeySpecException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import org.apache.logging.log4j.Logger; + +import com.gemstone.gemfire.LogWriter; +import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.security.AuthenticationFailedException; +import com.gemstone.gemfire.security.Authenticator; + +/** + * An implementation of {@link Authenticator} that uses PKCS. + */ +public class PKCSAuthenticator implements Authenticator { + + private static final Logger logger = LogService.getLogger(); + + public static final String PUBLIC_KEY_FILE = "security-publickey-filepath"; + public static final String PUBLIC_KEYSTORE_PASSWORD = "security-publickey-pass"; + + private String pubKeyFilePath; + private String pubKeyPass; + private Map aliasCertificateMap; + + private LogWriter systemLogWriter; + private LogWriter securityLogWriter; + + public static Authenticator create() { +return new PKCSAuthenticator(); + } + + @Override + public void init(final Properties securityProperties, final LogWriter systemLogWriter, final LogWriter securityLogWriter) throws AuthenticationFailedException { +this.systemLogWriter = systemLogWriter; +this.securityLogWriter = securityLogWriter; + +this.pubKeyFilePath = securityProperties.getProperty(PUBLIC_KEY_FILE); +if (this.pubKeyFilePath == null) { + throw new AuthenticationFailedException("PKCSAuthenticator: property " + PUBLIC_KEY_FILE + " not specified as the public key file."); +} + +this.pubKeyPass = securityProperties.getProperty(PUBLIC_KEYSTORE_PASSWORD); +this.aliasCertificateMap = new HashMap(); + +populateMap(); + } + + @Override + public Principal authenticate(final Properties credentials, final DistributedMember member) throws AuthenticationFailedException { +final String alias = (String)credentials.get(PKCSAuthInit.KEYSTORE_ALIAS); +if (alias == null || alias.length() <= 0) { + throw new AuthenticationFailedException("No alias received"); +} + +try { + final X509Certificate cert = getCertificate(alias); + if (cert == null) { +throw newException("No certificate found for alias:" + alias); + } + + final byte[] signatureBytes = (byte[])credentials.get(PKCSAuthInit.SIGNATURE_DATA); + if (signatureBytes == null) { +throw newException("signature data property [" + PKCSAuthInit.SIGNATURE_DATA + "] not provided"); + } + + final Signature sig = Signature.getInstance(cert.getSigAlgName()); + sig.initVerify(cert); + sig.update(alias.getBytes("UTF-8")); + + if (!sig.verify(signatureBytes)) { +throw newException("verification of client signature failed"); + } + + return new PKCSPrincipal(alias); + +} catch (Exception ex) { + throw newException(ex.toString(), ex); +} + } + + @Override + public void close() { + } + + private void populateMap() { +try { + final KeyStore keyStore = KeyStore.getInstance("JKS"); + final char[] passPhrase = this.pubKeyPass != null ? this.pubKeyPass.toCharArray() : null; + final
[14/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationPart2DUnitTest.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationPart2DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationPart2DUnitTest.java deleted file mode 100644 index 24fcc3f..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationPart2DUnitTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You 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. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.gemstone.gemfire.security; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.test.junit.categories.DistributedTest; -import com.gemstone.gemfire.test.junit.categories.SecurityTest; - -/** - * this class contains test methods that used to be in its superclass but - * that test started taking too long and caused dunit runs to hang - */ -@Category({ DistributedTest.class, SecurityTest.class }) -public class ClientAuthenticationPart2DUnitTest extends ClientAuthenticationTestCase { - - @Test - public void testNoCredentialsForMultipleUsers() throws Exception { -doTestNoCredentials(true); - } - - @Test - public void testInvalidCredentialsForMultipleUsers() throws Exception { -doTestInvalidCredentials(true); - } - - @Test - public void testInvalidAuthInitForMultipleUsers() throws Exception { -doTestInvalidAuthInit(true); - } - - @Test - public void testNoAuthInitWithCredentialsForMultipleUsers() throws Exception { -doTestNoAuthInitWithCredentials(true); - } - - @Test - public void testInvalidAuthenitcatorForMultipleUsers() throws Exception { -doTestInvalidAuthenticator(true); - } - - @Test - public void testNoAuthenticatorWithCredentialsForMultipleUsers() throws Exception { -doTestNoAuthenticatorWithCredentials(true); - } - - @Ignore("Disabled for unknown reason") - @Test - public void testCredentialsWithFailoverForMultipleUsers() throws Exception { -doTestCredentialsWithFailover(true); - } - - @Ignore("Disabled for unknown reason") - @Test - public void testCredentialsForNotificationsForMultipleUsers() throws Exception { -doTestCredentialsForNotifications(true); - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java deleted file mode 100644 index 7e6d022..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestCase.java +++ /dev/null @@ -1,562 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.security; - -import static com.gemstone.gemfire.internal.AvailablePort.*; -import static com.gemstone.gemfire.security.ClientAuthenticationTestUtils.createCacheClient; -import static com.gemstone.gemfire.security.ClientAuthenticationTestUtils.createCacheServer; -import static com.gemstone.gemfire.security.ClientAuthenticationTestUtils.*;
[13/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java deleted file mode 100644 index c222e6c..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java +++ /dev/null @@ -1,1325 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You 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. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.gemstone.gemfire.security; - -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; -import static com.gemstone.gemfire.internal.AvailablePort.*; -import static com.gemstone.gemfire.security.SecurityTestUtils.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Host.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.Callable; - -import com.gemstone.gemfire.cache.DynamicRegionFactory; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.client.ServerConnectivityException; -import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; -import com.gemstone.gemfire.cache.query.CqAttributes; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; -import com.gemstone.gemfire.cache.query.CqEvent; -import com.gemstone.gemfire.cache.query.CqException; -import com.gemstone.gemfire.cache.query.CqListener; -import com.gemstone.gemfire.cache.query.CqQuery; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.Struct; -import com.gemstone.gemfire.internal.AvailablePort.*; -import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.internal.cache.AbstractRegionEntry; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator; -import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator.ClassCode; -import com.gemstone.gemfire.security.generator.CredentialGenerator; -import com.gemstone.gemfire.security.generator.DummyCredentialGenerator; -import com.gemstone.gemfire.security.generator.XmlAuthzCredentialGenerator; -import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.WaitCriterion; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; - -/** - * Base class for tests for authorization from client to server. It contains - * utility functions for the authorization tests from client to server. - * - * @since GemFire 5.5 - */ -public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestCase { - - private static final int PAUSE = 5 * 1000; - - protected static VM server1 = null; - protected static VM server2 = null; - protected static VM client1 = null; - protected static VM client2 = null; - - protected static final String regionName = REGION_NAME; // TODO: remove - protected static final String SUBREGION_NAME = "AuthSubregion"; - - private static final String[] serverIgnoredExceptions = { - "Connection refused", - AuthenticationRequiredException.class.getName(), - AuthenticationFailedException.class.getName(), - NotAuthorizedException.class.getName(), - GemFireSecurityException.class.getName(), - RegionDestroyedException.class.getName(), - ClassNotFoundException.class.getName() - }; - - private static
[11/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/NoShowValue1PostProcessorDUnitTest.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/NoShowValue1PostProcessorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/NoShowValue1PostProcessorDUnitTest.java deleted file mode 100644 index 5d071a8..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/NoShowValue1PostProcessorDUnitTest.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.security; - -import static org.junit.Assert.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; -import com.gemstone.gemfire.test.junit.categories.SecurityTest; - -@Category({ DistributedTest.class, SecurityTest.class }) -public class NoShowValue1PostProcessorDUnitTest extends AbstractSecureServerDUnitTest { - - public NoShowValue1PostProcessorDUnitTest(){ -this.postProcessor = NoShowValue1PostProcessor.class; - } - - @Test - public void testPostProcess(){ -List keys = new ArrayList<>(); -keys.add("key1"); -keys.add("key2"); - -client1.invoke(()->{ - ClientCache cache = createClientCache("super-user", "1234567", serverPort); - Region region = cache.getRegion(REGION_NAME); - - // post process for get - assertEquals("value3", region.get("key3")); - - assertNull(region.get("key1")); - - // post processs for getAll - Map values = region.getAll(keys); - assertEquals(2, values.size()); - assertEquals("value2", values.get("key2")); - assertNull(values.get("key1")); - - // post process for query - String query = "select * from /AuthRegion"; - SelectResults result = region.query(query); - System.out.println("query result: "+result); - assertEquals(5, result.size()); - assertTrue(result.contains("value0")); - assertFalse(result.contains("value1")); - assertTrue(result.contains("value2")); - assertTrue(result.contains("value3")); - assertTrue(result.contains("value4")); - - Pool pool = PoolManager.find(region); - result = (SelectResults)pool.getQueryService().newQuery(query).execute(); - System.out.println("query result: "+result); - assertTrue(result.contains("value0")); - assertFalse(result.contains("value1")); - assertTrue(result.contains("value2")); - assertTrue(result.contains("value3")); - assertTrue(result.contains("value4")); -}); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java deleted file mode 100644 index 67dfadc..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/NotAuthorizedExceptionTest.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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,
[15/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
GEODE-37 Renamed security related stuff Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9d7a6960 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9d7a6960 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9d7a6960 Branch: refs/heads/feature/GEODE-37_2 Commit: 9d7a6960afedd8991fd6be44e4ca10a0b43b59ce Parents: 7c20e69 Author: Hitesh KhamesraAuthored: Tue Sep 13 15:56:14 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 15:56:14 2016 -0700 -- .../gemfire/security/AccessControl.java | 105 - .../gemfire/security/AuthInitialize.java| 97 - .../security/AuthenticationFailedException.java | 53 - .../AuthenticationRequiredException.java| 53 - .../gemfire/security/Authenticator.java | 96 - .../security/GemFireSecurityException.java | 132 -- .../security/NotAuthorizedException.java| 134 -- .../com/gemstone/gemfire/security/package.html | 39 - .../apache/geode/security/AccessControl.java| 105 + .../apache/geode/security/AuthInitialize.java | 97 + .../security/AuthenticationFailedException.java | 53 + .../AuthenticationRequiredException.java| 53 + .../apache/geode/security/Authenticator.java| 96 + .../security/GemFireSecurityException.java | 132 ++ .../geode/security/NotAuthorizedException.java | 134 ++ .../java/org/apache/geode/security/package.html | 39 + .../security/AbstractSecureServerDUnitTest.java | 162 -- .../security/ClientAuthenticationDUnitTest.java | 90 - .../ClientAuthenticationPart2DUnitTest.java | 76 - .../security/ClientAuthenticationTestCase.java | 562 - .../security/ClientAuthenticationTestUtils.java | 90 - .../security/ClientAuthorizationDUnitTest.java | 647 -- .../security/ClientAuthorizationTestCase.java | 1325 .../security/ClientMultiUserAuthzDUnitTest.java | 345 .../DeltaClientAuthorizationDUnitTest.java | 201 -- .../DeltaClientPostAuthorizationDUnitTest.java | 284 --- .../security/GemFireSecurityExceptionTest.java | 169 -- .../security/IntegratedClientAuthDUnitTest.java | 64 - ...tedClientContainsKeyAuthDistributedTest.java | 55 - ...entDestroyInvalidateAuthDistributedTest.java | 84 - ...dClientDestroyRegionAuthDistributedTest.java | 65 - ...lientExecuteFunctionAuthDistributedTest.java | 61 - ...xecuteRegionFunctionAuthDistributedTest.java | 62 - ...tegratedClientGetAllAuthDistributedTest.java | 57 - ...tGetClientPRMetaDataAuthDistributedTest.java | 66 - ...ientPartitionAttrCmdAuthDistributedTest.java | 52 - ...gratedClientGetEntryAuthDistributedTest.java | 76 - ...tegratedClientGetPutAuthDistributedTest.java | 116 -- ...tedClientRegionClearAuthDistributedTest.java | 63 - ...ientRegisterInterestAuthDistributedTest.java | 164 -- ...ratedClientRemoveAllAuthDistributedTest.java | 65 - ...IntegratedClientSizeAuthDistributedTest.java | 54 - ...ntUnregisterInterestAuthDistributedTest.java | 48 - ...edSecurityCacheLifecycleDistributedTest.java | 134 -- ...edSecurityCacheLifecycleIntegrationTest.java | 74 - ...tegratedSecurityPeerAuthDistributedTest.java | 146 -- .../security/NoShowValue1PostProcessor.java | 36 - .../NoShowValue1PostProcessorDUnitTest.java | 86 - .../security/NotAuthorizedExceptionTest.java| 200 -- .../security/P2PAuthenticationDUnitTest.java| 541 - .../PDXGfshPostProcessorOnRemoteServerTest.java | 159 -- .../gemfire/security/PDXPostProcessor.java | 60 - .../security/PDXPostProcessorDUnitTest.java | 233 --- .../security/PostProcessorDUnitTest.java| 126 -- .../gemfire/security/SecurityTestUtils.java | 1930 -- .../gemfire/security/SpySecurityManager.java| 42 - .../generator/AuthzCredentialGenerator.java | 447 .../security/generator/CredentialGenerator.java | 333 --- .../DummyAuthzCredentialGenerator.java | 129 -- .../generator/DummyCredentialGenerator.java | 89 - .../generator/LdapUserCredentialGenerator.java | 165 -- .../generator/PKCSCredentialGenerator.java | 115 -- .../generator/SSLCredentialGenerator.java | 123 -- .../UserPasswordWithExtraPropsAuthInit.java | 70 - .../generator/XmlAuthzCredentialGenerator.java | 257 --- .../security/templates/DummyAuthenticator.java | 75 - .../security/templates/DummyAuthorization.java | 122 -- .../templates/FunctionSecurityPrmsHolder.java | 50 - .../templates/LdapUserAuthenticator.java| 107 - .../security/templates/PKCSAuthInit.java| 120 -- .../security/templates/PKCSAuthenticator.java | 158 -- .../security/templates/PKCSPrincipal.java | 40 - .../security/templates/PKCSPrincipalTest.java
[03/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java new file mode 100755 index 000..1a99974 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java @@ -0,0 +1,447 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.security.generator; + +import java.security.Principal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.logging.log4j.Logger; + +import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.security.AccessControl; +import com.gemstone.gemfire.security.templates.DummyAuthorization; +import com.gemstone.gemfire.security.templates.XmlAuthorization; + +/** + * Encapsulates obtaining authorized and unauthorized credentials for a given + * operation in a region. Implementations will be for different kinds of + * authorization scheme and authentication scheme combos. + * + * @since GemFire 5.5 + */ +public abstract class AuthzCredentialGenerator { + + private static final Logger logger = LogService.getLogger(); + + /** + * The {@link CredentialGenerator} being used. + */ + protected CredentialGenerator generator; + + /** + * A set of system properties that should be added to the gemfire system + * properties before using the authorization module. + */ + private Properties systemProperties; + + /** + * A factory method to create a new instance of an + * {@link AuthzCredentialGenerator} for the given {@link ClassCode}. Caller + * is supposed to invoke {@link AuthzCredentialGenerator#init} immediately + * after obtaining the instance. + * + * @param classCode + * the {@code ClassCode} of the {@code AuthzCredentialGenerator} + * implementation + * + * @return an instance of {@code AuthzCredentialGenerator} for the given + * class code + */ + public static AuthzCredentialGenerator create(final ClassCode classCode) { +switch (classCode.classType) { + case ClassCode.ID_DUMMY: +return new DummyAuthzCredentialGenerator(); + case ClassCode.ID_XML: +return new XmlAuthzCredentialGenerator(); + default: +return null; +} + } + + /** + * Initialize the authorized credential generator. + * + * @param generator + * an instance of {@link CredentialGenerator} of the credential + * implementation for which to obtain authorized/unauthorized + * credentials. + * + * @return false when the given {@link CredentialGenerator} is incompatible + * with this authorization module. + */ + public boolean init(final CredentialGenerator generator) { +this.generator = generator; +try { + this.systemProperties = init(); +} catch (IllegalArgumentException ex) { + return false; +} +return true; + } + + /** + * + * @return A set of extra properties that should be added to Gemfire system + * properties when not null. + */ + public Properties getSystemProperties() { +return this.systemProperties; + } + + /** + * Get the {@link CredentialGenerator} being used by this instance. + */ + public CredentialGenerator getCredentialGenerator() { +return this.generator; + } + + /** + * Initialize the authorized credential generator. + * + * Required to be implemented by concrete classes that implement this abstract + * class. + * + * @return A set of extra properties that should be added to Gemfire system + * properties when not null. + * + * @throws IllegalArgumentException when the {@link CredentialGenerator} is + * incompatible
[06/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java new file mode 100644 index 000..38f9988 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java @@ -0,0 +1,345 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.gemstone.gemfire.security; + +import static com.gemstone.gemfire.security.SecurityTestUtils.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; + +import java.util.Iterator; +import java.util.Properties; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.execute.Function; +import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import com.gemstone.gemfire.internal.cache.execute.PRClientServerTestBase; +import com.gemstone.gemfire.internal.cache.functions.TestFunction; +import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator; +import com.gemstone.gemfire.security.generator.CredentialGenerator; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import com.gemstone.gemfire.test.junit.categories.SecurityTest; + +@Category({ DistributedTest.class, SecurityTest.class }) +public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestCase { + + @Override + public final void preTearDownClientAuthorizationTestBase() throws Exception { +closeCache(); + } + + /** + * Tests with one user authorized to do puts/gets/containsKey/destroys and + * another not authorized for the same. + */ + @Test + public void testOps1() throws Exception { +for (Iterator iter = getDummyGeneratorCombos().iterator(); iter.hasNext();) { + AuthzCredentialGenerator gen = iter.next(); + CredentialGenerator cGen = gen.getCredentialGenerator(); + Properties extraAuthProps = cGen.getSystemProperties(); + Properties javaProps = cGen.getJavaProperties(); + Properties extraAuthzProps = gen.getSystemProperties(); + String authenticator = cGen.getAuthenticator(); + String authInit = cGen.getAuthInit(); + String accessor = gen.getAuthorizationCallback(); + + getLogWriter().info("testOps1: Using authinit: " + authInit); + getLogWriter().info("testOps1: Using authenticator: " + authenticator); + getLogWriter().info("testOps1: Using accessor: " + accessor); + + // Start servers with all required properties + Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); + + int port1 = createCacheServerOnVM(server1, javaProps, serverProps); + int port2 = createCacheServerOnVM(server2, javaProps, serverProps); + + if (!prepareClientsForOps(gen, cGen, new OperationCode[] { OperationCode.PUT, OperationCode.PUT}, new OperationCode[] { OperationCode.GET, OperationCode.GET}, javaProps, authInit, port1, port2)) { +continue; + } + + verifyPutsGets(); + + if (!prepareClientsForOps(gen, cGen, new OperationCode[] { OperationCode.PUT, OperationCode.CONTAINS_KEY}, new OperationCode[] { OperationCode.DESTROY, OperationCode.DESTROY}, javaProps, authInit, port1, port2)) { +continue; + } + + verifyContainsKeyDestroys(); + + if (!prepareClientsForOps(gen, cGen, new OperationCode[] { OperationCode.PUT, OperationCode.CONTAINS_KEY}, new OperationCode[] { OperationCode.INVALIDATE, OperationCode.INVALIDATE}, javaProps, authInit, port1, port2)) { +continue; + } + + verifyContainsKeyInvalidates(); + + if (!prepareClientsForOps(gen, cGen, new OperationCode[] { OperationCode.GET, OperationCode.GET}, new OperationCode[] { OperationCode.REGION_DESTROY,
[05/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegionClearAuthDistributedTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegionClearAuthDistributedTest.java b/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegionClearAuthDistributedTest.java new file mode 100644 index 000..3c5a2ef --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegionClearAuthDistributedTest.java @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.security; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ClientCache; +import com.gemstone.gemfire.cache.client.ClientCacheFactory; +import com.gemstone.gemfire.cache.client.ClientRegionShortcut; +import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import com.gemstone.gemfire.test.junit.categories.SecurityTest; + +@Category({ DistributedTest.class, SecurityTest.class }) +public class IntegratedClientRegionClearAuthDistributedTest extends AbstractSecureServerDUnitTest { + + @Test + public void testRegionClear() throws InterruptedException { +// Verify that an unauthorized user can't clear the region +SerializableRunnable clearUnauthorized = new SerializableRunnable() { + @Override + public void run() { +ClientCache cache = new ClientCacheFactory(createClientProperties("stranger", "1234567")).setPoolSubscriptionEnabled(true) + .addPoolServer("localhost", serverPort) + .create(); + +Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME); +assertNotAuthorized(() -> region.clear(), "DATA:WRITE:AuthRegion"); + } +}; +client1.invoke(clearUnauthorized); + +// Verify that an authorized user can clear the region +SerializableRunnable clearAuthorized = new SerializableRunnable() { + @Override + public void run() { +ClientCache cache = new ClientCacheFactory(createClientProperties("authRegionUser", "1234567")).setPoolSubscriptionEnabled(true) + .addPoolServer("localhost", serverPort) + .create(); + +Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME); +region.clear(); + } +}; +client2.invoke(clearAuthorized); + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegisterInterestAuthDistributedTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegisterInterestAuthDistributedTest.java b/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegisterInterestAuthDistributedTest.java new file mode 100644 index 000..8e67ead --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/IntegratedClientRegisterInterestAuthDistributedTest.java @@ -0,0 +1,164 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + *
[01/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-37_2 7c20e6931 -> 9d7a6960a http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/resources/org/apache/geode/security/generator/authz-dummy.xml -- diff --git a/geode-core/src/test/resources/org/apache/geode/security/generator/authz-dummy.xml b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-dummy.xml new file mode 100644 index 000..de0cd17 --- /dev/null +++ b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-dummy.xml @@ -0,0 +1,124 @@ + + + + + + + + +reader0 +reader1 +reader2 +root +admin +administrator + + + +writer0 +writer1 +writer2 +root +admin +administrator + + + +root +admin +administrator + + + +reader3 +reader4 + + + +reader5 +reader6 + + + +reader5 +reader7 + + + +reader8 + + + +reader9 + + + +QUERY +EXECUTE_CQ +STOP_CQ +CLOSE_CQ +REGION_CREATE +REGION_DESTROY + + + +GET +REGISTER_INTEREST +UNREGISTER_INTEREST +KEY_SET +CONTAINS_KEY +EXECUTE_FUNCTION + + + +PUT +PUTALL +DESTROY +INVALIDATE +REGION_CLEAR + + + +QUERY +EXECUTE_CQ +STOP_CQ +CLOSE_CQ + + + +PUT +EXECUTE_FUNCTION + + + +PUT +EXECUTE_FUNCTION + + + +REGISTER_INTEREST +GET + + + +UNREGISTER_INTEREST +GET + + + http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/resources/org/apache/geode/security/generator/authz-ldap.xml -- diff --git a/geode-core/src/test/resources/org/apache/geode/security/generator/authz-ldap.xml b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-ldap.xml new file mode 100644 index 000..cdfd478 --- /dev/null +++ b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-ldap.xml @@ -0,0 +1,83 @@ + + + + + + + + +gemfire1 +gemfire2 +gemfire3 +gemfire4 +gemfire5 + + + +gemfire1 +gemfire2 +gemfire6 +gemfire7 +gemfire8 + + + +gemfire1 +gemfire2 + + + +gemfire9 +gemfire10 + + + +QUERY +EXECUTE_CQ +STOP_CQ +CLOSE_CQ +REGION_CREATE +REGION_DESTROY + + + +GET +REGISTER_INTEREST +UNREGISTER_INTEREST +KEY_SET +CONTAINS_KEY +EXECUTE_FUNCTION + + + +PUT +PUTALL +DESTROY +INVALIDATE +REGION_CLEAR + + + +QUERY +EXECUTE_CQ +STOP_CQ +CLOSE_CQ + + + http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-dummy.xml -- diff --git a/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-dummy.xml b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-dummy.xml new file mode 100644 index 000..f64eb2e --- /dev/null +++ b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-dummy.xml @@ -0,0 +1,104 @@ + + + + + + + + +user1 +user2 +root +admin +administrator + + + +user3 +user4 +root +admin +administrator + + + +user1 +user2 +root +admin +administrator + + + +user5 +user6 + + + +user7 +user8 + + + +user5 +user7 + + + +QUERY +EXECUTE_CQ +STOP_CQ +CLOSE_CQ + + + +GET +REGISTER_INTEREST +UNREGISTER_INTEREST +KEY_SET +CONTAINS_KEY +EXECUTE_FUNCTION + + + +PUT +PUTALL +DESTROY +INVALIDATE +REGION_CLEAR + + + +QUERY +EXECUTE_CQ +STOP_CQ +CLOSE_CQ + + + +REGISTER_INTEREST +GET + + + +UNREGISTER_INTEREST +GET + + + http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-ldap.xml -- diff --git a/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-ldap.xml b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-ldap.xml new file mode 100644 index 000..5469972 --- /dev/null +++ b/geode-core/src/test/resources/org/apache/geode/security/generator/authz-multiUser-ldap.xml @@ -0,0 +1,81 @@ + + + + + + + + +gemfire1 +gemfire2 +gemfire3 +gemfire4 +gemfire5 + + + +gemfire1 +gemfire2 +gemfire6 +gemfire7 +gemfire8 + + + +gemfire1 +gemfire2 + + + +gemfire9 +
[12/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/GemFireSecurityExceptionTest.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/GemFireSecurityExceptionTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/GemFireSecurityExceptionTest.java deleted file mode 100644 index 5aa01ff..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/GemFireSecurityExceptionTest.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.security; - -import static com.googlecode.catchexception.CatchException.*; -import static org.assertj.core.api.Assertions.*; - -import java.io.NotSerializableException; -import java.io.Serializable; -import javax.naming.NamingException; - -import org.apache.commons.lang.SerializationUtils; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TestName; - -import com.gemstone.gemfire.test.junit.categories.SecurityTest; -import com.gemstone.gemfire.test.junit.categories.UnitTest; - -/** - * Unit tests for {@link GemFireSecurityException}. - */ -@Category({ UnitTest.class, SecurityTest.class }) -public class GemFireSecurityExceptionTest { - - private String message; - private String causeMessage; - private Object nonSerializableResolvedObj; - private NamingException nonSerializableNamingException; - private SerializableObject serializableResolvedObj; - private NamingException serializableNamingException; - - @Rule - public TestName testName = new TestName(); - - @Before - public void setUp() throws Exception { -this.message = testName.getMethodName() + " message"; -this.causeMessage = testName.getMethodName() + " cause message"; - -this.nonSerializableResolvedObj = new Object(); -this.nonSerializableNamingException = new NamingException(this.causeMessage); - this.nonSerializableNamingException.setResolvedObj(this.nonSerializableResolvedObj); - -this.serializableResolvedObj = new SerializableObject(this.testName.getMethodName()); -this.serializableNamingException = new NamingException(this.causeMessage); - this.serializableNamingException.setResolvedObj(this.serializableResolvedObj); - -assertPreConditions(); - } - - private void assertPreConditions() { -catchException(this).clone(this.nonSerializableNamingException); -assertThat((Throwable)caughtException()).isNotNull(); - assertThat((Throwable)caughtException().getCause()).isInstanceOf(NotSerializableException.class); - -catchException(this).clone(this.serializableNamingException); -assertThat((Throwable)caughtException()).isNull(); - - assertThat(this.nonSerializableResolvedObj).isNotInstanceOf(Serializable.class); - -catchException(this).clone(this.serializableResolvedObj); -assertThat((Throwable)caughtException()).isNull(); - } - - @Test - public void isSerializable() throws Exception { - assertThat(GemFireSecurityException.class).isInstanceOf(Serializable.class); - } - - @Test - public void serializes() throws Exception { -GemFireSecurityException instance = new GemFireSecurityException(this.message); - -GemFireSecurityException cloned = (GemFireSecurityException) SerializationUtils.clone(instance); - -assertThat(cloned).hasMessage(this.message); - } - - @Test - public void serializesWithThrowable() throws Exception { -Throwable cause = new Exception(this.causeMessage); -GemFireSecurityException instance = new GemFireSecurityException(this.message, cause); - -GemFireSecurityException cloned = (GemFireSecurityException) SerializationUtils.clone(instance); - -assertThat(cloned).hasMessage(this.message).hasCause(cause); -assertThat(cloned.getCause()).hasMessage(this.causeMessage); - } - - @Test - public void serializesWithNonSerializableNamingException() throws Exception { -GemFireSecurityException instance = new GemFireSecurityException(this.message, this.nonSerializableNamingException); - -
[10/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java deleted file mode 100644 index 3a469ec..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java +++ /dev/null @@ -1,1930 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You 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. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.gemstone.gemfire.security; - -import static com.gemstone.gemfire.cache30.ClientServerTestCase.*; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; -import static com.gemstone.gemfire.internal.AvailablePort.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.NetworkUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.Callable; - -import javax.net.ServerSocketFactory; -import javax.net.SocketFactory; -import javax.net.ssl.KeyManager; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLContextSpi; -import javax.net.ssl.SSLServerSocketFactory; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DynamicRegionFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.NoAvailableServersException; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.ServerConnectivityException; -import com.gemstone.gemfire.cache.client.ServerOperationException; -import com.gemstone.gemfire.cache.client.ServerRefusedConnectionException; -import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.client.internal.ProxyCache; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.pdx.PdxReader; -import com.gemstone.gemfire.pdx.PdxSerializable; -import com.gemstone.gemfire.pdx.PdxWriter; -import com.gemstone.gemfire.test.dunit.WaitCriterion; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; - -/** - * Contains utility methods for setting up servers/clients for authentication - * and authorization tests. - * - * @since GemFire 5.5 - * - * @deprecated in favor of just writing a test without this class - */ -@Deprecated -public final class SecurityTestUtils { - - private final JUnit4DistributedTestCase distributedTestCase = new JUnit4DistributedTestCase() {}; - - protected static final int NO_EXCEPTION = 0; - protected static
[08/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java deleted file mode 100644 index 7fbb454..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipalTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.security.templates; - -import static org.assertj.core.api.Assertions.*; - -import java.io.Serializable; - -import org.apache.commons.lang.SerializationUtils; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.test.junit.categories.SecurityTest; -import com.gemstone.gemfire.test.junit.categories.UnitTest; - -/** - * Unit tests for {@link UsernamePrincipal} - */ -@Category({ UnitTest.class, SecurityTest.class }) -public class UsernamePrincipalTest { - - @Test - public void isSerializable() throws Exception { -assertThat(UsernamePrincipal.class).isInstanceOf(Serializable.class); - } - - @Test - public void canBeSerialized() throws Exception { -String name = "jsmith"; -UsernamePrincipal instance = new UsernamePrincipal(name); - -UsernamePrincipal cloned = (UsernamePrincipal) SerializationUtils.clone(instance); - -assertThat(cloned.getName()).isEqualTo(name); - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java deleted file mode 100755 index 4349260..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java +++ /dev/null @@ -1,615 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.security.templates; - -import java.io.IOException; -import java.io.InputStream; -import java.security.Principal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; - -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.operations.ExecuteFunctionOperationContext; -import com.gemstone.gemfire.cache.operations.OperationContext; -import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; -import com.gemstone.gemfire.cache.operations.QueryOperationContext; -import com.gemstone.gemfire.distributed.DistributedMember; -import
[07/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java new file mode 100644 index 000..79feae9 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationDUnitTest.java @@ -0,0 +1,647 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.gemstone.gemfire.security; + +import static com.gemstone.gemfire.internal.AvailablePort.*; +import static com.gemstone.gemfire.security.SecurityTestUtils.*; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.IgnoredException.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + +import com.gemstone.gemfire.internal.AvailablePortHelper; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; +import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator; +import com.gemstone.gemfire.security.generator.CredentialGenerator; +import com.gemstone.gemfire.security.generator.DummyCredentialGenerator; +import com.gemstone.gemfire.security.generator.XmlAuthzCredentialGenerator; +import com.gemstone.gemfire.security.templates.UserPasswordAuthInit; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import com.gemstone.gemfire.test.junit.categories.SecurityTest; + +/** + * Tests for authorization from client to server. This tests for authorization + * of all operations with both valid and invalid credentials/modules with + * pre-operation callbacks. It also checks for authorization in case of + * failover. + * + * @since GemFire 5.5 + */ +@Category({ DistributedTest.class, SecurityTest.class }) +public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestCase { + + @Override + public final void preTearDownClientAuthorizationTestBase() throws Exception { +closeCache(); + } + + @Test + public void testAllowPutsGets() { +AuthzCredentialGenerator gen = getXmlAuthzGenerator(); +CredentialGenerator cGen = gen.getCredentialGenerator(); +Properties extraAuthProps = cGen.getSystemProperties(); +Properties javaProps = cGen.getJavaProperties(); +Properties extraAuthzProps = gen.getSystemProperties(); +String authenticator = cGen.getAuthenticator(); +String authInit = cGen.getAuthInit(); +String accessor = gen.getAuthorizationCallback(); + +getLogWriter().info("testAllowPutsGets: Using authinit: " + authInit); +getLogWriter().info("testAllowPutsGets: Using authenticator: " + authenticator); +getLogWriter().info("testAllowPutsGets: Using accessor: " + accessor); + +// Start servers with all required properties +Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); + +int port1 = createServer1(javaProps, serverProps); +int port2 = createServer2(javaProps, serverProps); + +// Start client1 with valid CREATE credentials +Properties createCredentials = gen.getAllowedCredentials(new OperationCode[] { OperationCode.PUT }, new String[] { regionName }, 1); +javaProps = cGen.getJavaProperties(); + +getLogWriter().info("testAllowPutsGets: For first client credentials: " + createCredentials); + +createClient1NoException(javaProps, authInit, port1, port2, createCredentials); + +// Start client2 with valid GET credentials +Properties getCredentials = gen.getAllowedCredentials(new OperationCode[] { OperationCode.GET }, new String[] { regionName }, 2); +javaProps = cGen.getJavaProperties(); + +getLogWriter().info("testAllowPutsGets: For second client credentials: " + getCredentials); + +createClient2NoException(javaProps,
[04/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java new file mode 100644 index 000..1e87952 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java @@ -0,0 +1,233 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.gemstone.gemfire.security; + +import static org.junit.Assert.*; + +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.concurrent.TimeUnit; + +import com.jayway.awaitility.Awaitility; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import com.gemstone.gemfire.cache.EntryEvent; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.ClientCache; +import com.gemstone.gemfire.cache.client.ClientCacheFactory; +import com.gemstone.gemfire.cache.client.ClientRegionFactory; +import com.gemstone.gemfire.cache.client.ClientRegionShortcut; +import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import com.gemstone.gemfire.internal.AvailablePortHelper; +import com.gemstone.gemfire.internal.cache.EntryEventImpl; +import com.gemstone.gemfire.internal.security.SecurityService; +import com.gemstone.gemfire.management.cli.Result.Status; +import com.gemstone.gemfire.management.internal.cli.CliUtil; +import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh; +import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; +import com.gemstone.gemfire.management.internal.cli.result.CommandResult; +import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; +import com.gemstone.gemfire.pdx.SimpleClass; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import com.gemstone.gemfire.test.junit.categories.SecurityTest; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; + +@Category({ DistributedTest.class, SecurityTest.class }) +@RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) +public class PDXPostProcessorDUnitTest extends AbstractSecureServerDUnitTest { + private static byte[] BYTES = PDXPostProcessor.BYTES; + + @Parameterized.Parameters + public static Collection
[09/15] incubator-geode git commit: GEODE-37 Renamed security related stuff
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d7a6960/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java -- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java deleted file mode 100755 index 90584cd..000 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java +++ /dev/null @@ -1,333 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.security.generator; - -import java.security.Principal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.security.AuthInitialize; -import com.gemstone.gemfire.security.Authenticator; -import com.gemstone.gemfire.security.templates.DummyAuthenticator; -import com.gemstone.gemfire.security.templates.LdapUserAuthenticator; -import com.gemstone.gemfire.security.templates.PKCSAuthenticator; - -/** - * Encapsulates obtaining valid and invalid credentials. Implementations will be - * for different kinds of authentication schemes. - * - * @since GemFire 5.5 - */ -public abstract class CredentialGenerator { - - private static final Logger logger = LogService.getLogger(); - - /** - * A set of properties that should be added to the Gemfire system properties - * before using the authentication module. - */ - private Properties systemProperties = null; - - /** - * A set of properties that should be added to the java system properties - * before using the authentication module. - */ - protected Properties javaProperties = null; - - /** - * A factory method to create a new instance of an {@link CredentialGenerator} - * for the given {@link ClassCode}. Caller is supposed to invoke - * {@link CredentialGenerator#init} immediately after obtaining the instance. - * - * @param classCode - * the {@code ClassCode} of the {@code CredentialGenerator} - * implementation - * - * @return an instance of {@code CredentialGenerator} for the given class - * code - */ - public static CredentialGenerator create(final ClassCode classCode) { -switch (classCode.classType) { - // Removing dummy one to reduce test run times - // case ClassCode.ID_DUMMY: - // return new DummyCredentialGenerator(); - case ClassCode.ID_LDAP: -return new LdapUserCredentialGenerator(); -// case ClassCode.ID_SSL:ø -// return new SSLCredentialGenerator(); - case ClassCode.ID_PKCS: -return new PKCSCredentialGenerator(); - default: -return null; -} - } - - /** - * Initialize the credential generator. - * - * @throws IllegalArgumentException when there is a problem during - * initialization - */ - public void init() throws IllegalArgumentException { -this.systemProperties = initialize(); -logger.info("Generating CredentialGenerator with {}", this.systemProperties); - } - - /** - * @return A set of extra properties that should be added to Gemfire system - * properties when not null. - */ - public Properties getSystemProperties() { -return this.systemProperties; - } - - /** - * @return A set of extra properties that should be added to Gemfire system - * properties when not null. - */ - public Properties getJavaProperties() { -return this.javaProperties; - } - - /** - * The {@link ClassCode} of this particular implementation. - * - * @return the {@code ClassCode} - */ - public abstract ClassCode classCode(); - - /** - * The name of the {@link AuthInitialize} factory function that should be used - * in conjunction with the credentials generated by this generator. - * - * @return name of the {@code AuthInitialize} factory function - */ - public abstract String
[19/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java new file mode 100644 index 000..6727f1b --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java @@ -0,0 +1,3765 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan; + +import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.junit.Assert.*; + +import java.io.File; +import java.io.IOException; +import java.io.Serializable; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +import com.jayway.awaitility.Awaitility; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.AttributesFactory; +import com.gemstone.gemfire.cache.AttributesMutator; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.CacheClosedException; +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.CacheListener; +import com.gemstone.gemfire.cache.CacheTransactionManager; +import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.DiskStore; +import com.gemstone.gemfire.cache.DiskStoreFactory; +import com.gemstone.gemfire.cache.EntryEvent; +import com.gemstone.gemfire.cache.PartitionAttributesFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.RegionDestroyedException; +import com.gemstone.gemfire.cache.RegionFactory; +import com.gemstone.gemfire.cache.Scope; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; +import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; +import com.gemstone.gemfire.cache.client.Pool; +import com.gemstone.gemfire.cache.client.PoolManager; +import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter; +import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; +import com.gemstone.gemfire.cache.persistence.PartitionOfflineException; +import com.gemstone.gemfire.cache.server.CacheServer; +import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import com.gemstone.gemfire.cache.wan.GatewayEventFilter; +import com.gemstone.gemfire.cache.wan.GatewayQueueEvent; +import com.gemstone.gemfire.cache.wan.GatewayReceiver; +import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; +import com.gemstone.gemfire.cache.wan.GatewaySender; +import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; +import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; +import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; +import com.gemstone.gemfire.cache30.CacheTestCase; +import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; +import com.gemstone.gemfire.distributed.internal.InternalLocator; +import com.gemstone.gemfire.distributed.internal.ServerLocation; +import
[18/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java new file mode 100644 index 000..19edd7d --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java @@ -0,0 +1,737 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.concurrent; + +import com.jayway.awaitility.Awaitility; +import org.junit.experimental.categories.Category; +import org.junit.Test; + +import static org.junit.Assert.*; + +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import com.gemstone.gemfire.cache.EntryExistsException; +import com.gemstone.gemfire.cache.client.ServerOperationException; +import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; +import com.gemstone.gemfire.cache.wan.GatewaySender; +import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; +import com.gemstone.gemfire.internal.cache.wan.BatchException70; +import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor; +import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.Wait; + +import java.net.SocketException; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * Test the functionality of ParallelGatewaySender with multiple dispatchers. + * + */ +@Category(DistributedTest.class) +public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { + + public ConcurrentParallelGatewaySenderDUnitTest() { +super(); + } + + /** + * Normal happy scenario test case. + * checks that all the dispatchers have successfully + * dispatched something individually. + * + * @throws Exception + */ + @Test + public void testParallelPropagationConcurrentArtifacts() throws Exception { +Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); +Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + +createCacheInVMs(nyPort, vm2, vm3); +createReceiverInVMs(vm2, vm3); + +createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); + +vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, +true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); +vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, +true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); +vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, +true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); +vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, +true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); + +vm4.invoke(() -> WANTestBase.createPartitionedRegion( +getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); +vm5.invoke(() -> WANTestBase.createPartitionedRegion( +getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); +vm6.invoke(() -> WANTestBase.createPartitionedRegion( +getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); +vm7.invoke(() -> WANTestBase.createPartitionedRegion( +getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); + +startSenderInVMs("ln", vm4, vm5, vm6, vm7); + +vm2.invoke(() -> WANTestBase.createPartitionedRegion( +getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); +
[35/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java deleted file mode 100644 index 17c76ed..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java +++ /dev/null @@ -1,767 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.misc; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.Wait; - -@Category(DistributedTest.class) -public class PDXNewWanDUnitTest extends WANTestBase{ - - private static final long serialVersionUID = 1L; - - public PDXNewWanDUnitTest() { -super(); - } - - /** - * Test - * 1> Site 1 : 1 locator, 1 member - * 2> Site 2 : 1 locator, 1 member - * 3> DR is defined on member 1 on site1 - * 4> Serial GatewaySender is defined on member 1 on site1 - * 5> Same DR is defined on site2 member 1 - * 6> Put is done with value which is PDXSerializable - * 7> Validate whether other sites member receive this put operation. - */ - @Test - public void testWANPDX_RR_SerialSender() { -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); -createCacheInVMs(nyPort, vm2); -vm2.invoke(() -> WANTestBase.createReceiver()); - -createCacheInVMs(lnPort, vm3); - -vm3.invoke(() -> WANTestBase.createSender( "ln", 2, -false, 100, 10, false, false, null, true )); - -vm2.invoke(() -> WANTestBase.createReplicatedRegion( -getTestMethodName() + "_RR", null, isOffHeap() )); - -vm3.invoke(() -> WANTestBase.startSender( "ln" )); - -vm3.invoke(() -> WANTestBase.createReplicatedRegion( -getTestMethodName() + "_RR", "ln", isOffHeap() )); - -vm3.invoke(() -> WANTestBase.doPutsPDXSerializable( getTestMethodName() + "_RR", -1 )); - -vm2.invoke(() -> WANTestBase.validateRegionSize_PDX( -getTestMethodName() + "_RR", 1 )); - } - - /** - * Test - * 1> Site 1 : 1 locator, 1 member - * 2> Site 2 : 1 locator, 1 member - * 3> DR is defined on member 1 on site1 - * 4> Serial GatewaySender is defined on member 1 on site1 - * 5> Same DR is defined on site2 member 1 - * 6> Put is done with value which is PDXSerializable - * 7> Validate whether other sites member receive this put operation. - * 8> Bounce site 1 and delete all of it's data - * 9> Make sure that site 1 get the the PDX types along with entries - * and can deserialize entries. - */ - @Test - public void testWANPDX_RemoveRemoteData() { -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -vm2.invoke(() -> WANTestBase.createReceiver_PDX( nyPort )); - -vm3.invoke(() -> WANTestBase.createCache_PDX( lnPort )); - -vm3.invoke(() -> WANTestBase.createSender( "ln", 2, -false, 100, 10, false, false, null, true )); - -vm2.invoke(() -> WANTestBase.createReplicatedRegion( -getTestMethodName() + "_RR", null, isOffHeap() )); - -vm3.invoke(() -> WANTestBase.startSender( "ln" )); - -vm3.invoke(() -> WANTestBase.createReplicatedRegion( -getTestMethodName() + "_RR", "ln", isOffHeap() )); -
[30/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java deleted file mode 100644 index 359a56d..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java +++ /dev/null @@ -1,1593 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.parallel; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import java.io.IOException; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.internal.cache.ColocationHelper; -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; - -@Category(DistributedTest.class) -public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase { - - private static final long serialVersionUID = 1L; - - public ParallelWANPersistenceEnabledGatewaySenderDUnitTest() { -super(); - } - - @Override - protected final void postSetUpWANTestBase() throws Exception { -//The restart tests log this string -IgnoredException.addIgnoredException("failed accepting client connection"); - } - - @Test - public void testPartitionedRegionWithGatewaySenderPersistenceEnabled() throws IOException { -try { - Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); - Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - createCache(lnPort); - GatewaySenderFactory fact = cache.createGatewaySenderFactory(); - fact.setPersistenceEnabled(true); - fact.setParallel(true); - final IgnoredException ex = IgnoredException.addIgnoredException("Could not connect"); - try { -GatewaySender sender1 = fact.create("NYSender", 2); - -AttributesFactory rFact = new AttributesFactory(); -rFact.addGatewaySenderId(sender1.getId()); - -PartitionAttributesFactory pFact = new PartitionAttributesFactory(); -pFact.setTotalNumBuckets(100); -pFact.setRedundantCopies(1); -rFact.setPartitionAttributes(pFact.create()); -Region r = cache.createRegionFactory(rFact.create()).create("MyRegion"); -sender1.start(); - } finally { -ex.remove(); - } - -} -catch (Exception e) { - fail("Unexpected Exception :" + e); -} - } - - /** - * Enable persistence for region as well as GatewaySender and see if remote - * site receives all the events. - */ - @Test - public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled() { -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -createCacheInVMs(nyPort, vm2, vm3); -createReceiverInVMs(vm2, vm3); - -createCacheInVMs(lnPort, vm4, vm5, vm6,
[31/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java deleted file mode 100644 index 5e32bb6..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.offheap; - -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPersistenceEnabledGatewaySenderDUnitTest; - -@SuppressWarnings("serial") -@Category(DistributedTest.class) -public class SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest extends -SerialWANPersistenceEnabledGatewaySenderDUnitTest { - - public SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest() { -super(); - } - - @Override - public boolean isOffHeap() { -return true; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java deleted file mode 100644 index d6cecd1..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.offheap; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPropagationDUnitTest; - -@SuppressWarnings("serial") -@Category(DistributedTest.class) -public class SerialWANPropagationOffHeapDUnitTest extends SerialWANPropagationDUnitTest { - - public SerialWANPropagationOffHeapDUnitTest() { -super(); - } - - @Override - public boolean isOffHeap() { -return true; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
[36/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java deleted file mode 100644 index 9c6cbdd..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java +++ /dev/null @@ -1,460 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.misc; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.internal.cache.BucketRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.RegionQueue; -import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.Wait; -import com.gemstone.gemfire.test.dunit.WaitCriterion; - -import java.util.Set; - -/** - * - */ -@Category(DistributedTest.class) -public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { - - @Test - public void testSameSenderWithNonColocatedRegions() throws Exception { -IgnoredException.addIgnoredException("cannot have the same parallel"); -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -vm4.invoke(() -> WANTestBase.createCache( lnPort )); -vm4.invoke(() -> WANTestBase.createSender( "ln", 2, -true, 100, 10, false, false, null, true )); -vm4.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR1", "ln", 1, 100, isOffHeap() )); -try { - vm4.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR2", "ln", 1, 100, isOffHeap() )); - fail("Expected IllegalStateException : cannot have the same parallel gateway sender"); -} -catch (Exception e) { - if (!(e.getCause() instanceof IllegalStateException) - || !(e.getCause().getMessage() - .contains("cannot have the same parallel gateway sender id"))) { -Assert.fail("Expected IllegalStateException", e); - } -} - } - - /** - * Simple scenario. Two regions attach the same PGS - * @throws Exception - * Below test is disabled intentionally -1> In this release 8.0, for rolling upgrade support queue name is changed to old style -2>Common parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about - ParallelGatewaySenderQueue#convertPathToName -3> We have to enabled it in next release -4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 - and version prior to 8.0 - */ - @Test - @Ignore("TODO") - public void testParallelPropagation() throws Exception { -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -createCacheInVMs(nyPort, vm2, vm3); -createReceiverInVMs(vm2, vm3); - -createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); - -vm4.invoke(() ->
[39/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java deleted file mode 100644 index 6727f1b..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java +++ /dev/null @@ -1,3765 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan; - -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; - -import java.io.File; -import java.io.IOException; -import java.io.Serializable; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -import com.jayway.awaitility.Awaitility; -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; -import com.gemstone.gemfire.cache.persistence.PartitionOfflineException; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -import com.gemstone.gemfire.cache.wan.GatewayQueueEvent; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; -import com.gemstone.gemfire.cache30.CacheTestCase; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import
[38/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java deleted file mode 100644 index 19edd7d..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java +++ /dev/null @@ -1,737 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.concurrent; - -import com.jayway.awaitility.Awaitility; -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import com.gemstone.gemfire.cache.EntryExistsException; -import com.gemstone.gemfire.cache.client.ServerOperationException; -import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; -import com.gemstone.gemfire.internal.cache.wan.BatchException70; -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.Wait; - -import java.net.SocketException; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -/** - * Test the functionality of ParallelGatewaySender with multiple dispatchers. - * - */ -@Category(DistributedTest.class) -public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { - - public ConcurrentParallelGatewaySenderDUnitTest() { -super(); - } - - /** - * Normal happy scenario test case. - * checks that all the dispatchers have successfully - * dispatched something individually. - * - * @throws Exception - */ - @Test - public void testParallelPropagationConcurrentArtifacts() throws Exception { -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -createCacheInVMs(nyPort, vm2, vm3); -createReceiverInVMs(vm2, vm3); - -createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); - -vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, -true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); -vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, -true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); -vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, -true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); -vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2, -true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION )); - -vm4.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); -vm5.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); -vm6.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); -vm7.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); - -startSenderInVMs("ln", vm4, vm5, vm6, vm7); - -vm2.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", null, 1, 100,
[58/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/main/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/701c6861/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java -- diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java new file mode 100644 index 000..163a611 --- /dev/null +++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java @@ -0,0 +1,166 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan; + +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.client.PoolManager; +import com.gemstone.gemfire.cache.client.internal.PoolImpl; +import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorRequest; +import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorResponse; +import com.gemstone.gemfire.cache.wan.GatewayReceiver; +import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer; +import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; +import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; +import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.net.ConnectException; +import java.util.Iterator; +import java.util.StringTokenizer; + +public abstract class AbstractRemoteGatewaySender extends AbstractGatewaySender { + private static final Logger logger = LogService.getLogger(); + + public AbstractRemoteGatewaySender() { + + } + public AbstractRemoteGatewaySender(Cache cache, GatewaySenderAttributes attrs){ +super(cache, attrs); + } + + /** used to reduce warning logs in case remote locator is down (#47634) */ + protected int proxyFailureTries = 0; + + public synchronized void initProxy() { +// return if it is being used for WBCL or proxy is already created +if (this.remoteDSId == DEFAULT_DISTRIBUTED_SYSTEM_ID || this.proxy != null +&& !this.proxy.isDestroyed()) { + return; +} + +int locatorCount = 0; +PoolFactoryImpl pf = (PoolFactoryImpl) PoolManager.createFactory(); +pf.setPRSingleHopEnabled(false); +if (this.locatorDiscoveryCallback != null) { + pf.setLocatorDiscoveryCallback(locatorDiscoveryCallback); +} +pf.setReadTimeout(this.socketReadTimeout); +pf.setIdleTimeout(connectionIdleTimeOut); +pf.setSocketBufferSize(socketBufferSize); +pf.setServerGroup(GatewayReceiver.RECEIVER_GROUP); +RemoteLocatorRequest request = new RemoteLocatorRequest(this.remoteDSId, pf +.getPoolAttributes().getServerGroup()); +String locators = ((GemFireCacheImpl) this.cache).getDistributedSystem() +.getConfig().getLocators(); +if (logger.isDebugEnabled()) { + logger.debug("Gateway Sender is attempting to configure pool with remote locator information"); +} +StringTokenizer locatorsOnThisVM = new StringTokenizer(locators, ","); +while (locatorsOnThisVM.hasMoreTokens()) { + String localLocator = locatorsOnThisVM.nextToken(); + DistributionLocatorId locatorID = new DistributionLocatorId(localLocator); + try { +RemoteLocatorResponse response = (RemoteLocatorResponse) new TcpClient() +.requestToServer(locatorID.getHost(), locatorID.getPort(), request, +WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT); + +if (response != null) { + if (response.getLocators() == null) { +if (logProxyFailure()) { + logger.warn(LocalizedMessage.create( + LocalizedStrings.AbstractGatewaySender_REMOTE_LOCATOR_FOR_REMOTE_SITE_0_IS_NOT_AVAILABLE_IN_LOCAL_LOCATOR_1, + new Object[] { remoteDSId,
[06/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java new file mode 100644 index 000..0cb60be --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java @@ -0,0 +1,1336 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.serial; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.util.Map; + +import org.junit.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.CacheException; +import com.gemstone.gemfire.cache.EntryExistsException; +import com.gemstone.gemfire.cache.client.ServerOperationException; +import com.gemstone.gemfire.cache30.CacheSerializableRunnable; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.wan.BatchException70; +import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; +import com.gemstone.gemfire.test.dunit.Wait; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import com.gemstone.gemfire.test.junit.categories.FlakyTest; + +@Category(DistributedTest.class) +public class SerialWANPropagationDUnitTest extends WANTestBase { + + @Override + public final void postSetUpWANTestBase() throws Exception { +IgnoredException.addIgnoredException("Connection reset"); +IgnoredException.addIgnoredException("Broken pipe"); +IgnoredException.addIgnoredException("Connection refused"); +IgnoredException.addIgnoredException("could not get remote locator information"); +IgnoredException.addIgnoredException("Unexpected IOException"); + } + + /** + * this test is disabled due to a high rate of failure in unit test runs + * see ticket #52190 + */ + @Ignore("TODO: test is disabled because of #52190") + @Test + public void testReplicatedSerialPropagation_withoutRemoteLocator() throws Exception { +Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + +createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); + +//keep the batch size high enough to reduce the number of exceptions in the log +vm4.invoke(() -> WANTestBase.createSender( "ln", 2, +false, 100, 400, false, false, null, true )); +vm5.invoke(() -> WANTestBase.createSender( "ln", 2, +false, 100, 400, false, false, null, true )); + +startSenderInVMs("ln", vm4, vm5); + +vm4.invoke(createReplicatedRegionRunnable()); +vm5.invoke(createReplicatedRegionRunnable()); +vm6.invoke(createReplicatedRegionRunnable()); +vm7.invoke(createReplicatedRegionRunnable()); + +vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_RR", + 1000 )); + +Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + +createCacheInVMs(nyPort, vm2, vm3); + +vm2.invoke(() -> WANTestBase.createReceiver()); +vm3.invoke(() -> WANTestBase.createReceiver()); + +vm2.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", null, isOffHeap() )); +vm3.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", null, isOffHeap() )); + +vm4.invoke(() -> WANTestBase.validateRegionSize( +getTestMethodName() + "_RR", 1000 )); + +vm2.invoke(() -> WANTestBase.validateRegionSize( +getTestMethodName() + "_RR", 1000 )); +vm3.invoke(() -> WANTestBase.validateRegionSize( +getTestMethodName() + "_RR", 1000 )); + } + + protected
[08/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java new file mode 100644 index 000..b754254 --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java @@ -0,0 +1,499 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.parallel; + +import org.junit.Ignore; +import org.junit.experimental.categories.Category; +import org.junit.Test; + +import static org.junit.Assert.*; + +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import static com.gemstone.gemfire.test.dunit.Wait.*; +import static com.gemstone.gemfire.test.dunit.IgnoredException.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.junit.categories.FlakyTest; + +@Category(DistributedTest.class) +public class ParallelWANStatsDUnitTest extends WANTestBase{ + + private static final int NUM_PUTS = 100; + private static final long serialVersionUID = 1L; + + private String testName; + + public ParallelWANStatsDUnitTest() { +super(); + } + + @Override + protected final void postSetUpWANTestBase() throws Exception { +this.testName = getTestMethodName(); + } + + @Test + public void testPartitionedRegionParallelPropagation_BeforeDispatch() throws Exception { +Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); +Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + +createCacheInVMs(nyPort, vm2, vm3); +createReceiverInVMs(vm2, vm3); + +createSendersWithConflation(lnPort); + +createSenderPRs(0); + +startPausedSenders(); + +createReceiverPR(vm2, 1); +createReceiverPR(vm3, 1); + +putKeyValues(); + +ArrayList v4List = (ArrayList)vm4.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS )); +ArrayList v5List = (ArrayList)vm5.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS )); +ArrayList v6List = (ArrayList)vm6.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS )); +ArrayList v7List = (ArrayList)vm7.invoke(() -> WANTestBase.getSenderStats( "ln", NUM_PUTS )); + +assertEquals(NUM_PUTS, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size +assertEquals(NUM_PUTS, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived +assertEquals(NUM_PUTS, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued +assertEquals(0, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed +assertEquals(0, v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)); //batches distributed +assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed + + } + + @Test + public void testPartitionedRegionParallelPropagation_AfterDispatch_NoRedundancy() throws Exception { +Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); +Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + +createCacheInVMs(nyPort, vm2); +createReceiverInVMs(vm2); + +createSenders(lnPort); + +createReceiverPR(vm2, 0); + +createSenderPRs(0); + +startSenderInVMs("ln", vm4, vm5, vm6, vm7); + +vm4.invoke(() -> WANTestBase.doPuts(
[57/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/main/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/701c6861/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java -- diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java new file mode 100644 index 000..815932e --- /dev/null +++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.parallel; + +import java.io.IOException; +import java.util.Set; + +import org.apache.logging.log4j.Logger; + +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.client.internal.Connection; +import com.gemstone.gemfire.cache.client.internal.pooling.ConnectionDestroyedException; +import com.gemstone.gemfire.cache.wan.GatewaySender; +import com.gemstone.gemfire.internal.Version; +import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderConfigurationException; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventCallbackDispatcher; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventDispatcher; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventRemoteDispatcher; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderStats; +import com.gemstone.gemfire.internal.logging.LogService; + +public class RemoteParallelGatewaySenderEventProcessor extends ParallelGatewaySenderEventProcessor { + private static final Logger logger = LogService.getLogger(); + + protected RemoteParallelGatewaySenderEventProcessor( + AbstractGatewaySender sender) { +super(sender); + } + + /** + * use in concurrent scenario where queue is to be shared among all the processors. + */ + protected RemoteParallelGatewaySenderEventProcessor(AbstractGatewaySender sender, Set userRegions, int id, int nDispatcher) { +super(sender, userRegions, id, nDispatcher); + } + + @Override + protected void rebalance() { +GatewaySenderStats statistics = this.sender.getStatistics(); +long startTime = statistics.startLoadBalance(); +try { + if (this.dispatcher.isRemoteDispatcher()) { +GatewaySenderEventRemoteDispatcher remoteDispatcher = (GatewaySenderEventRemoteDispatcher) this.dispatcher; +if (remoteDispatcher.isConnectedToRemote()) { + remoteDispatcher.stopAckReaderThread(); + remoteDispatcher.destroyConnection(); +} + } +} finally { + statistics.endLoadBalance(startTime); +} + } + + public void initializeEventDispatcher() { +if (logger.isDebugEnabled()) { + logger.debug(" Creating the GatewayEventRemoteDispatcher"); +} +if (this.sender.getRemoteDSId() != GatewaySender.DEFAULT_DISTRIBUTED_SYSTEM_ID) { + this.dispatcher = new GatewaySenderEventRemoteDispatcher(this); +} + } + + /** + * Returns if corresponding receiver WAN site of this GatewaySender has + * GemfireVersion > 7.0.1 + * + * @param disp + * @return true if remote site Gemfire Version is >= 7.0.1 + */ + private boolean shouldSendVersionEvents(GatewaySenderEventDispatcher disp) + throws GatewaySenderException { + try { +GatewaySenderEventRemoteDispatcher remoteDispatcher = (GatewaySenderEventRemoteDispatcher) disp; +// This will create a new connection if no batch has been sent till +// now. +Connection conn = remoteDispatcher.getConnection(false); +if (conn != null) { + short remoteSiteVersion = conn.getWanSiteVersion(); + if (Version.GFE_701.compareTo(remoteSiteVersion) <= 0) { +return true; + } +} + } catch (GatewaySenderException e) { +Throwable cause = e.getCause();
[07/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java new file mode 100644 index 000..411396b --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java @@ -0,0 +1,327 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.serial; + +import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.junit.Assert.*; + +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Properties; +import java.util.Set; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.AttributesFactory; +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.DiskStore; +import com.gemstone.gemfire.cache.DiskStoreFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.wan.GatewayEventFilter; +import com.gemstone.gemfire.cache.wan.GatewaySender; +import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; +import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; +import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; +import com.gemstone.gemfire.cache30.MyGatewayEventFilter1; +import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1; +import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2; +import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; +import com.gemstone.gemfire.internal.cache.RegionQueue; +import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; +import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.Wait; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +@Category(DistributedTest.class) +public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { + + @Test + public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception { +Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + +Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + +vm2.invoke(() -> WANTestBase.createCache(nyPort )); +vm3.invoke(() -> WANTestBase.createCache(nyPort )); + +vm2.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", null, isOffHeap() )); +vm3.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", null, isOffHeap() )); + +vm2.invoke(() -> WANTestBase.createReceiver()); +vm3.invoke(() -> WANTestBase.createReceiver()); + +vm4.invoke(() -> WANTestBase.createCache( lnPort )); +vm5.invoke(() -> WANTestBase.createCache( lnPort )); +vm6.invoke(() -> WANTestBase.createCache( lnPort )); +vm7.invoke(() -> WANTestBase.createCache( lnPort )); + +vm4.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2, +false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY )); +vm5.invoke(() -> WANTestBase.createSenderWithMultipleDispatchers( "ln", 2, +false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY )); + +startSenderInVMs("ln", vm4, vm5); + +vm4.invoke(() -> WANTestBase.createReplicatedRegion( + getTestMethodName() + "_RR", "ln", isOffHeap() )); +vm5.invoke(() -> WANTestBase.createReplicatedRegion( + getTestMethodName() + "_RR", "ln", isOffHeap() )); +vm6.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", "ln", isOffHeap() )); +vm7.invoke(() -> WANTestBase.createReplicatedRegion( +
[49/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-lucene/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-lucene/src/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e6d966/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java -- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java deleted file mode 100644 index 8fbe356..000 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/ChunkKey.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You 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. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.gemstone.gemfire.cache.lucene.internal.filesystem; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.UUID; - -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; - -/** - * The key for a single chunk on a file stored within a region. - */ -public class ChunkKey implements DataSerializableFixedID { - UUID fileId; - int chunkId; - - /** - * Constructor used for serialization only. - */ - public ChunkKey() { - } - - ChunkKey(UUID fileName, int chunkId) { -this.fileId = fileName; -this.chunkId = chunkId; - } - - /** - * @return the fileName - */ - public UUID getFileId() { -return fileId; - } - - /** - * @return the chunkId - */ - public int getChunkId() { -return chunkId; - } - - @Override - public int hashCode() { -final int prime = 31; -int result = 1; -result = prime * result + fileId.hashCode(); -result = prime * result + chunkId; -return result; - } - - @Override - public boolean equals(Object obj) { -if (this == obj) { - return true; -} -if (obj == null) { - return false; -} -if (!(obj instanceof ChunkKey)) { - return false; -} -ChunkKey other = (ChunkKey) obj; -if (chunkId != other.chunkId) { - return false; -} -if (fileId == null) { - if (other.fileId != null) { -return false; - } -} else if (!fileId.equals(other.fileId)) { - return false; -} -return true; - } - - @Override - public Version[] getSerializationVersions() { -return null; - } - - @Override - public int getDSFID() { -return LUCENE_CHUNK_KEY; - } - - @Override - public void toData(DataOutput out) throws IOException { -out.writeInt(chunkId); -out.writeLong(fileId.getMostSignificantBits()); -out.writeLong(fileId.getLeastSignificantBits()); - } - - @Override - public void fromData(DataInput in) - throws IOException, ClassNotFoundException { -chunkId = in.readInt(); -long high = in.readLong(); -long low = in.readLong(); -fileId = new UUID(high, low); - } - - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e6d966/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java -- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java deleted file mode 100644 index d27717e..000 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/File.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You 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. See the License for
[34/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java deleted file mode 100644 index 3ae9a01..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java +++ /dev/null @@ -1,1063 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.misc; - -import org.junit.Ignore; -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.internal.cache.ForceReattemptException; -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; -import com.gemstone.gemfire.test.dunit.Wait; - -@Category(DistributedTest.class) -public class ReplicatedRegion_ParallelWANPropagationDUnitTest extends WANTestBase{ - - public ReplicatedRegion_ParallelWANPropagationDUnitTest() { -super(); -// TODO Auto-generated constructor stub - } - - final String expectedExceptions = null; - - - /** - * - */ - private static final long serialVersionUID = 1L; - - @Test - public void test_DR_PGS_1Nodes_Put_Receiver() throws Exception { -try { - Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); - Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - - createCacheInVMs(nyPort, vm2); - vm2.invoke(() -> WANTestBase.createReceiver()); - vm2.invoke(() -> WANTestBase.createReplicatedRegion( - getTestMethodName() + "_RR", null, isOffHeap() )); - - createCacheInVMs(lnPort, vm4); - - vm4.invoke(() -> WANTestBase.createReplicatedRegion( - getTestMethodName() + "_RR", "ln1", isOffHeap() )); - - vm4.invoke(() -> WANTestBase.createSender( "ln1", 2, - true, 10, 100, false, false, null, true )); - - vm4.invoke(() -> WANTestBase.startSender( "ln1" )); - fail("Expected GatewaySenderConfigException where parallel gateway sender can not be used with replicated region"); -} -catch (Exception e) { - if (!e.getCause().getMessage() - .contains("can not be used with replicated region")) { -fail("Expected GatewaySenderConfigException where parallel gateway sender can not be used with replicated region"); - } -} - } - - /*1. Validate that parallelGatewaySenderId can be added to distributed region - *Region distributed ack/noack + PGS - *1. Find out the restrictions on totalNumBuckets on shadowPR - *2. Find out the restrictions on redundancy on shadowPR - *3. Find out the restrictions on localMaxMemory on shadowPR - *4. Find out the best way user will specify PR attributes to PGS - *5. Find out the restrictions on ordering. - *6. put on region populates the queue - *7. put on region reaches to remote site. Dispatcher works as expected - *8. m1 and m2 has DR(ack/noack). put on DR from m1 populates queue on both m1 and m2. Validate that remote site got all the events - *9. m1 and m2 has DR(ack/noack). create/put/destroy/operations populates the queue. Validate that remote site got correct events - *10. m1 and m2 has DR(ack/noack). localDestroy is called on m1's DR. This locally destroys M1's shadowPr - *11. m1 and m2 has
[54/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-web/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-web/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c20e693/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DataCommandsOverHttpDistributedTest.java -- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DataCommandsOverHttpDistributedTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DataCommandsOverHttpDistributedTest.java new file mode 100644 index 000..11b8ab1 --- /dev/null +++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DataCommandsOverHttpDistributedTest.java @@ -0,0 +1,151 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.management.internal.cli.commands; + +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; +import static com.gemstone.gemfire.test.dunit.Wait.*; +import static org.junit.Assert.*; + +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.RegionFactory; +import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.management.DistributedRegionMXBean; +import com.gemstone.gemfire.management.ManagementService; +import com.gemstone.gemfire.management.cli.Result; +import com.gemstone.gemfire.management.internal.cli.result.CommandResult; +import com.gemstone.gemfire.test.dunit.Host; +import com.gemstone.gemfire.test.dunit.SerializableRunnable; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.ProvideSystemProperty; +import org.junit.experimental.categories.Category; + +@Category(DistributedTest.class) +@SuppressWarnings("deprecated") +public class DataCommandsOverHttpDistributedTest extends CliCommandTestBase { + + private static final String REBALANCE_REGION_NAME = DataCommandsOverHttpDistributedTest.class.getSimpleName() + "Region"; + + @ClassRule + public static ProvideSystemProperty provideSystemProperty = new ProvideSystemProperty(CliCommandTestBase.USE_HTTP_SYSTEM_PROPERTY, "true"); + + @Test + public void testSimulateForEntireDSWithTimeout() { +setupTestRebalanceForEntireDS(); +//check if DistributedRegionMXBean is available so that command will not fail +final VM manager = Host.getHost(0).getVM(0); +manager.invoke(checkRegionMBeans); + +getLogWriter().info("testSimulateForEntireDS verified MBean and executing command"); + +String command = "rebalance --simulate=true --time-out=-1"; + +CommandResult cmdResult = executeCommand(command); + +getLogWriter().info("testSimulateForEntireDS just after executing " + cmdResult); + +if (cmdResult != null) { + String stringResult = commandResultToString(cmdResult); + getLogWriter().info("testSimulateForEntireDS stringResult : " + stringResult); + assertEquals(Result.Status.OK, cmdResult.getStatus()); +} else { + fail("testRebalanceForIncludeRegionFunction failed as did not get CommandResult"); +} + } + + SerializableRunnable checkRegionMBeans = new SerializableRunnable() { +@Override +public void run() { + final WaitCriterion waitForMaangerMBean = new WaitCriterion() { +@Override +public boolean done() { + final ManagementService service = ManagementService.getManagementService(getCache()); + final DistributedRegionMXBean bean = service.getDistributedRegionMXBean( +Region.SEPARATOR + REBALANCE_REGION_NAME); + if (bean == null) { +getLogWriter().info("Still probing for checkRegionMBeans ManagerMBean"); +return false; + } else { +// verify that bean is proper before executing tests +if (bean.getMembers() != null && bean.getMembers().length > 1 && bean.getMemberCount() > 0 && service.getDistributedSystemMXBean().listRegions().length >= 2) { + return true; +} else { + return false; +} +
[03/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java new file mode 100644 index 000..c627353 --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java @@ -0,0 +1,281 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.wancommand; + +import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.management.cli.Result; +import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; +import com.gemstone.gemfire.management.internal.cli.result.CommandResult; +import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; +import com.gemstone.gemfire.test.dunit.Host; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.util.List; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.pause; + +@Category(DistributedTest.class) +public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { + + private static final long serialVersionUID = 1L; + + /** + * Test wan commands for error in input 1> start gateway-sender command needs + * only one of member or group. + */ + @Test + public void testStopGatewayReceiver_ErrorConditions() { + +VM puneLocator = Host.getLocator(); +int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); + +Properties props = getDistributedSystemProperties(); +props.setProperty(MCAST_PORT, "0"); +props.setProperty(LOCATORS, "localhost[" + punePort + "]"); +setUpJmxManagerOnVm0ThenConnect(props); + +Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); + +vm3.invoke(() -> createReceiver( punePort )); + +final DistributedMember vm1Member = (DistributedMember) vm3.invoke(() -> getMember()); + +String command = CliStrings.STOP_GATEWAYRECEIVER + " --" ++ CliStrings.STOP_GATEWAYRECEIVER__MEMBER + "=" + vm1Member.getId() ++ " --" + CliStrings.STOP_GATEWAYRECEIVER__GROUP + "=RG1"; + +CommandResult cmdResult = executeCommand(command); +if (cmdResult != null) { + String strCmdResult = commandResultToString(cmdResult); + getLogWriter().info( + "testStopGatewayReceiver_ErrorConditions stringResult : " + + strCmdResult + ""); + assertEquals(Result.Status.ERROR, cmdResult.getStatus()); + assertTrue(strCmdResult.contains(CliStrings.PROVIDE_EITHER_MEMBER_OR_GROUP_MESSAGE)); +} else { + fail("testStopGatewayReceiver_ErrorConditions failed as did not get CommandResult"); +} + } + + @Test + public void testStopGatewayReceiver() { + +VM puneLocator = Host.getLocator(); +int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); + +Properties props = getDistributedSystemProperties(); +props.setProperty(MCAST_PORT, "0"); +props.setProperty(LOCATORS, "localhost[" + punePort + "]"); +setUpJmxManagerOnVm0ThenConnect(props); + +Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); + +vm3.invoke(() -> createAndStartReceiver( punePort )); +vm4.invoke(() -> createAndStartReceiver( punePort )); +vm5.invoke(() -> createAndStartReceiver( punePort )); + +vm3.invoke(() -> verifyReceiverState( true ));
[43/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-rebalancer/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-rebalan
GEODE-37 change package name from com.gemstone.gemfire (for ./geode-rebalancer/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-rebalancer/src/main/java/org/apache/geode) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/401ef76c Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/401ef76c Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/401ef76c Branch: refs/heads/feature/GEODE-37_2 Commit: 401ef76cfb6087c12a80d7e89a18384e13d5fd8a Parents: 90d1187 Author: Hitesh KhamesraAuthored: Tue Sep 13 15:43:20 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 15:43:20 2016 -0700 -- .../gemfire/cache/util/AutoBalancer.java| 553 --- .../apache/geode/cache/util/AutoBalancer.java | 553 +++ 2 files changed, 553 insertions(+), 553 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/401ef76c/geode-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java -- diff --git a/geode-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java deleted file mode 100644 index a6488f9..000 --- a/geode-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java +++ /dev/null @@ -1,553 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.cache.util; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.CancellationException; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.logging.log4j.Logger; -import org.quartz.CronExpression; -import org.springframework.scheduling.support.CronSequenceGenerator; - -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.control.RebalanceOperation; -import com.gemstone.gemfire.cache.control.RebalanceResults; -import com.gemstone.gemfire.cache.partition.PartitionMemberInfo; -import com.gemstone.gemfire.distributed.DistributedLockService; -import com.gemstone.gemfire.distributed.internal.locks.DLockService; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.partitioned.InternalPRInfo; -import com.gemstone.gemfire.internal.cache.partitioned.LoadProbe; -import com.gemstone.gemfire.internal.logging.LogService; - -/** - * Re-balancing operation relocates data from heavily loaded members to lightly - * loaded members. In most cases, the decision to re-balance is based on the - * size of the member and a few other statistics. {@link AutoBalancer} monitors - * these statistics and if necessary, triggers a re-balancing request. - * Auto-Balancing is expected to prevent failures and data loss. - * - * - * This implementation is based on {@code Initializer} implementation. By - * default auto-balancing is disabled. A user needs to configure - * {@link AutoBalancer} during cache initialization - * {@link GemFireCache#getInitializer()} - * - * - * In a cluster only one member owns auto-balancing responsibility. This is - * achieved by grabbing a distributed lock. In case of a failure a new member - * will grab the lock and manage auto balancing. - * - * - * {@link AutoBalancer} can be controlled using the following configurations - * - * {@link AutoBalancer#SCHEDULE} - * TBD THRESHOLDS - * - */ -public class
[11/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java new file mode 100644 index 000..5e32bb6 --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.offheap; + +import org.junit.experimental.categories.Category; +import org.junit.Test; + +import static org.junit.Assert.*; + +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPersistenceEnabledGatewaySenderDUnitTest; + +@SuppressWarnings("serial") +@Category(DistributedTest.class) +public class SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest extends +SerialWANPersistenceEnabledGatewaySenderDUnitTest { + + public SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest() { +super(); + } + + @Override + public boolean isOffHeap() { +return true; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java new file mode 100644 index 000..d6cecd1 --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.offheap; + +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPropagationDUnitTest; + +@SuppressWarnings("serial") +@Category(DistributedTest.class) +public class SerialWANPropagationOffHeapDUnitTest extends SerialWANPropagationDUnitTest { + + public SerialWANPropagationOffHeapDUnitTest() { +super(); + } + + @Override + public boolean isOffHeap() { +return true; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
[53/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-web/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-web/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c20e693/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java -- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java new file mode 100644 index 000..b11125c --- /dev/null +++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java @@ -0,0 +1,453 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.management.internal.web.shell; + +import static org.junit.Assert.*; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.springframework.core.io.Resource; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.ResourceAccessException; + +import com.gemstone.gemfire.internal.lang.StringUtils; +import com.gemstone.gemfire.management.internal.cli.CommandRequest; +import com.gemstone.gemfire.management.internal.web.AbstractWebTestCase; +import com.gemstone.gemfire.management.internal.web.domain.Link; +import com.gemstone.gemfire.management.internal.web.domain.LinkIndex; +import com.gemstone.gemfire.management.internal.web.http.ClientHttpRequest; +import com.gemstone.gemfire.management.internal.web.http.HttpMethod; +import com.gemstone.gemfire.test.junit.categories.UnitTest; + +/** + * The RestHttpOperationInvokerJUnitTest class is a test suite of test cases testing the contract and functionality of the + * RestHttpOperationInvoker class. + * + * @see java.net.URI + * @see com.gemstone.gemfire.management.internal.cli.CommandRequest + * @see com.gemstone.gemfire.management.internal.web.http.HttpMethod + * @see com.gemstone.gemfire.management.internal.web.domain.Link + * @see com.gemstone.gemfire.management.internal.web.domain.LinkIndex + * @see com.gemstone.gemfire.management.internal.web.shell.RestHttpOperationInvoker + * @see org.junit.Assert + * @see org.junit.Test + * @since GemFire 8.0 + */ +@SuppressWarnings("unused") +@Category(UnitTest.class) +public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { + + private LinkIndex linkIndex; + + private RestHttpOperationInvoker operationInvoker; + + @Before + public void setUp() throws Exception { +final Link listLibraries = new Link("list-libraries", toUri("http://host.domain.com/service/v1/libraries;)); +final Link getLibrary = new Link("get-library", toUri("http://host.domain.com/service/v1/libraries/{name};)); +final Link listBooks = new Link("list-books", toUri("http://host.domain.com/service/v1/libraries/{name}/books;)); +final Link listBooksByAuthor = new Link("list-books", toUri("http://host.domain.com/service/v1/libraries/{name}/books/{author};)); +final Link listBooksByAuthorAndCategory = new Link("list-books", toUri("http://host.domain.com/service/v1/libraries/{name}/books/{author}/{category};)); +final Link listBooksByAuthorAndYear = new Link("list-books", toUri("http://host.domain.com/service/v1/libraries/{name}/books/{author}/{year};)); +final Link listBooksByAuthorCategoryAndYear = new Link("list-books", toUri("http://host.domain.com/service/v1/libraries/{name}/books/{author}/{category}/{year};)); +final Link addBook = new Link("add-book", toUri("http://host.domain.com/service/v1/libraries/{name}/books;), HttpMethod.POST); +final Link getBookByIsbn = new Link("get-book", toUri("http://host.domain.com/service/v1/libraries/{name}/books/{isbn};)); +final Link getBookByTitle = new Link("get-book", toUri("http://host.domain.com/service/v1/libraries/{name}/books/{title};)); +final Link removeBook = new Link("remove-book",
[29/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java deleted file mode 100644 index 427054a..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java +++ /dev/null @@ -1,285 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.parallel; - -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.Wait; - -@Category(DistributedTest.class) -public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase { - - private static final long serialVersionUID = 1L; - - public ParallelWANPropagationConcurrentOpsDUnitTest() { -super(); - } - - /** - * Normal propagation scenario test case for a PR with only one bucket. - * This has been added for bug# 44284. - * @throws Exception - */ - @Test - public void testParallelPropagationWithSingleBucketPR() throws Exception { -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -createCacheInVMs(nyPort, vm2, vm3); -createReceiverInVMs(vm2, vm3); - -createCacheInVMs(lnPort, vm4, vm5); - -vm4.invoke(() -> WANTestBase.createSender( "ln", 2, -true, 100, 10, false, false, null, true )); -vm5.invoke(() -> WANTestBase.createSender( "ln", 2, -true, 100, 10, false, false, null, true )); - -vm4.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 1, isOffHeap() )); -vm5.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 1, isOffHeap() )); - -startSenderInVMs("ln", vm4, vm5); - -vm2.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", null, 1, 1, isOffHeap() )); -vm3.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", null, 1, 1, isOffHeap() )); - -//before doing any puts, let the senders be running in order to ensure that -//not a single event will be lost -vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); -vm5.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" )); - -//pause the senders -vm4.invoke(() -> WANTestBase.pauseSender( "ln" )); -vm5.invoke(() -> WANTestBase.pauseSender( "ln" )); - -Wait.pause(5000); - -AsyncInvocation async1 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 700 )); -AsyncInvocation async2 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 )); -AsyncInvocation async3 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 800 )); -AsyncInvocation async4 = vm4.invokeAsync(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 )); - -async1.join(); -async2.join(); -async3.join(); -async4.join(); - -int queueSize = (Integer) vm4.invoke(() -> WANTestBase.getQueueContentSize( "ln" )); -assertEquals("Actual queue size is not matching with the expected", 3500, queueSize); - -//resume the senders now -vm4.invoke(()
[12/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java new file mode 100644 index 000..073056f --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java @@ -0,0 +1,1507 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.misc; + +import org.junit.Ignore; +import org.junit.experimental.categories.Category; +import org.junit.Test; + +import static org.junit.Assert.*; + +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import java.util.ArrayList; +import java.util.Map; + +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.wan.GatewayEventFilter; +import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; +import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; +import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1; +import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2; +import com.gemstone.gemfire.internal.cache.wan.Filter70; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderConfigurationException; +import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException; +import com.gemstone.gemfire.internal.cache.wan.MyGatewayTransportFilter3; +import com.gemstone.gemfire.internal.cache.wan.MyGatewayTransportFilter4; +import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.Assert; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; +import com.gemstone.gemfire.test.junit.categories.FlakyTest; + +@Category(DistributedTest.class) +public class WanValidationsDUnitTest extends WANTestBase { + + public WanValidationsDUnitTest() { +super(); + } + + /** + * Test to make sure that serial sender Ids configured in Distributed Region + * is same across all DR nodes TODO : Should this validation hold tru now. + * Discuss. If I have 2 members on Which DR is defined. But sender is defined + * on only one member. How can I add the instance on the sender in Region + * which does not have a sender. I can bypass the existing validation for the + * DR with SerialGatewaySender. But for PR with SerialGatewaySender, we need + * to send the adjunct message. Find out the way to send the adjunct message + * to the member on which serialGatewaySender is available. + */ + + @Test + public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion() + throws Exception { +IgnoredException.addIgnoredException("another cache has the same region defined"); +try { + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1)); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort)); + + createCacheInVMs(lnPort, vm4, vm5); + + vm4.invoke(() -> WANTestBase.createSender("ln1", 2, false, 10, 100, false, false, null, true)); + vm4.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true)); + + vm5.invoke(() -> WANTestBase.createSender("ln2", 2, false, 10, 100, false, false, null, true)); + vm5.invoke(() -> WANTestBase.createSender("ln3", 2, false, 10, 100, false, false, null, true)); + + vm4.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", "ln1,ln2", isOffHeap() )); + + vm5.invoke(() -> WANTestBase.createReplicatedRegion( +getTestMethodName() + "_RR", "ln2,ln3", isOffHeap() )); + fail("Expected IllegalStateException with incompatible gateway sender ids message"); +} +catch (Exception
[01/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-37_2 3897a76ea -> 7c20e6931 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java new file mode 100644 index 000..b1e070d --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java @@ -0,0 +1,1013 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.management.internal.configuration; + +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.CacheFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; +import com.gemstone.gemfire.cache.query.Index; +import com.gemstone.gemfire.cache.wan.GatewayReceiver; +import com.gemstone.gemfire.cache.wan.GatewaySender; +import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; +import com.gemstone.gemfire.distributed.Locator; +import com.gemstone.gemfire.distributed.internal.InternalLocator; +import com.gemstone.gemfire.internal.ClassBuilder; +import com.gemstone.gemfire.internal.JarClassLoader; +import com.gemstone.gemfire.internal.JarDeployer; +import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest; +import com.gemstone.gemfire.internal.cache.DiskStoreImpl; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import com.gemstone.gemfire.internal.cache.extension.Extensible; +import com.gemstone.gemfire.internal.cache.extension.Extension; +import com.gemstone.gemfire.internal.cache.extension.mock.MockCacheExtension; +import com.gemstone.gemfire.internal.cache.extension.mock.MockExtensionCommands; +import com.gemstone.gemfire.internal.cache.extension.mock.MockRegionExtension; +import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator; +import com.gemstone.gemfire.internal.cache.xmlcache.XmlParser; +import com.gemstone.gemfire.management.cli.Result.Status; +import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh; +import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase; +import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; +import com.gemstone.gemfire.management.internal.cli.result.CommandResult; +import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; +import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity; +import com.gemstone.gemfire.test.dunit.SerializableCallable; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.Map.Entry; + +import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts; +import static com.gemstone.gemfire.internal.FileUtil.delete; +import static com.gemstone.gemfire.internal.FileUtil.deleteMatching; +import static com.gemstone.gemfire.internal.lang.StringUtils.isBlank; +import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Host.getHost; +import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; +import static org.apache.commons.io.FileUtils.*; + +@Category(DistributedTest.class) +public class ClusterConfigurationDUnitTest
[42/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/resources/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/t
GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/resources/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/resources/org/apache/geode) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/31acb6d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/31acb6d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/31acb6d7 Branch: refs/heads/feature/GEODE-37_2 Commit: 31acb6d7269c75701c1b5e5fb8d2faf0e568c252 Parents: f39e239 Author: Hitesh KhamesraAuthored: Tue Sep 13 15:43:20 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 15:43:20 2016 -0700 -- .../gemfire/codeAnalysis/excludedClasses.txt| 2 -- .../gemstone/gemfire/codeAnalysis/openBugs.txt | 21 --- .../sanctionedDataSerializables.txt | 28 .../codeAnalysis/sanctionedSerializables.txt| 0 .../geode/codeAnalysis/excludedClasses.txt | 2 ++ .../org/apache/geode/codeAnalysis/openBugs.txt | 21 +++ .../sanctionedDataSerializables.txt | 28 .../codeAnalysis/sanctionedSerializables.txt| 0 8 files changed, 51 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31acb6d7/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt -- diff --git a/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt b/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt deleted file mode 100644 index c55df1d..000 --- a/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt +++ /dev/null @@ -1,2 +0,0 @@ -# e.g., -#com/gemstone/gemfire/cache/query/CqAttributesFactory http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31acb6d7/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt -- diff --git a/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt b/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt deleted file mode 100644 index 6c40e24..000 --- a/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt +++ /dev/null @@ -1,21 +0,0 @@ -# This is a list of classes excluded due to open bugs about their having -# incompatible changes. There should be no entries in this file at the -# time of a product release. - -# Each entry should be a bug number followed by a comma and the -# full class name. The package components can be delimited with a period -# or a comma. Don't include ".class" or ".java" at the end of the name. - -# example: 50174,com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage -# example: 50175,com.gemstone.org.jgroups.Message$Header - - -# ~~~ DataSerializables ~ -# these are failures from testDataSerializables - - -# ~~~ Serializables ~~~ -# these are failures from testSerializables - - - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31acb6d7/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt -- diff --git a/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt deleted file mode 100644 index 1b62255..000 --- a/geode-wan/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt +++ /dev/null @@ -1,28 +0,0 @@ -com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage,2 -fromData,38,2a2bb700062a2bb80007c8b500032a2bb900090100b500042a2bb80007c8b50005b1 -toData,32,2a2bb7000a2ab400032bb8000b2b2ab40004b9000c02002ab400052bb8000bb1 - -com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest,2 -fromData,22,2a2bb80004c5b500022a2bb900060100b50003b1 -toData,19,2ab400022bb800072b2ab40003b900080200b1 - -com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse,2 -fromData,9,2a2bb80010b50004b1 -toData,9,2ab400042bb80011b1 - -com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest,2 -fromData,1,b1 -toData,1,b1 - -com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse,2 -fromData,1,b1 -toData,1,b1 - -com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest,2
[47/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-lucene/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-lucene/src/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e6d966/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactory.java -- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactory.java new file mode 100755 index 000..b6ac867 --- /dev/null +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactory.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.gemstone.gemfire.cache.lucene.internal; + +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; + +public class LuceneIndexFactory { + public LuceneIndexFactory() { + } + + public LuceneIndexImpl create(String indexName, String regionPath, GemFireCacheImpl cache) { +return new LuceneIndexForPartitionedRegion(indexName, regionPath, cache); + } +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e6d966/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java -- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java new file mode 100644 index 000..b64e026 --- /dev/null +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package com.gemstone.gemfire.cache.lucene.internal; + +import com.gemstone.gemfire.cache.AttributesFactory; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.DataPolicy; +import com.gemstone.gemfire.cache.PartitionAttributes; +import com.gemstone.gemfire.cache.PartitionAttributesFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.RegionAttributes; +import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; +import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl; +import com.gemstone.gemfire.cache.execute.FunctionService; +import com.gemstone.gemfire.cache.execute.ResultCollector; +import com.gemstone.gemfire.cache.lucene.internal.directory.DumpDirectoryFiles; +import com.gemstone.gemfire.cache.lucene.internal.filesystem.ChunkKey; +import com.gemstone.gemfire.cache.lucene.internal.filesystem.File; +import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystemStats; +import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager; +import com.gemstone.gemfire.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer; +import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; +import com.gemstone.gemfire.internal.cache.PartitionedRegion; + +/* wrapper of IndexWriter */ +public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl { + protected RegionfileRegion; + protected Region chunkRegion; + protected final FileSystemStats fileSystemStats; + + public LuceneIndexForPartitionedRegion(String indexName, String regionPath, Cache cache) { +
[55/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-web/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-web/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c20e693/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java -- diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java deleted file mode 100644 index bbe961b..000 --- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java +++ /dev/null @@ -1,509 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.management.internal.web.http; - -import static org.junit.Assert.*; - -import java.net.URI; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.jmock.Mockery; -import org.jmock.lib.legacy.ClassImposteriser; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.springframework.http.HttpEntity; -import org.springframework.http.MediaType; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; - -import com.gemstone.gemfire.management.internal.web.AbstractWebTestCase; -import com.gemstone.gemfire.management.internal.web.domain.Link; -import com.gemstone.gemfire.test.junit.categories.UnitTest; - -/** - * The ClientHttpRequestJUnitTest class is a test suite of test cases testing the contract and functionality of the - * ClientHttpRequest class. - * - * @see com.gemstone.gemfire.management.internal.web.AbstractWebTestCase - * @see com.gemstone.gemfire.management.internal.web.http.ClientHttpRequest - * @see org.jmock.Mockery - * @see org.junit.Assert - * @see org.junit.Test - * @since GemFire 8.0 - */ -@Category(UnitTest.class) -public class ClientHttpRequestJUnitTest extends AbstractWebTestCase { - - private Mockery mockContext; - - @Before - public void setUp() { -mockContext = new Mockery(); -mockContext.setImposteriser(ClassImposteriser.INSTANCE); - } - - @After - public void tearDown() { -mockContext.assertIsSatisfied(); -mockContext = null; - } - - @Test - public void testCreateClientHttpRequest() throws Exception { -final Link expectedLink = new Link("test", toUri("http://host.domain.com:8080/app/service;)); -final ClientHttpRequest request = new ClientHttpRequest(expectedLink); - -assertNotNull(request); -assertEquals(expectedLink, request.getLink()); - } - - @Test(expected = AssertionError.class) - public void testCreateClientHttpRequestWithNullLink() { -new ClientHttpRequest(null); - } - - @Test - public void testGetMethod() throws Exception { -Link link = new Link("get-resource", toUri("http://host.domain.com:8080/app/resources/{id};)); -ClientHttpRequest request = new ClientHttpRequest(link); - -assertEquals(link, request.getLink()); -assertEquals(org.springframework.http.HttpMethod.GET, request.getMethod()); - -link = new Link("delete-resource", toUri("http://host.domain.com:8080/app/resources/{id};), HttpMethod.DELETE); -request = new ClientHttpRequest(link); - -assertEquals(link, request.getLink()); -assertEquals(org.springframework.http.HttpMethod.DELETE, request.getMethod()); - -link = new Link("delete-resource", toUri("http://host.domain.com:8080/app/service;), HttpMethod.HEAD); -request = new ClientHttpRequest(link); - -assertEquals(link, request.getLink()); -assertEquals(org.springframework.http.HttpMethod.HEAD, request.getMethod()); - -link = new Link("delete-resource", toUri("http://host.domain.com:8080/app/service;), HttpMethod.OPTIONS); -request = new ClientHttpRequest(link); - -assertEquals(link, request.getLink()); -assertEquals(org.springframework.http.HttpMethod.OPTIONS, request.getMethod()); - -link = new Link("delete-resource", toUri("http://host.domain.com:8080/app/resources;), HttpMethod.POST); -request = new ClientHttpRequest(link); - -
[50/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-lucene/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-lucene/src/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e6d966/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/cli/LuceneIndexDetails.java -- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/cli/LuceneIndexDetails.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/cli/LuceneIndexDetails.java deleted file mode 100644 index eaec4a0..000 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/cli/LuceneIndexDetails.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.cache.lucene.internal.cli; - -import java.io.Serializable; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexCreationProfile; -import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexImpl; -import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexStats; - -import org.apache.lucene.analysis.Analyzer; - -public class LuceneIndexDetails implements Comparable, Serializable { - private static final long serialVersionUID = 1L; - private final String indexName; - private final String regionPath; - private final String[] searchableFieldNames; - private MapfieldAnalyzers=null; - private final Map indexStats; - private boolean initialized; - - public LuceneIndexDetails(final String indexName, final String regionPath, final String[] searchableFieldNames, final Map fieldAnalyzers, LuceneIndexStats indexStats, boolean initialized) { -this.indexName = indexName; -this.regionPath = regionPath; -this.searchableFieldNames = searchableFieldNames; -this.fieldAnalyzers = getFieldAnalyzerStrings(fieldAnalyzers); -this.indexStats=getIndexStatsMap(indexStats); -this.initialized = initialized; - } - - public LuceneIndexDetails(LuceneIndexImpl index) { -this(index.getName(), index.getRegionPath(), index.getFieldNames(),index.getFieldAnalyzers(),index.getIndexStats(), true); - } - - public LuceneIndexDetails(LuceneIndexCreationProfile indexProfile) { -this(indexProfile.getIndexName(), indexProfile.getRegionPath(), indexProfile.getFieldNames(), null, null, false); - this.fieldAnalyzers=getFieldAnalyzerStringsFromProfile(indexProfile.getFieldAnalyzers()); - } - - public Map getIndexStats() { -return indexStats; - } - private Map getIndexStatsMap(LuceneIndexStats indexStats) { -Map statsMap = new HashMap<>(); -if (indexStats==null) return statsMap; -statsMap.put("queryExecutions",indexStats.getQueryExecutions()); -statsMap.put("updates",indexStats.getUpdates()); -statsMap.put("commits",indexStats.getCommits()); -statsMap.put("documents",indexStats.getDocuments()); -return statsMap; - } - - public String getIndexStatsString() { -return indexStats.toString(); - } - - private Map getFieldAnalyzerStrings(Map fieldAnalyzers) { -if(fieldAnalyzers == null) { - return Collections.emptyMap(); -} - -Map results = new HashMap<>(); - -for (Entry entry : fieldAnalyzers.entrySet()) { - final Analyzer analyzer = entry.getValue(); - if(analyzer != null) { -results.put(entry.getKey(), analyzer.getClass().getSimpleName()); - } -} -return results; - } - - private Map getFieldAnalyzerStringsFromProfile(Map fieldAnalyzers) { -if(fieldAnalyzers == null) { - return Collections.emptyMap(); - -} - -Map results = new HashMap<>(); - -for (Entry entry : fieldAnalyzers.entrySet()) { - final String analyzer = entry.getValue(); - if(analyzer != null) { -results.put(entry.getKey(), analyzer); - } -} -return results; - } - - public String getSearchableFieldNamesString() { -return
[46/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-lucene/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-lucene/src/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e6d966/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java -- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java new file mode 100755 index 000..200a14f --- /dev/null +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java @@ -0,0 +1,470 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.cache.lucene.internal.cli; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import org.apache.geode.security.ResourcePermission.Operation; +import org.apache.geode.security.ResourcePermission.Resource; +import org.springframework.shell.core.annotation.CliAvailabilityIndicator; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; + +import com.gemstone.gemfire.SystemFailure; +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.execute.Execution; +import com.gemstone.gemfire.cache.execute.FunctionAdapter; +import com.gemstone.gemfire.cache.execute.FunctionInvocationTargetException; +import com.gemstone.gemfire.cache.execute.ResultCollector; + +import com.gemstone.gemfire.cache.lucene.internal.cli.functions.LuceneCreateIndexFunction; +import com.gemstone.gemfire.cache.lucene.internal.cli.functions.LuceneDescribeIndexFunction; +import com.gemstone.gemfire.cache.lucene.internal.cli.functions.LuceneListIndexFunction; +import com.gemstone.gemfire.cache.lucene.internal.cli.functions.LuceneSearchIndexFunction; +import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.internal.cache.execute.AbstractExecution; +import com.gemstone.gemfire.internal.security.IntegratedSecurityService; +import com.gemstone.gemfire.internal.security.SecurityService; +import com.gemstone.gemfire.management.cli.CliMetaData; +import com.gemstone.gemfire.management.cli.ConverterHint; +import com.gemstone.gemfire.management.cli.Result; +import com.gemstone.gemfire.management.internal.cli.CliUtil; +import com.gemstone.gemfire.management.internal.cli.commands.AbstractCommandsSupport; +import com.gemstone.gemfire.management.internal.cli.functions.CliFunctionResult; +import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; +import com.gemstone.gemfire.management.internal.cli.result.CommandResult; +import com.gemstone.gemfire.management.internal.cli.result.CommandResultException; +import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder; +import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; +import com.gemstone.gemfire.management.internal.cli.shell.Gfsh; +import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity; +import com.gemstone.gemfire.management.internal.security.ResourceOperation; + +/** + * The LuceneIndexCommands class encapsulates all Geode shell (Gfsh) commands related to Lucene indexes defined in Geode. + * + * @see AbstractCommandsSupport + * @see LuceneIndexDetails + * @see LuceneListIndexFunction + */ +@SuppressWarnings("unused") +public class LuceneIndexCommands extends AbstractCommandsSupport { + private static final LuceneCreateIndexFunction createIndexFunction = new LuceneCreateIndexFunction(); + private static final LuceneDescribeIndexFunction describeIndexFunction = new LuceneDescribeIndexFunction(); + private static final LuceneSearchIndexFunction searchIndexFunction = new LuceneSearchIndexFunction(); + private List searchResults=null; + + private SecurityService securityService = IntegratedSecurityService.getSecurityService(); + + @CliCommand(value = LuceneCliStrings.LUCENE_LIST_INDEX, help = LuceneCliStrings.LUCENE_LIST_INDEX__HELP) + @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA }) + @ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ) +
[41/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/java/org/apache/geode) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f39e2394 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f39e2394 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f39e2394 Branch: refs/heads/feature/GEODE-37_2 Commit: f39e2394ba9af9b5ceb0268281dcc339ecb0b1ef Parents: 701c686 Author: Hitesh KhamesraAuthored: Tue Sep 13 15:43:20 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 15:43:20 2016 -0700 -- .../cache/CacheXml70GatewayDUnitTest.java | 255 -- .../cache/CacheXml80GatewayDUnitTest.java | 150 - .../AnalyzeWANSerializablesJUnitTest.java | 90 - .../internal/cache/UpdateVersionDUnitTest.java | 962 - .../cache/wan/CacheClientNotifierDUnitTest.java | 276 -- .../cache/wan/Simple2CacheServerDUnitTest.java | 185 - .../gemfire/internal/cache/wan/WANTestBase.java | 3765 -- ...oncurrentParallelGatewaySenderDUnitTest.java | 737 ...ntParallelGatewaySenderOffHeapDUnitTest.java | 42 - ...allelGatewaySenderOperation_1_DUnitTest.java | 796 ...allelGatewaySenderOperation_2_DUnitTest.java | 625 --- ...tSerialGatewaySenderOperationsDUnitTest.java | 120 - ...GatewaySenderOperationsOffHeapDUnitTest.java | 42 - .../ConcurrentWANPropagation_1_DUnitTest.java | 568 --- .../ConcurrentWANPropagation_2_DUnitTest.java | 448 --- .../cache/wan/disttx/DistTXWANDUnitTest.java| 182 - .../CommonParallelGatewaySenderDUnitTest.java | 460 --- ...onParallelGatewaySenderOffHeapDUnitTest.java | 42 - ...wWANConcurrencyCheckForDestroyDUnitTest.java | 532 --- .../wan/misc/NewWanAuthenticationDUnitTest.java | 469 --- .../cache/wan/misc/PDXNewWanDUnitTest.java | 767 ...dRegion_ParallelWANPersistenceDUnitTest.java | 670 ...dRegion_ParallelWANPropagationDUnitTest.java | 1063 - .../SenderWithTransportFilterDUnitTest.java | 228 -- ...downAllPersistentGatewaySenderDUnitTest.java | 206 - .../wan/misc/WANConfigurationJUnitTest.java | 601 --- .../wan/misc/WANLocatorServerDUnitTest.java | 192 - .../cache/wan/misc/WANSSLDUnitTest.java | 160 - .../wan/misc/WanAutoDiscoveryDUnitTest.java | 561 --- .../cache/wan/misc/WanValidationsDUnitTest.java | 1507 --- ...tewaySenderOperation_2_OffHeapDUnitTest.java | 42 - ...tewaySenderOperation_2_OffHeapDUnitTest.java | 42 - ...GatewaySenderOperationsOffHeapDUnitTest.java | 44 - ...ewaySenderQueueOverflowOffHeapDUnitTest.java | 44 - .../ParallelWANConflationOffHeapDUnitTest.java | 44 - ...nceEnabledGatewaySenderOffHeapDUnitTest.java | 44 - ...ropagationConcurrentOpsOffHeapDUnitTest.java | 44 - .../ParallelWANPropagationOffHeapDUnitTest.java | 43 - ...erialGatewaySenderQueueOffHeapDUnitTest.java | 44 - ...nceEnabledGatewaySenderOffHeapDUnitTest.java | 44 - .../SerialWANPropagationOffHeapDUnitTest.java | 38 - ...ation_PartitionedRegionOffHeapDUnitTest.java | 39 - ...allelGatewaySenderOperation_2_DUnitTest.java | 48 - ...arallelGatewaySenderOperationsDUnitTest.java | 692 ...llelGatewaySenderQueueOverflowDUnitTest.java | 500 --- .../ParallelWANConflationDUnitTest.java | 497 --- ...ersistenceEnabledGatewaySenderDUnitTest.java | 1593 ...llelWANPropagationClientServerDUnitTest.java | 97 - ...lelWANPropagationConcurrentOpsDUnitTest.java | 285 -- .../ParallelWANPropagationDUnitTest.java| 1234 -- ...ParallelWANPropagationLoopBackDUnitTest.java | 415 -- .../wan/parallel/ParallelWANStatsDUnitTest.java | 499 --- ...tewaySenderDistributedDeadlockDUnitTest.java | 405 -- ...rialGatewaySenderEventListenerDUnitTest.java | 383 -- .../SerialGatewaySenderOperationsDUnitTest.java | 665 .../SerialGatewaySenderQueueDUnitTest.java | 327 -- ...ersistenceEnabledGatewaySenderDUnitTest.java | 547 --- .../serial/SerialWANPropagationDUnitTest.java | 1336 --- .../SerialWANPropagationLoopBackDUnitTest.java | 513 --- ...NPropagation_PartitionedRegionDUnitTest.java | 412 -- .../SerialWANPropagationsFeatureDUnitTest.java | 338 -- .../wan/serial/SerialWANStatsDUnitTest.java | 588 --- .../wan/wancommand/WANCommandTestBase.java | 490 --- ...anCommandCreateGatewayReceiverDUnitTest.java | 630 --- .../WanCommandCreateGatewaySenderDUnitTest.java | 706 ...WanCommandGatewayReceiverStartDUnitTest.java | 276 -- .../WanCommandGatewayReceiverStopDUnitTest.java | 281 -- .../WanCommandGatewaySenderStartDUnitTest.java | 400 -- .../WanCommandGatewaySenderStopDUnitTest.java | 352 --
[25/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java -- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java deleted file mode 100644 index 47dee96..000 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java +++ /dev/null @@ -1,412 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.internal.cache.wan.serial; - -import org.junit.experimental.categories.Category; -import org.junit.Test; - -import static org.junit.Assert.*; - -import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; -import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; -import com.gemstone.gemfire.test.junit.categories.DistributedTest; - -import org.junit.experimental.categories.Category; - -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.internal.cache.ForceReattemptException; -import com.gemstone.gemfire.internal.cache.wan.WANTestBase; -import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.junit.categories.FlakyTest; - -@Category(DistributedTest.class) -public class SerialWANPropagation_PartitionedRegionDUnitTest extends WANTestBase { - - private static final long serialVersionUID = 1L; - - public SerialWANPropagation_PartitionedRegionDUnitTest() { -super(); - } - - @Test - public void testPartitionedSerialPropagation() throws Exception { - -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -createCacheInVMs(nyPort, vm2, vm3); -createReceiverInVMs(vm2, vm3); - -createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); - -vm4.invoke(() -> WANTestBase.createSender( "ln", 2, -false, 100, 10, false, false, null, true )); -vm5.invoke(() -> WANTestBase.createSender( "ln", 2, -false, 100, 10, false, false, null, true )); - -vm4.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); -vm5.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); -vm6.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); -vm7.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() )); - -vm4.invoke(() -> WANTestBase.startSender( "ln" )); -//vm5.invoke(() -> WANTestBase.startSender( "ln" )); - -vm2.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); -vm3.invoke(() -> WANTestBase.createPartitionedRegion( -getTestMethodName() + "_PR", null, 1, 100, isOffHeap() )); - -vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", -1000 )); - -vm2.invoke(() -> WANTestBase.validateRegionSize( -getTestMethodName() + "_PR", 1000 )); - } - - @Test - public void testBothReplicatedAndPartitionedSerialPropagation() - throws Exception { - -Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); -Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); - -createCacheInVMs(nyPort, vm2, vm3); -createReceiverInVMs(vm2, vm3); - -createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); - -vm4.invoke(() -> WANTestBase.createSender( "ln", 2, -false, 100, 10, false, false, null, true )); -vm5.invoke(() -> WANTestBase.createSender( "ln", 2, -
[61/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/main/j
GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/main/java/org/apache/geode) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/701c6861 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/701c6861 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/701c6861 Branch: refs/heads/feature/GEODE-37_2 Commit: 701c686150bbeaa8323937fc18695c245baf2708 Parents: 9b1ec72 Author: Hitesh KhamesraAuthored: Tue Sep 13 15:43:20 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 15:43:20 2016 -0700 -- .../client/internal/GatewaySenderBatchOp.java | 312 .../cache/client/internal/SenderProxy.java | 42 - .../internal/locator/wan/LocatorDiscovery.java | 234 -- .../internal/locator/wan/LocatorHelper.java | 142 .../locator/wan/LocatorJoinMessage.java | 105 --- .../wan/LocatorMembershipListenerImpl.java | 213 - .../locator/wan/RemoteLocatorJoinRequest.java | 84 -- .../locator/wan/RemoteLocatorJoinResponse.java | 86 -- .../locator/wan/RemoteLocatorPingRequest.java | 55 -- .../locator/wan/RemoteLocatorPingResponse.java | 54 -- .../locator/wan/RemoteLocatorRequest.java | 63 -- .../locator/wan/RemoteLocatorResponse.java | 71 -- .../internal/locator/wan/WANFactoryImpl.java| 74 -- .../locator/wan/WanLocatorDiscovererImpl.java | 154 .../cache/wan/AbstractRemoteGatewaySender.java | 166 .../cache/wan/GatewayReceiverFactoryImpl.java | 145 .../internal/cache/wan/GatewayReceiverImpl.java | 251 -- .../wan/GatewaySenderEventRemoteDispatcher.java | 802 --- .../cache/wan/GatewaySenderFactoryImpl.java | 382 - .../wan/parallel/ParallelGatewaySenderImpl.java | 263 -- ...rentParallelGatewaySenderEventProcessor.java | 66 -- ...moteParallelGatewaySenderEventProcessor.java | 122 --- ...urrentSerialGatewaySenderEventProcessor.java | 45 -- ...RemoteSerialGatewaySenderEventProcessor.java | 50 -- .../wan/serial/SerialGatewaySenderImpl.java | 256 -- .../client/internal/GatewaySenderBatchOp.java | 312 .../cache/client/internal/SenderProxy.java | 42 + .../internal/locator/wan/LocatorDiscovery.java | 234 ++ .../internal/locator/wan/LocatorHelper.java | 142 .../locator/wan/LocatorJoinMessage.java | 105 +++ .../wan/LocatorMembershipListenerImpl.java | 213 + .../locator/wan/RemoteLocatorJoinRequest.java | 84 ++ .../locator/wan/RemoteLocatorJoinResponse.java | 86 ++ .../locator/wan/RemoteLocatorPingRequest.java | 55 ++ .../locator/wan/RemoteLocatorPingResponse.java | 54 ++ .../locator/wan/RemoteLocatorRequest.java | 63 ++ .../locator/wan/RemoteLocatorResponse.java | 71 ++ .../internal/locator/wan/WANFactoryImpl.java| 74 ++ .../locator/wan/WanLocatorDiscovererImpl.java | 154 .../cache/wan/AbstractRemoteGatewaySender.java | 166 .../cache/wan/GatewayReceiverFactoryImpl.java | 145 .../internal/cache/wan/GatewayReceiverImpl.java | 251 ++ .../wan/GatewaySenderEventRemoteDispatcher.java | 802 +++ .../cache/wan/GatewaySenderFactoryImpl.java | 382 + .../wan/parallel/ParallelGatewaySenderImpl.java | 263 ++ ...rentParallelGatewaySenderEventProcessor.java | 66 ++ ...moteParallelGatewaySenderEventProcessor.java | 122 +++ ...urrentSerialGatewaySenderEventProcessor.java | 45 ++ ...RemoteSerialGatewaySenderEventProcessor.java | 50 ++ .../wan/serial/SerialGatewaySenderImpl.java | 256 ++ 50 files changed, 4237 insertions(+), 4237 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/701c6861/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java -- diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java deleted file mode 100755 index b042da0..000 --- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may
[52/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-lucene/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-lucene/src/
GEODE-37 change package name from com.gemstone.gemfire (for ./geode-lucene/src/main/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-lucene/src/main/java/org/apache/geode) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/05e6d966 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/05e6d966 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/05e6d966 Branch: refs/heads/feature/GEODE-37_2 Commit: 05e6d966a2244ef48beb7e45f6b58b5b32a5b97d Parents: c47228e Author: Hitesh KhamesraAuthored: Tue Sep 13 15:43:20 2016 -0700 Committer: Hitesh Khamesra Committed: Tue Sep 13 15:43:20 2016 -0700 -- .../gemfire/cache/lucene/LuceneIndex.java | 66 --- .../gemfire/cache/lucene/LuceneQuery.java | 66 --- .../cache/lucene/LuceneQueryException.java | 40 -- .../cache/lucene/LuceneQueryFactory.java| 98 .../cache/lucene/LuceneQueryProvider.java | 47 -- .../cache/lucene/LuceneResultStruct.java| 61 --- .../gemfire/cache/lucene/LuceneService.java | 129 - .../cache/lucene/LuceneServiceProvider.java | 45 -- .../lucene/PageableLuceneQueryResults.java | 58 --- .../AbstractPartitionedRepositoryManager.java | 124 - .../cache/lucene/internal/IndexListener.java| 35 -- .../lucene/internal/IndexListenerAdapter.java | 41 -- .../lucene/internal/IndexRepositoryFactory.java | 66 --- .../lucene/internal/InternalLuceneIndex.java| 34 -- .../lucene/internal/InternalLuceneService.java | 29 -- .../lucene/internal/LuceneEventListener.java| 107 - .../internal/LuceneIndexCreationProfile.java| 172 --- .../lucene/internal/LuceneIndexFactory.java | 30 -- .../LuceneIndexForPartitionedRegion.java| 176 --- .../cache/lucene/internal/LuceneIndexImpl.java | 236 -- .../cache/lucene/internal/LuceneIndexStats.java | 202 .../lucene/internal/LuceneQueryFactoryImpl.java | 71 --- .../cache/lucene/internal/LuceneQueryImpl.java | 148 -- .../cache/lucene/internal/LuceneRawIndex.java | 43 -- .../lucene/internal/LuceneRawIndexFactory.java | 27 -- .../lucene/internal/LuceneResultStructImpl.java | 94 .../lucene/internal/LuceneServiceImpl.java | 334 - .../PageableLuceneQueryResultsImpl.java | 147 -- .../internal/PartitionedRepositoryManager.java | 50 -- .../internal/RawIndexRepositoryFactory.java | 63 --- .../internal/RawLuceneRepositoryManager.java| 46 -- .../lucene/internal/StringQueryProvider.java| 116 - .../lucene/internal/cli/LuceneCliStrings.java | 79 .../internal/cli/LuceneIndexCommands.java | 470 --- .../lucene/internal/cli/LuceneIndexDetails.java | 153 -- .../lucene/internal/cli/LuceneIndexInfo.java| 63 --- .../lucene/internal/cli/LuceneQueryInfo.java| 70 --- .../internal/cli/LuceneSearchResults.java | 76 --- .../functions/LuceneCreateIndexFunction.java| 112 - .../functions/LuceneDescribeIndexFunction.java | 74 --- .../cli/functions/LuceneListIndexFunction.java | 71 --- .../functions/LuceneSearchIndexFunction.java| 107 - .../internal/directory/DumpDirectoryFiles.java | 116 - .../internal/directory/FileIndexInput.java | 131 -- .../internal/directory/RegionDirectory.java | 132 -- .../lucene/internal/directory/package-info.java | 23 - .../internal/distributed/CollectorManager.java | 54 --- .../lucene/internal/distributed/EntryScore.java | 84 .../internal/distributed/LuceneFunction.java| 126 - .../distributed/LuceneFunctionContext.java | 115 - .../lucene/internal/distributed/TopEntries.java | 135 -- .../distributed/TopEntriesCollector.java| 102 .../distributed/TopEntriesCollectorManager.java | 178 --- .../TopEntriesFunctionCollector.java| 158 --- .../internal/distributed/package-info.java | 25 - .../lucene/internal/filesystem/ChunkKey.java| 123 - .../cache/lucene/internal/filesystem/File.java | 170 --- .../internal/filesystem/FileInputStream.java| 166 --- .../internal/filesystem/FileOutputStream.java | 103 .../lucene/internal/filesystem/FileSystem.java | 196 .../internal/filesystem/FileSystemStats.java| 128 - .../filesystem/SeekableInputStream.java | 43 -- .../internal/filesystem/package-info.java | 26 - .../internal/management/LuceneIndexMetrics.java | 218 - .../management/LuceneIndexStatsMonitor.java | 93 .../management/LuceneServiceBridge.java | 86 .../internal/management/LuceneServiceMBean.java | 62 --- .../management/LuceneServiceMXBean.java | 59 ---
[10/61] [abbrv] incubator-geode git commit: GEODE-37 change package name from com.gemstone.gemfire (for ./geode-wan/src/test/java/com/gemstone/gemfire)to org.apache.geode for(to ./geode-wan/src/test/j
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f39e2394/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java -- diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java new file mode 100644 index 000..359a56d --- /dev/null +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java @@ -0,0 +1,1593 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gemstone.gemfire.internal.cache.wan.parallel; + +import org.junit.Ignore; +import org.junit.experimental.categories.Category; +import org.junit.Test; + +import static org.junit.Assert.*; + +import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; +import com.gemstone.gemfire.test.junit.categories.DistributedTest; + +import java.io.IOException; + +import org.junit.experimental.categories.Category; + +import com.gemstone.gemfire.cache.AttributesFactory; +import com.gemstone.gemfire.cache.PartitionAttributesFactory; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.wan.GatewaySender; +import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; +import com.gemstone.gemfire.internal.cache.ColocationHelper; +import com.gemstone.gemfire.internal.cache.wan.WANTestBase; +import com.gemstone.gemfire.test.dunit.AsyncInvocation; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.SerializableRunnableIF; + +@Category(DistributedTest.class) +public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase { + + private static final long serialVersionUID = 1L; + + public ParallelWANPersistenceEnabledGatewaySenderDUnitTest() { +super(); + } + + @Override + protected final void postSetUpWANTestBase() throws Exception { +//The restart tests log this string +IgnoredException.addIgnoredException("failed accepting client connection"); + } + + @Test + public void testPartitionedRegionWithGatewaySenderPersistenceEnabled() throws IOException { +try { + Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); + Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + createCache(lnPort); + GatewaySenderFactory fact = cache.createGatewaySenderFactory(); + fact.setPersistenceEnabled(true); + fact.setParallel(true); + final IgnoredException ex = IgnoredException.addIgnoredException("Could not connect"); + try { +GatewaySender sender1 = fact.create("NYSender", 2); + +AttributesFactory rFact = new AttributesFactory(); +rFact.addGatewaySenderId(sender1.getId()); + +PartitionAttributesFactory pFact = new PartitionAttributesFactory(); +pFact.setTotalNumBuckets(100); +pFact.setRedundantCopies(1); +rFact.setPartitionAttributes(pFact.create()); +Region r = cache.createRegionFactory(rFact.create()).create("MyRegion"); +sender1.start(); + } finally { +ex.remove(); + } + +} +catch (Exception e) { + fail("Unexpected Exception :" + e); +} + } + + /** + * Enable persistence for region as well as GatewaySender and see if remote + * site receives all the events. + */ + @Test + public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled() { +Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 )); +Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort )); + +createCacheInVMs(nyPort, vm2, vm3); +createReceiverInVMs(vm2, vm3); + +createCacheInVMs(lnPort, vm4, vm5, vm6, vm7); + +